Changeset 43598 for trunk/src/wp-admin/includes/class-wp-automatic-updater.php

Timestamp:

08/30/2018 01:35:27 PM (6 years ago)

Author:

jrf

Message:

I18n: Improve translators comments [3].

• Add missing translators comments.
• Fix placement of some translators comments. Translators 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 translators comments.

Includes minor code layout fixes.

Patch 44360-wp-admin-includes-dir.patch of the series.

Props flipkeijzer, alvarogois, michielatyoast
See #44360

File:

• trunk/src/wp-admin/includes/class-wp-automatic-updater.php (modified) (15 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -308 +308 @@
         switch ( $type ) {
             case 'core':
+                /* translators: %s: WordPress version */
                 $skin->feedback( __( 'Updating to WordPress %s' ), $item->version );
+                /* translators: %s: WordPress version */
                 $item_name = sprintf( __( 'WordPress %s' ), $item->version );
                 break;
@@ -315 +317 @@
                 $theme         = wp_get_theme( $upgrader_item );
                 $item_name     = $theme->Get( 'Name' );
+                /* translators: %s: Theme name */
                 $skin->feedback( __( 'Updating theme: %s' ), $item_name );
                 break;
@@ -321 +324 @@
                 $plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
                 $item_name     = $plugin_data['Name'];
+                /* translators: %s: Plugin name */
                 $skin->feedback( __( 'Updating plugin: %s' ), $item_name );
                 break;
             case 'translation':
                 $language_item_name = $upgrader->get_name_for_update( $item );
-                $item_name          = sprintf( __( 'Translations for %s' ), $language_item_name );
+                /* translators: %s: Name of language item */
+                $item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
+                /* translators: 1: Name of language item, 2: Language */
                 $skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)…' ), $language_item_name, $item->language ) );
                 break;
@@ -663 +669 @@
         switch ( $type ) {
             case 'success':
+                /* translators: 1: Home URL, 2: WordPress version */
                 $body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
                 $body .= "\n\n";
@@ -671 +678 @@
                 // Can only reference the About screen if their update was successful.
                 list( $about_version ) = explode( '-', $core_update->current, 2 );
-                $body                 .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
-                $body                 .= "\n" . admin_url( 'about.php' );
+                /* translators: %s: WordPress core version */
+                $body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
+                $body .= "\n" . admin_url( 'about.php' );
 
                 if ( $newer_version_available ) {
+                    /* translators: %s: WordPress core latest version */
                     $body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
                     $body .= __( 'Updating is easy and only takes a few moments:' );
@@ -684 +693 @@
             case 'fail':
             case 'manual':
+                /* translators: 1: Home URL, 2: WordPress core latest version */
                 $body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
 
@@ -700 +710 @@
             case 'critical':
                 if ( $newer_version_available ) {
+                    /* translators: 1: Home URL, 2: WordPress core latest version */
                     $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
                 } else {
+                    /* translators: 1: Home URL, 2: Core update version */
                     $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
                 }
@@ -715 +727 @@
         if ( $critical_support ) {
             // Support offer if available.
+            /* translators: %s: Support e-mail */
             $body .= "\n\n" . sprintf( __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ), $core_update->support_email );
         } else {
@@ -741 +754 @@
         if ( 'critical' == $type && is_wp_error( $result ) ) {
             $body .= "\n***\n\n";
+            /* translators: %s: WordPress version */
             $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
             $body .= ' ' . __( 'We have some data that describes the error your site encountered.' );
@@ -758 +772 @@
                 }
                 $error_code = $error->get_error_code();
-                $body      .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
+                /* translators: %s: Error code */
+                $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
                 if ( 'rollback_was_required' == $error_code ) {
                     continue;
@@ -816 +831 @@
         $failures = 0;
 
+        /* translators: %s: Network home URL */
         $body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
 
@@ -822 +838 @@
             $result = $this->update_results['core'][0];
             if ( $result->result && ! is_wp_error( $result->result ) ) {
+                /* translators: %s: WordPress core version */
                 $body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
             } else {
+                /* translators: %s: WordPress core version */
                 $body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
                 $failures++;
@@ -845 +863 @@
                 $body[] = $messages[ $type ];
                 foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
+                    /* translators: %s: name of plugin / theme / translations */
                     $body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
                 }
@@ -859 +878 @@
                 foreach ( $this->update_results[ $type ] as $item ) {
                     if ( ! $item->result || is_wp_error( $item->result ) ) {
+                        /* translators: %s: name of plugin / theme / translations */
                         $body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
                         $failures++;
@@ -885 +905 @@
             $body[] = '';
 
+            /* translators: %s: site title */
             $subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
         } else {
+            /* translators: %s: site title */
             $subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
         }