Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Multisite: Add translator comments to default email messages with non-typical placeholders. 

props yoavf.
fixes #32263.
Built from https://develop.svn.wordpress.org/trunk@32381


git-svn-id: http://core.svn.wordpress.org/trunk@32351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-05-06 09:12:25 +00:00
parent 4e615fb9ff
commit 77572cf024
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/ms.php
View File

@ -253,6 +253,7 @@ function update_option_new_admin_email( $old_value, $value ) {
);
update_option( 'adminhash', $new_admin_email );
/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
$email_text = __( 'Howdy ###USERNAME###,
You recently requested to have the administration email address on
@ -334,6 +335,7 @@ function send_confirmation_on_profile_email() {
);
update_option( $current_user->ID . '_new_email', $new_user_email );
/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
$email_text = __( 'Howdy ###USERNAME###,
You recently requested to have the email address on your account changed.

1
wp-admin/includes/schema.php
View File

@ -917,6 +917,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
$site_admins = get_site_option( 'site_admins' );
}
/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
$welcome_email = __( 'Howdy USERNAME,
Your new SITE_NAME site has been successfully set up at:

1
wp-admin/ms-delete-site.php
View File

@ -42,6 +42,7 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
$url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
$content = __( "Howdy ###USERNAME###,
You recently clicked the 'Delete Site' link on your site and filled in a

6
wp-includes/ms-functions.php
View File

@ -1433,7 +1433,8 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta
return false;
$welcome_email = get_site_option( 'welcome_email' );
if ( $welcome_email == false )
if ( $welcome_email == false ) {
/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
$welcome_email = __( 'Howdy USERNAME,
Your new SITE_NAME site has been successfully set up at:
@ -1448,6 +1449,7 @@ Log in here: BLOG_URLwp-login.php
We hope you enjoy your new site. Thanks!
--The Team @ SITE_NAME' );
}
$url = get_blogaddress_by_id($blog_id);
$user = get_userdata( $user_id );
@ -2080,6 +2082,8 @@ function users_can_register_signup_filter() {
function welcome_user_msg_filter( $text ) {
if ( !$text ) {
remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
$text = __( 'Howdy USERNAME,
Your new account is set up.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32379';
$wp_version = '4.3-alpha-32381';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.