From d5176c2373e36e63fc207f70c9e5b120f232f75a Mon Sep 17 00:00:00 2001
From: Caio Carrara <ccarrara@thoughtworks.com>
Date: Mon, 27 Jun 2016 16:21:56 -0300
Subject: Update use of interpolation on translations

See: #727
---
 web-ui/app/js/helpers/view_helper.js      | 3 +--
 web-ui/app/js/views/i18n.js               | 4 ++--
 web-ui/app/locales/de_DE/translation.json | 1 +
 web-ui/app/locales/en_US/translation.json | 1 +
 web-ui/app/locales/es_ES/translation.json | 1 +
 web-ui/app/locales/pt_BR/translation.json | 1 +
 web-ui/app/locales/sv_SE/translation.json | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'web-ui/app')

diff --git a/web-ui/app/js/helpers/view_helper.js b/web-ui/app/js/helpers/view_helper.js
index c12e6aaf..ed9e0559 100644
--- a/web-ui/app/js/helpers/view_helper.js
+++ b/web-ui/app/js/helpers/view_helper.js
@@ -73,8 +73,7 @@ define(
 
   function prependFrom(mail) {
     return i18n.t(
-      'On __date__, <__from__> wrote:\n',
-      {'date': new Date(mail.header.date).toString(), 'from': mail.header.from}
+      'reply-author-line', {'date': new Date(mail.header.date).toString(), 'from': mail.header.from}
     );
   }
 
diff --git a/web-ui/app/js/views/i18n.js b/web-ui/app/js/views/i18n.js
index f843b845..29a1beca 100644
--- a/web-ui/app/js/views/i18n.js
+++ b/web-ui/app/js/views/i18n.js
@@ -28,8 +28,8 @@ function(i18n, i18n_backend, I18n_detector) {
     return result.replace('-', '_');
   };
 
-  function t(i18n_key) {
-    var result = i18n.t(i18n_key);
+  function t(i18n_key, options) {
+    var result = i18n.t(i18n_key, options);
     var safe_string = new Handlebars.SafeString(result);
     return safe_string.string;
   }
diff --git a/web-ui/app/locales/de_DE/translation.json b/web-ui/app/locales/de_DE/translation.json
index c625790c..526d5c17 100644
--- a/web-ui/app/locales/de_DE/translation.json
+++ b/web-ui/app/locales/de_DE/translation.json
@@ -60,6 +60,7 @@
     "Tags": "Tags",
     "Forward": "Forward",
     "feedback-placeholder": "Tell us what you liked, didn't like, what is missing and generally what you think about Pixelated.",
+    "reply-author-line": "On {{date}}, <{{from}}> wrote:\n",
 
     "tags": {
         "inbox": "Inbox",
diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json
index 718979cf..dd9e62a5 100644
--- a/web-ui/app/locales/en_US/translation.json
+++ b/web-ui/app/locales/en_US/translation.json
@@ -70,6 +70,7 @@
     "logout": "Logout",
     "delete-permanently": "Delete Permanently",
     "move-to-inbox": "Move to Inbox",
+    "reply-author-line": "On {{date}}, <{{from}}> wrote:\n",
     "error": {
         "timeout": "a timeout occurred",
         "general": "problems talking to server",
diff --git a/web-ui/app/locales/es_ES/translation.json b/web-ui/app/locales/es_ES/translation.json
index c625790c..526d5c17 100644
--- a/web-ui/app/locales/es_ES/translation.json
+++ b/web-ui/app/locales/es_ES/translation.json
@@ -60,6 +60,7 @@
     "Tags": "Tags",
     "Forward": "Forward",
     "feedback-placeholder": "Tell us what you liked, didn't like, what is missing and generally what you think about Pixelated.",
+    "reply-author-line": "On {{date}}, <{{from}}> wrote:\n",
 
     "tags": {
         "inbox": "Inbox",
diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/app/locales/pt_BR/translation.json
index 80da4a93..93f5c61b 100644
--- a/web-ui/app/locales/pt_BR/translation.json
+++ b/web-ui/app/locales/pt_BR/translation.json
@@ -59,6 +59,7 @@
     "Tags": "Tags",
     "Forward": "Encaminhar",
     "feedback-placeholder": "Nos diga o que gosta, não gosta, o que está faltando e o que pensa sobre o Pixelated.",
+    "reply-author-line": "Em {{date}}, <{{from}}> escreveu:\n",
 
     "tags": {
         "inbox": "Caixa de Entrada",
diff --git a/web-ui/app/locales/sv_SE/translation.json b/web-ui/app/locales/sv_SE/translation.json
index 416665f2..f80c725e 100644
--- a/web-ui/app/locales/sv_SE/translation.json
+++ b/web-ui/app/locales/sv_SE/translation.json
@@ -59,6 +59,7 @@
     "Tags": "Taggar",
     "Forward": "Vidarebefodra",
     "feedback-placeholder": "Tell us what you liked, didn't like, what is missing and generally what you think about Pixelated.",
+    "reply-author-line": "On {{date}}, <{{from}}> wrote:\n",
 
     "tags": {
         "inbox": "Inlåda",
-- 
cgit v1.2.3