Changeset 45926 for trunk/src/wp-admin/includes/ms.php

Timestamp:

09/01/2019 05:12:43 PM (5 years ago)

Author:

SergeyBiryukov

Message:

I18N: Improve translator comments.

• Add missing translator comments.
• Fix placement of some translator comments. Translator comments should be on the line directly above the line containing the translation function call for optimal compatibility with various .pot file generation tools. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translator comments.

Includes minor code layout fixes.

Polyglots, rejoice! All WordPress core files now have translator comments for all strings with placeholders!

Props jrf, subrataemfluence, GaryJ, webdados, Dency, swissspidy, alvarogois, marcomartins, mihaiiceyro, vladwtz, niq1982, flipkeijzer, michielatyoast, chandrapatel, thrijith, joshuanoyce, FesoVik, tessak22, bhaktirajdev, cleancoded, dhavalkasvala, garrett-eclipse, bibliofille, socalchristina, priyankkpatel, 5hel2l2y, adamsilverstein, JeffPaul, pierlo, SergeyBiryukov.
Fixes #44360.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (6 diffs)

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

@@ -580 +580 @@
 
     if ( empty( $blogs ) ) {
-        wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
-    }
-
-    $output  = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
+        wp_die(
+            sprintf(
+                /* translators: 1: Site title */
+                __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ),
+                $blog_name
+            ),
+            403
+        );
+    }
+
+    $output = '<p>' . sprintf(
+        /* translators: 1: Site title */
+        __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ),
+        $blog_name
+    ) . '</p>';
     $output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
 
@@ -691 +702 @@
 
     if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
-        echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . '</div>';
+        echo "<div class='update-nag'>" . sprintf(
+            /* translators: %s: URL to Upgrade Network screen */
+            __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ),
+            esc_url( network_admin_url( 'upgrade.php' ) )
+        ) . '</div>';
     }
 }
@@ -745 +760 @@
     <table class="form-table" role="presentation">
     <tr>
-    <?php /* translators: My sites label */ ?>
+    <?php /* translators: My Sites label */ ?>
         <th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
         <td>
@@ -863 +878 @@
 
             if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
-                wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+                wp_die(
+                    sprintf(
+                        /* translators: %s: user login */
+                        __( 'Warning! User %s cannot be deleted.' ),
+                        $delete_user->user_login
+                    )
+                );
             }
 
             if ( in_array( $delete_user->user_login, $site_admins ) ) {
-                wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+                wp_die(
+                    sprintf(
+                        /* translators: %s: user login */
+                        __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ),
+                        '<em>' . $delete_user->user_login . '</em>'
+                    )
+                );
             }
             ?>
@@ -913 +940 @@
                         ?>
                         <ul style="list-style:none;">
-                            <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
+                            <li>
+                                <?php
+                                /* translators: %s: link to user's site */
+                                printf( __( 'Site: %s' ), $user_site );
+                                ?>
+                            </li>
                             <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" checked="checked" />
                             <?php _e( 'Delete all content.' ); ?></label></li>
@@ -1100 +1132 @@
             '<p>' . __( '<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
             '<p>' . __( '<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
-            '<p>' . sprintf( __( '<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+            '<p>' . sprintf(
+                /* translators: %s: URL to Network Themes screen */
+                __( '<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ),
+                network_admin_url( 'themes.php' )
+            ) . '</p>' .
             '<p>' . __( '<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>',
     );