Changeset 55942

Timestamp:

06/19/2023 06:26:01 PM (19 months ago)

Author:

johnbillion

Message:

General: Replace some instances of "blog" with "site" in documentation, translator comments, and user-facing text strings.

This is not an exhaustive change, but it gets us closer to using "site" in place of "blog" in as many places as possible.

Props NekoJonez, audrasjb, oglekler

Fixes #58117

Location:

trunk

Files:

• src/wp-admin/edit-comments.php (modified) (1 diff)
• src/wp-admin/includes/export.php (modified) (1 diff)
• src/wp-content/themes/twentyeleven/header.php (modified) (1 diff)
• src/wp-content/themes/twentyten/header.php (modified) (1 diff)
• src/wp-includes/general-template.php (modified) (2 diffs)
• src/wp-includes/ms-blogs.php (modified) (2 diffs)
• src/wp-includes/ms-deprecated.php (modified) (1 diff)
• src/wp-includes/ms-functions.php (modified) (3 diffs)
• src/wp-includes/theme-compat/footer.php (modified) (1 diff)
• src/wp-signup.php (modified) (1 diff)
• src/wp-trackback.php (modified) (1 diff)
• tests/phpunit/tests/customize/manager.php (modified) (1 diff)
• tests/phpunit/tests/general/feedLinksExtra.php (modified) (1 diff)

trunk/src/wp-admin/edit-comments.php

@@ -217 +217 @@
         'content' =>
                     '<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-                    '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
+                    '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and site URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
                     '<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
                     '<p>' . __( 'In the <strong>In response to</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .

trunk/src/wp-admin/includes/export.php

@@ -219 +219 @@
             return network_home_url();
         } else {
-            // WordPress (single site): the blog URL.
+            // WordPress (single site): the site URL.
             return get_bloginfo_rss( 'url' );
         }

trunk/src/wp-content/themes/twentyeleven/header.php

@@ -32 +32 @@
     wp_title( '|', true, 'right' );
 
-    // Add the blog name.
+    // Add the site name.
     bloginfo( 'name' );
 
-    // Add the blog description for the home/front page.
+    // Add the site description for the home/front page.
     $site_description = get_bloginfo( 'description', 'display' );
 if ( $site_description && ( is_home() || is_front_page() ) ) {

trunk/src/wp-content/themes/twentyten/header.php

@@ -22 +22 @@
     wp_title( '|', true, 'right' );
 
-    // Add the blog name.
+    // Add the site name.
     bloginfo( 'name' );
 
-    // Add the blog description for the home/front page.
+    // Add the site description for the home/front page.
     $site_description = get_bloginfo( 'description', 'display' );
 if ( $site_description && ( is_home() || is_front_page() ) ) {

trunk/src/wp-includes/general-template.php

@@ -3097 +3097 @@
 
     $defaults = array(
-        /* translators: Separator between blog name and feed type in feed links. */
+        /* translators: Separator between site name and feed type in feed links. */
         'separator' => _x( '»', 'feed link' ),
-        /* translators: 1: Blog title, 2: Separator (raquo). */
+        /* translators: 1: Site title, 2: Separator (raquo). */
         'feedtitle' => __( '%1$s %2$s Feed' ),
-        /* translators: 1: Blog title, 2: Separator (raquo). */
+        /* translators: 1: Site title, 2: Separator (raquo). */
         'comstitle' => __( '%1$s %2$s Comments Feed' ),
     );
@@ -3149 +3149 @@
 function feed_links_extra( $args = array() ) {
     $defaults = array(
-        /* translators: Separator between blog name and feed type in feed links. */
+        /* translators: Separator between site name and feed type in feed links. */
         'separator'     => _x( '»', 'feed link' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Post title. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Post title. */
         'singletitle'   => __( '%1$s %2$s %3$s Comments Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Category name. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Category name. */
         'cattitle'      => __( '%1$s %2$s %3$s Category Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Tag name. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Tag name. */
         'tagtitle'      => __( '%1$s %2$s %3$s Tag Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
         'taxtitle'      => __( '%1$s %2$s %3$s %4$s Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Author name. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Author name. */
         'authortitle'   => __( '%1$s %2$s Posts by %3$s Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Search query. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Search query. */
         'searchtitle'   => __( '%1$s %2$s Search Results for “%3$s” Feed' ),
-        /* translators: 1: Blog name, 2: Separator (raquo), 3: Post type name. */
+        /* translators: 1: Site name, 2: Separator (raquo), 3: Post type name. */
         'posttypetitle' => __( '%1$s %2$s %3$s Feed' ),
     );

trunk/src/wp-includes/ms-blogs.php

@@ -32 +32 @@
 
 /**
- * Gets a full blog URL, given a blog ID.
- *
- * @since MU (3.0.0)
- *
- * @param int $blog_id Blog ID.
- * @return string Full URL of the blog if found. Empty string if not.
+ * Gets a full site URL, given a site ID.
+ *
+ * @since MU (3.0.0)
+ *
+ * @param int $blog_id Site ID.
+ * @return string Full site URL if found. Empty string if not.
  */
 function get_blogaddress_by_id( $blog_id ) {
@@ -53 +53 @@
 
 /**
- * Gets a full blog URL, given a blog name.
+ * Gets a full site URL, given a site name.
  *
  * @since MU (3.0.0)

trunk/src/wp-includes/ms-deprecated.php

@@ -356 +356 @@
 
 /**
- * Get a full blog URL, given a domain and a path.
+ * Get a full site URL, given a domain and a path.
  *
  * @since MU (3.0.0)

trunk/src/wp-includes/ms-functions.php

@@ -605 +605 @@
  * @global string $domain
  *
- * @param string         $blogname   The blog name provided by the user. Must be unique.
- * @param string         $blog_title The blog title provided by the user.
+ * @param string         $blogname   The site name provided by the user. Must be unique.
+ * @param string         $blog_title The site title provided by the user.
  * @param WP_User|string $user       Optional. The user object to check against the new site name.
  *                                   Default empty string.
  * @return array {
- *     Array of domain, path, blog name, blog title, user and error messages.
+ *     Array of domain, path, site name, site title, user and error messages.
  *
  *     @type string         $domain     Domain for the site.
@@ -753 +753 @@
      *
      * @param array $result {
-     *     Array of domain, path, blog name, blog title, user and error messages.
+     *     Array of domain, path, site name, site title, user and error messages.
      *
      *     @type string         $domain     Domain for the site.
      *     @type string         $path       Path for the site. Used in subdirectory installations.
      *     @type string         $blogname   The unique site name (slug).
-     *     @type string         $blog_title Blog title.
+     *     @type string         $blog_title Site title.
      *     @type string|WP_User $user       By default, an empty string. A user object if provided.
      *     @type WP_Error       $errors     WP_Error containing any errors found.
@@ -2388 +2388 @@
 function filter_SSL( $url ) {  // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
     if ( ! is_string( $url ) ) {
-        return get_bloginfo( 'url' ); // Return home blog URL with proper scheme.
+        return get_bloginfo( 'url' ); // Return home site URL with proper scheme.
     }
 

trunk/src/wp-includes/theme-compat/footer.php

@@ -23 +23 @@
         <?php
         printf(
-            /* translators: 1: Blog name, 2: WordPress */
+            /* translators: 1: Site name, 2: WordPress */
             __( '%1$s is proudly powered by %2$s' ),
             get_bloginfo( 'name' ),

trunk/src/wp-signup.php

@@ -114 +114 @@
 
     $current_network = get_network();
-    // Blog name.
+    // Site name.
     if ( ! is_subdomain_install() ) {
         echo '<label for="blogname">' . __( 'Site Name (subdirectory only):' ) . '</label>';

trunk/src/wp-trackback.php

@@ -107 +107 @@
      * @param string $title         Trackback title.
      * @param string $excerpt       Trackback excerpt.
-     * @param string $blog_name     Blog name.
+     * @param string $blog_name     Site name.
      */
     do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name );

trunk/tests/phpunit/tests/customize/manager.php

@@ -765 +765 @@
         /*
          * Test that adding blogname starter content is ignored now that it is modified,
-         * but updating a non-modified starter content blog description passes.
+         * but updating a non-modified starter content site description passes.
          */
         $previous_blogname        = $changeset_data['blogname']['value'];

trunk/tests/phpunit/tests/general/feedLinksExtra.php

@@ -173 +173 @@
      *        Optional arguments. Default empty.
      *
-     *        @type string $separator     The separator between blog name and feed type.
+     *        @type string $separator     The separator between site name and feed type.
      *        @type string $singletitle   The title of the comments feed.
      *        @type string $cattitle      The title of the category feed.