Revert last change

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12886 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/po/squirrelmail.pot b/po/squirrelmail.pot
index 9ed139739eb41d67db2f4ec9071a54eea8368f5e..423a13eb409b0c0c6a9aa597cadbd74a313965fc 100644 (file)
--- a/po/squirrelmail.pot
+++ b/po/squirrelmail.pot
@@ -4604,7 +4604,7 @@ msgstr ""
 
 #. i18n: The parameters are: subject, sender, and date.
 #, php-format
-msgid "%1 from %2 on %3"
+msgid "%s from %s on %s"
 msgstr ""
 
 msgid "Expand Header"

diff --git a/templates/default_advanced/read_headers.tpl b/templates/default_advanced/read_headers.tpl
index cb4899ff00f903d478ee521f9070b6d4d945b1e9..da573fb2b9e2f2cbedf15014108a20609a657ac2 100644 (file)
--- a/templates/default_advanced/read_headers.tpl
+++ b/templates/default_advanced/read_headers.tpl
@@ -71,9 +71,7 @@ extract($t);
             $from = preg_replace('/"$/', '', trim($from));
         }
         // i18n: The parameters are: subject, sender, and date.
-        $reduced_header = str_replace(array('%1', '%2', '%3'),
-                                      array("<b>$subject</b>", "<b>$from</b>", "<b>$date</b>"),
-                                      _("%1 from %2 on %3"));
+        $reduced_header = sprintf(_("%s from %s on %s"), "<b>$subject</b>", "<b>$from</b>", "<b>$date</b>");
         $expand_link = str_replace('&expand_header=0', '', $PHP_SELF) . '&expand_header=1';
 
         echo '<tr><td colspan="2" align="center" valign="top">'