Issue 8432: Make notifications translatable

diff --git a/include/enotify.php b/include/enotify.php
index 8b244230bd3dacbb97a17c8a326222a614269f78..4a18eea8273593a2a7762b35e0c0eccbbe713a61 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -174,39 +174,39 @@ function notification($params)
 
                // "George Bull's post"
                if ($params['activity']['origin_comment']) {
-                       $message = '%1$s replied to you on %2$s\'s %3$s %4$s';
+                       $message = $l10n->t('%1$s replied to you on %2$s\'s %3$s %4$s');
                } elseif ($params['activity']['explicit_tagged']) {
-                       $message = '%1$s tagged you on %2$s\'s %3$s %4$s';
+                       $message = $l10n->t('$l10n->t(%1$s tagged you on %2$s\'s %3$s %4$s');
                } else {
-                       $message = '%1$s commented on %2$s\'s %3$s %4$s';
+                       $message = $l10n->t('%1$s commented on %2$s\'s %3$s %4$s');
                }
 
-               $dest_str = $l10n->t($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
+               $dest_str = sprintf($message, $params['source_name'], $item['author-name'], $item_post_type, $title);
 
                // Then look for the special cases
 
                // "your post"
                if ($params['activity']['origin_thread']) {
                        if ($params['activity']['origin_comment']) {
-                               $message = '%1$s replied to you on your %2$s %3$s';
+                               $message = $l10n->t('%1$s replied to you on your %2$s %3$s');
                        } elseif ($params['activity']['explicit_tagged']) {
-                               $message = '%1$s tagged you on your %2$s %3$s';
+                               $message = $l10n->t('%1$s tagged you on your %2$s %3$s');
                        } else {
-                               $message = '%1$s commented on your %2$s %3$s';
+                               $message = $l10n->t('%1$s commented on your %2$s %3$s');
                        }
 
-                       $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+                       $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
                // "their post"
                } elseif ($item['author-link'] == $params['source_link']) {
                        if ($params['activity']['origin_comment']) {
-                               $message = '%1$s replied to you on their %2$s %3$s';
+                               $message = $l10n->t('%1$s replied to you on their %2$s %3$s');
                        } elseif ($params['activity']['explicit_tagged']) {
-                               $message = '%1$s tagged you on their %2$s %3$s';
+                               $message = $l10n->t('%1$s tagged you on their %2$s %3$s');
                        } else {
-                               $message = '%1$s commented on their %2$s %3$s';
+                               $message = $l10n->t('%1$s commented on their %2$s %3$s');
                        }
 
-                       $dest_str = $l10n->t($message, $params['source_name'], $item_post_type, $title);
+                       $dest_str = sprintf($message, $params['source_name'], $item_post_type, $title);
                }
 
                // Some mail software relies on subject field for threading.