From 2f3bec5a43e6a1d2b2b1910fd63fa484dd7c7318 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 19 Jun 2011 12:21:12 +0200
Subject: [PATCH] Fix i18n issues. Cannot use a PHP variable in a gettext
 messages. Needs to be replaced. Whitespace updates.

---
 .../EmailReminder/lib/userinvitereminderhandler.php  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/EmailReminder/lib/userinvitereminderhandler.php b/plugins/EmailReminder/lib/userinvitereminderhandler.php
index c4acecc62f..5e5c672641 100644
--- a/plugins/EmailReminder/lib/userinvitereminderhandler.php
+++ b/plugins/EmailReminder/lib/userinvitereminderhandler.php
@@ -25,6 +25,7 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
+
 if (!defined('STATUSNET')) {
     exit(1);
 }
@@ -69,7 +70,7 @@ class UserInviteReminderHandler extends UserReminderHandler {
     {
         $invDate = strtotime($invitation->created);
         $now     = strtotime('now');
-        
+
         // Days since first invitation was sent
         $days = ($now - $invDate) / 86499; // 60*60*24 = 86499
 
@@ -79,7 +80,8 @@ class UserInviteReminderHandler extends UserReminderHandler {
         case ($days > 1 && $days < 2):
             if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 1)) {
                 common_log(LOG_INFO, "Sending one day invitation reminder to {$invitation->address}", __FILE__);
-                $subject = _m("Reminder - You have been invited to join {$siteName}!");
+                // TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+                $subject = sprintf(_m('Reminder - You have been invited to join %s!'),$siteName);
                 return EmailReminderPlugin::sendReminder(
                     self::INVITE_REMINDER,
                     $invitation,
@@ -92,7 +94,8 @@ class UserInviteReminderHandler extends UserReminderHandler {
         case ($days > 3 && $days < 4):
             if (Email_reminder::needsReminder(self::INVITE_REMINDER, $invitation, 3)) {
                 common_log(LOG_INFO, "Sending three day invitation reminder to {$invitation->address}", __FILE__);
-                $subject = _m("Final reminder - you have been invited to join {$siteName}!");
+                // TRANS: Subject for reminder e-mail. %s is the StatusNet sitename.
+                $subject = sprintf(_m('Final reminder - you have been invited to join %s!'),$siteName);
                     return EmailReminderPlugin::sendReminder(
                         self::INVITE_REMINDER,
                         $invitation,
@@ -102,9 +105,8 @@ class UserInviteReminderHandler extends UserReminderHandler {
                 } else {
                     return true;
                 }
-            break;        
+            break;
         }
         return true;
     }
-
 }