Add translator comments for placeholders in network-related strings.
props ramiy. fixes #31834. Built from https://develop.svn.wordpress.org/trunk@31956 git-svn-id: http://core.svn.wordpress.org/trunk@31935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
parent
a7ba89b027
commit
29cddbeda9
|
|
@ -223,11 +223,19 @@ function network_step1( $errors = false ) {
|
|||
<table class="form-table">
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -85,13 +85,21 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
|
|||
$wpdb->hide_errors();
|
||||
$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 ) );
|
||||
wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
|
||||
|
|
@ -104,7 +112,12 @@ Name: %3$s' ), $current_user->user_login , get_site_url( $id ), wp_unslash( $tit
|
|||
if ( isset($_GET['update']) ) {
|
||||
$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'] ) )
|
||||
);
|
||||
}
|
||||
|
||||
$title = __('Add New Site');
|
||||
|
|
|
|||
|
|
@ -63,10 +63,19 @@ switch ( $action ) {
|
|||
$siteurl = site_url();
|
||||
$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.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -57,7 +57,11 @@ function confirm_delete_users( $users ) {
|
|||
|
||||
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 ) {
|
||||
$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.2-beta3-31955';
|
||||
$wp_version = '4.2-beta3-31956';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue