Changeset 5445

Timestamp:

12/05/2011 07:12:44 PM (13 years ago)

Author:

djpaul

Message:

Make sure that all emails' contents have argument swapping for i18n placeholder variables. Fixes #3795

Location:

trunk

Files:

• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-members/bp-members-signup.php (modified) (1 diff)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -235 +235 @@
     $from_name       = ( '' == get_site_option( 'site_name' ) ) ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
-    $message         = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email );
+    $message         = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url . $email );
     $subject         = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 

trunk/bp-members/bp-members-signup.php

@@ -569 +569 @@
     $from_name = ( '' == get_option( 'blogname' ) ) ? __( 'BuddyPress', 'buddypress' ) : esc_html( get_option( 'blogname' ) );
 
-    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url );
+    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
     $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 

trunk/bp-messages/bp-messages-notifications.php

@@ -32 +32 @@
 
         $email_content = sprintf( __(
-'%s sent you a new message:
+'%1$s sent you a new message:
 
-Subject: %s
+Subject: %2$s
 
-"%s"
+"%3$s"
 
-To view and read your messages please log in and visit: %s
+To view and read your messages please log in and visit: %4$s
 
 ---------------------