Make WordPress Core

Changeset 55942


Ignore:
Timestamp:
06/19/2023 06:26:01 PM (11 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:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/edit-comments.php

    r55630 r55942  
    217217        'content' =>
    218218                    '<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
    219                     '<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>' .
     219                    '<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>' .
    220220                    '<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>' .
    221221                    '<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

    r54953 r55942  
    219219            return network_home_url();
    220220        } else {
    221             // WordPress (single site): the blog URL.
     221            // WordPress (single site): the site URL.
    222222            return get_bloginfo_rss( 'url' );
    223223        }
  • trunk/src/wp-content/themes/twentyeleven/header.php

    r55476 r55942  
    3232    wp_title( '|', true, 'right' );
    3333
    34     // Add the blog name.
     34    // Add the site name.
    3535    bloginfo( 'name' );
    3636
    37     // Add the blog description for the home/front page.
     37    // Add the site description for the home/front page.
    3838    $site_description = get_bloginfo( 'description', 'display' );
    3939if ( $site_description && ( is_home() || is_front_page() ) ) {
  • trunk/src/wp-content/themes/twentyten/header.php

    r55476 r55942  
    2222    wp_title( '|', true, 'right' );
    2323
    24     // Add the blog name.
     24    // Add the site name.
    2525    bloginfo( 'name' );
    2626
    27     // Add the blog description for the home/front page.
     27    // Add the site description for the home/front page.
    2828    $site_description = get_bloginfo( 'description', 'display' );
    2929if ( $site_description && ( is_home() || is_front_page() ) ) {
  • trunk/src/wp-includes/general-template.php

    r55870 r55942  
    30973097
    30983098    $defaults = array(
    3099         /* translators: Separator between blog name and feed type in feed links. */
     3099        /* translators: Separator between site name and feed type in feed links. */
    31003100        'separator' => _x( '&raquo;', 'feed link' ),
    3101         /* translators: 1: Blog title, 2: Separator (raquo). */
     3101        /* translators: 1: Site title, 2: Separator (raquo). */
    31023102        'feedtitle' => __( '%1$s %2$s Feed' ),
    3103         /* translators: 1: Blog title, 2: Separator (raquo). */
     3103        /* translators: 1: Site title, 2: Separator (raquo). */
    31043104        'comstitle' => __( '%1$s %2$s Comments Feed' ),
    31053105    );
     
    31493149function feed_links_extra( $args = array() ) {
    31503150    $defaults = array(
    3151         /* translators: Separator between blog name and feed type in feed links. */
     3151        /* translators: Separator between site name and feed type in feed links. */
    31523152        'separator'     => _x( '&raquo;', 'feed link' ),
    3153         /* translators: 1: Blog name, 2: Separator (raquo), 3: Post title. */
     3153        /* translators: 1: Site name, 2: Separator (raquo), 3: Post title. */
    31543154        'singletitle'   => __( '%1$s %2$s %3$s Comments Feed' ),
    3155         /* translators: 1: Blog name, 2: Separator (raquo), 3: Category name. */
     3155        /* translators: 1: Site name, 2: Separator (raquo), 3: Category name. */
    31563156        'cattitle'      => __( '%1$s %2$s %3$s Category Feed' ),
    3157         /* translators: 1: Blog name, 2: Separator (raquo), 3: Tag name. */
     3157        /* translators: 1: Site name, 2: Separator (raquo), 3: Tag name. */
    31583158        'tagtitle'      => __( '%1$s %2$s %3$s Tag Feed' ),
    3159         /* translators: 1: Blog name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
     3159        /* translators: 1: Site name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
    31603160        'taxtitle'      => __( '%1$s %2$s %3$s %4$s Feed' ),
    3161         /* translators: 1: Blog name, 2: Separator (raquo), 3: Author name. */
     3161        /* translators: 1: Site name, 2: Separator (raquo), 3: Author name. */
    31623162        'authortitle'   => __( '%1$s %2$s Posts by %3$s Feed' ),
    3163         /* translators: 1: Blog name, 2: Separator (raquo), 3: Search query. */
     3163        /* translators: 1: Site name, 2: Separator (raquo), 3: Search query. */
    31643164        'searchtitle'   => __( '%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed' ),
    3165         /* translators: 1: Blog name, 2: Separator (raquo), 3: Post type name. */
     3165        /* translators: 1: Site name, 2: Separator (raquo), 3: Post type name. */
    31663166        'posttypetitle' => __( '%1$s %2$s %3$s Feed' ),
    31673167    );
  • trunk/src/wp-includes/ms-blogs.php

    r55940 r55942  
    3232
    3333/**
    34  * Gets a full blog URL, given a blog ID.
    35  *
    36  * @since MU (3.0.0)
    37  *
    38  * @param int $blog_id Blog ID.
    39  * @return string Full URL of the blog if found. Empty string if not.
     34 * Gets a full site URL, given a site ID.
     35 *
     36 * @since MU (3.0.0)
     37 *
     38 * @param int $blog_id Site ID.
     39 * @return string Full site URL if found. Empty string if not.
    4040 */
    4141function get_blogaddress_by_id( $blog_id ) {
     
    5353
    5454/**
    55  * Gets a full blog URL, given a blog name.
     55 * Gets a full site URL, given a site name.
    5656 *
    5757 * @since MU (3.0.0)
  • trunk/src/wp-includes/ms-deprecated.php

    r54953 r55942  
    356356
    357357/**
    358  * Get a full blog URL, given a domain and a path.
     358 * Get a full site URL, given a domain and a path.
    359359 *
    360360 * @since MU (3.0.0)
  • trunk/src/wp-includes/ms-functions.php

    r55657 r55942  
    605605 * @global string $domain
    606606 *
    607  * @param string         $blogname   The blog name provided by the user. Must be unique.
    608  * @param string         $blog_title The blog title provided by the user.
     607 * @param string         $blogname   The site name provided by the user. Must be unique.
     608 * @param string         $blog_title The site title provided by the user.
    609609 * @param WP_User|string $user       Optional. The user object to check against the new site name.
    610610 *                                   Default empty string.
    611611 * @return array {
    612  *     Array of domain, path, blog name, blog title, user and error messages.
     612 *     Array of domain, path, site name, site title, user and error messages.
    613613 *
    614614 *     @type string         $domain     Domain for the site.
     
    753753     *
    754754     * @param array $result {
    755      *     Array of domain, path, blog name, blog title, user and error messages.
     755     *     Array of domain, path, site name, site title, user and error messages.
    756756     *
    757757     *     @type string         $domain     Domain for the site.
    758758     *     @type string         $path       Path for the site. Used in subdirectory installations.
    759759     *     @type string         $blogname   The unique site name (slug).
    760      *     @type string         $blog_title Blog title.
     760     *     @type string         $blog_title Site title.
    761761     *     @type string|WP_User $user       By default, an empty string. A user object if provided.
    762762     *     @type WP_Error       $errors     WP_Error containing any errors found.
     
    23882388function filter_SSL( $url ) {  // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
    23892389    if ( ! is_string( $url ) ) {
    2390         return get_bloginfo( 'url' ); // Return home blog URL with proper scheme.
     2390        return get_bloginfo( 'url' ); // Return home site URL with proper scheme.
    23912391    }
    23922392
  • trunk/src/wp-includes/theme-compat/footer.php

    r47798 r55942  
    2323        <?php
    2424        printf(
    25             /* translators: 1: Blog name, 2: WordPress */
     25            /* translators: 1: Site name, 2: WordPress */
    2626            __( '%1$s is proudly powered by %2$s' ),
    2727            get_bloginfo( 'name' ),
  • trunk/src/wp-signup.php

    r55918 r55942  
    114114
    115115    $current_network = get_network();
    116     // Blog name.
     116    // Site name.
    117117    if ( ! is_subdomain_install() ) {
    118118        echo '<label for="blogname">' . __( 'Site Name (subdirectory only):' ) . '</label>';
  • trunk/src/wp-trackback.php

    r54866 r55942  
    107107     * @param string $title         Trackback title.
    108108     * @param string $excerpt       Trackback excerpt.
    109      * @param string $blog_name     Blog name.
     109     * @param string $blog_name     Site name.
    110110     */
    111111    do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name );
  • trunk/tests/phpunit/tests/customize/manager.php

    r55745 r55942  
    765765        /*
    766766         * Test that adding blogname starter content is ignored now that it is modified,
    767          * but updating a non-modified starter content blog description passes.
     767         * but updating a non-modified starter content site description passes.
    768768         */
    769769        $previous_blogname        = $changeset_data['blogname']['value'];
  • trunk/tests/phpunit/tests/general/feedLinksExtra.php

    r54161 r55942  
    173173     *        Optional arguments. Default empty.
    174174     *
    175      *        @type string $separator     The separator between blog name and feed type.
     175     *        @type string $separator     The separator between site name and feed type.
    176176     *        @type string $singletitle   The title of the comments feed.
    177177     *        @type string $cattitle      The title of the category feed.
Note: See TracChangeset for help on using the changeset viewer.