Changeset 14315 for trunk/wp-includes/ms-functions.php

Timestamp:

04/30/2010 03:17:49 AM (15 years ago)

Author:

nacin

Message:

s/blog/site/ in even more places. props PeteMall, see #11644.

File:

• trunk/wp-includes/ms-functions.php (modified) (15 diffs)

trunk/wp-includes/ms-functions.php

@@ -323 +323 @@
     // Check if the domain has been used already. We should return an error message.
     if ( domain_exists($domain, $path, $site_id) )
-        return __( 'Error: Blog URL already taken.' );
+        return __( 'Error: Site URL already taken.' );
 
     // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
@@ -330 +330 @@
 
     if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-        return __( 'Error: problem creating blog entry.' );
+        return __( 'Error: problem creating site entry.' );
 
     switch_to_blog($blog_id);
@@ -558 +558 @@
 
     if ( empty( $blogname ) )
-        $errors->add('blogname', __('Please enter a blog name'));
+        $errors->add('blogname', __('Please enter a site name'));
 
     $maybe = array();
@@ -569 +569 @@
 
     if ( strlen( $blogname ) < 4 && !is_super_admin() )
-        $errors->add('blogname',  __('Blog name must be at least 4 characters'));
+        $errors->add('blogname',  __('Site name must be at least 4 characters'));
 
     if ( strpos( ' ' . $blogname, '_' ) != false )
-        $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) );
+        $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
 
     // do not allow users to create a blog that conflicts with a page on the main blog.
     if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-        $errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) );
+        $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
 
     // all numeric?
@@ -582 +582 @@
     preg_match( '/[0-9]*/', $blogname, $match );
     if ( $match[0] == $blogname )
-        $errors->add('blogname', __('Sorry, blog names must have letters too!'));
+        $errors->add('blogname', __('Sorry, site names must have letters too!'));
 
     $blogname = apply_filters( 'newblogname', $blogname );
@@ -589 +589 @@
 
     if ( empty( $blog_title ) )
-        $errors->add('blog_title', __('Please enter a blog title'));
+        $errors->add('blog_title', __('Please enter a site title'));
 
     // Check if the domain/path has been used already.
@@ -600 +600 @@
     }
     if ( domain_exists($mydomain, $path) )
-        $errors->add('blogname', __('Sorry, that blog already exists!'));
+        $errors->add('blogname', __('Sorry, that site already exists!'));
 
     if ( username_exists( $blogname ) ) {
         if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-            $errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) );
+            $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
     }
 
@@ -615 +615 @@
             $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) );
         else
-            $errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.'));
+            $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
     }
 
@@ -689 +689 @@
     $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
     $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-    $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
+    $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
     // TODO: Don't hard code activation link.
     $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
@@ -722 +722 @@
 
     if ( $signup->active )
-        return new WP_Error('already_active', __('The blog is already active.'), $signup);
+        return new WP_Error('already_active', __('The site is already active.'), $signup);
 
     $meta = unserialize($signup->meta);
@@ -812 +812 @@
     // Check if the domain has been used already. We should return an error message.
     if ( domain_exists($domain, $path, $site_id) )
-        return new WP_Error('blog_taken', __('Blog already exists.'));
+        return new WP_Error('blog_taken', __('Site already exists.'));
 
     if ( !defined('WP_INSTALLING') )
@@ -818 +818 @@
 
     if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-        return new WP_Error('insert_blog', __('Could not create blog.'));
+        return new WP_Error('insert_blog', __('Could not create site.'));
 
     switch_to_blog($blog_id);
@@ -860 +860 @@
     restore_current_blog();
 
-    $msg = sprintf( __( 'New Blog: %1s
+    $msg = sprintf( __( 'New Site: %1s
 URL: %2s
 Remote IP: %3s
@@ -867 +867 @@
     $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
 
-    wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg );
+    wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
     return true;
 }
@@ -1010 +1010 @@
         $current_site->site_name = 'WordPress MU';
 
-    $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
+    $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
     wp_mail($user->user_email, $subject, $message, $message_headers);
     return true;