Changeset 31956

Timestamp:

04/01/2015 01:25:55 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Add translator comments for placeholders in network-related strings.

props ramiy.
fixes #31834.

Location:

trunk/src/wp-admin

Files:

• network.php (modified) (1 diff)
• network/site-new.php (modified) (2 diffs)
• network/upgrade.php (modified) (1 diff)
• network/users.php (modified) (1 diff)

trunk/src/wp-admin/network.php

@@ -224 +224 @@
             <tr>
                 <th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
-                <td><?php printf( _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ), $hostname ); ?></td>
+                <td><?php printf(
+                    /* translators: 1: hostname */
+                    _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
+                    $hostname
+                ); ?></td>
             </tr>
             <tr>
                 <th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
-                <td><?php printf( _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ), $hostname ); ?></td>
+                <td><?php printf(
+                    /* translators: 1: hostname */
+                    _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
+                    $hostname
+                ); ?></td>
             </tr>
         </table>

trunk/src/wp-admin/network/site-new.php

@@ -86 +86 @@
     $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
     $wpdb->show_errors();
-    if ( !is_wp_error( $id ) ) {
-        if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
+    if ( ! is_wp_error( $id ) ) {
+        if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
             update_user_option( $user_id, 'primary_blog', $id, true );
-        $content_mail = sprintf( __( 'New site created by %1$s
+        }
+
+        $content_mail = sprintf(
+            /* translators: 1: user login, 2: site url, 3: site name/title */
+            __( 'New site created by %1$s
 
 Address: %2$s
-Name: %3$s' ), $current_user->user_login , get_site_url( $id ), wp_unslash( $title ) );
+Name: %3$s' ),
+            $current_user->user_login,
+            get_site_url( $id ),
+            wp_unslash( $title )
+        );
         wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
         wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
@@ -105 +113 @@
     $messages = array();
     if ( 'added' == $_GET['update'] )
-        $messages[] = sprintf( __( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ), esc_url( get_admin_url( absint( $_GET['id'] ) ) ), network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) ) );
+        $messages[] = sprintf(
+            /* translators: 1: dashboard url, 2: network admin edit url */
+            __( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
+            esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
+            network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
+        );
 }
 

trunk/src/wp-admin/network/upgrade.php

@@ -64 +64 @@
             $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
             restore_current_blog();
+
             echo "<li>$siteurl</li>";
+
             $response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
-            if ( is_wp_error( $response ) )
-                wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: <em>%2$s</em>' ), $siteurl, $response->get_error_message() ) );
+            if ( is_wp_error( $response ) ) {
+                wp_die( sprintf(
+                    /* translators: 1: site url, 2: server error message */
+                    __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
+                    $siteurl,
+                    '<em>' . $response->get_error_message() . '</em>'
+                ) );
+            }
+
             /**
              * Fires after the Multisite DB upgrade for each site is complete.

trunk/src/wp-admin/network/users.php

@@ -58 +58 @@
             if ( ! empty( $blogs ) ) {
                 ?>
-                <td><fieldset><p><legend><?php printf( __( 'What should be done with content owned by %s?' ), '<em>' . $delete_user->user_login . '</em>' ); ?></legend></p>
+                <td><fieldset><p><legend><?php printf(
+                    /* translators: user login */
+                    __( 'What should be done with content owned by %s?' ),
+                    '<em>' . $delete_user->user_login . '</em>'
+                ); ?></legend></p>
                 <?php
                 foreach ( (array) $blogs as $key => $details ) {