Changeset 45926 for trunk/src/wp-admin/includes/update.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/update.php (modified) (11 diffs)

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

@@ -210 +210 @@
 function core_update_footer( $msg = '' ) {
     if ( ! current_user_can( 'update_core' ) ) {
+        /* translators: %s: WordPress version */
         return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
     }
@@ -232 +233 @@
     switch ( $cur->response ) {
         case 'development':
-            /* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
-            return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+            return sprintf(
+                /* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
+                __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ),
+                get_bloginfo( 'version', 'display' ),
+                network_admin_url( 'update-core.php' )
+            );
 
         case 'upgrade':
-            return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+            return sprintf(
+                '<strong><a href="%s">%s</a></strong>',
+                network_admin_url( 'update-core.php' ),
+                /* translators: %s: WordPress version */
+                sprintf( __( 'Get Version %s' ), $cur->current )
+            );
 
         case 'latest':
         default:
+            /* translators: %s: WordPress version */
             return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
     }
@@ -304 +315 @@
 
         if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
-            $msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+            $msg .= sprintf(
+                '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
+                network_admin_url( 'update-core.php' ),
+                /* translators: %s: WordPress version number, or 'Latest' string */
+                sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
+            );
         }
     }
@@ -407 +423 @@
         $notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
 
-        echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $response->slug . '-update' ) . '" data-slug="' . esc_attr( $response->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice inline ' . $notice_type . ' notice-alt"><p>';
+        printf(
+            '<tr class="plugin-update-tr%s" id="%s" data-slug="%s" data-plugin="%s">' .
+            '<td colspan="%s" class="plugin-update colspanchange">' .
+            '<div class="update-message notice inline %s notice-alt"><p>',
+            $active_class,
+            esc_attr( $response->slug . '-update' ),
+            esc_attr( $response->slug ),
+            esc_attr( $file ),
+            esc_attr( $wp_list_table->get_column_count() ),
+            $notice_type
+        );
 
         if ( ! current_user_can( 'update_plugins' ) ) {
-            /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
             printf(
+                /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
                 __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
                 $plugin_name,
@@ -423 +449 @@
             );
         } elseif ( empty( $response->package ) ) {
-            /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
             printf(
+                /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
                 __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
                 $plugin_name,
@@ -437 +463 @@
         } else {
             if ( $compatible_php ) {
-                /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
                 printf(
+                    /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
                     __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
                     $plugin_name,
@@ -456 +482 @@
                 );
             } else {
-                /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number 5: Update PHP page URL */
                 printf(
+                    /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number 5: Update PHP page URL */
                     __( 'There is a new version of %1$s available, but it doesn&#8217;t work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ),
                     $plugin_name,
@@ -581 +607 @@
     $active = $theme->is_allowed( 'network' ) ? ' active' : '';
 
-    echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
+    printf(
+        '<tr class="plugin-update-tr%s" id="%s" data-slug="%s">' .
+        '<td colspan="%s" class="plugin-update colspanchange">' .
+        '<div class="update-message notice inline notice-warning notice-alt"><p>',
+        $active,
+        esc_attr( $theme->get_stylesheet() . '-update' ),
+        esc_attr( $theme->get_stylesheet() ),
+        $wp_list_table->get_column_count()
+    );
+
     if ( ! current_user_can( 'update_themes' ) ) {
-        /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
         printf(
+            /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
             __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
             $theme['Name'],
@@ -596 +631 @@
         );
     } elseif ( empty( $response['package'] ) ) {
-        /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
         printf(
+            /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
             __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
             $theme['Name'],
@@ -609 +644 @@
         );
     } else {
-        /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
         printf(
+            /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
             __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
             $theme['Name'],
@@ -683 +718 @@
 
     if ( current_user_can( 'update_core' ) ) {
-        $msg = sprintf( __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ), 'update-core.php' );
+        $msg = sprintf(
+            /* translators: %s: URL to WordPress Updates screen */
+            __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ),
+            'update-core.php'
+        );
     } else {
         $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );