Added remaining translations strings

5 files changed, 15 insertions, 14 deletions

diff --git a/web-ui/app/js/mail_view/ui/draft_save_status.js b/web-ui/app/js/mail_view/ui/draft_save_status.js
index 1849e5ba..47751d91 100644
--- a/web-ui/app/js/mail_view/ui/draft_save_status.js
+++ b/web-ui/app/js/mail_view/ui/draft_save_status.js
@@ -17,10 +17,11 @@
 define(
   [
     'flight/lib/component',
-    'page/events'
+    'page/events',
+    'views/i18n'
   ],
 
-  function (defineComponent, events) {
+  function (defineComponent, events, i18n) {
     'use strict';
 
     return defineComponent(draftSaveStatus);
@@ -32,8 +33,8 @@ define(
       };
 
       this.after('initialize', function () {
-        this.on(document, events.mail.saveDraft, this.setMessage('Saving to Drafts...'));
-        this.on(document, events.mail.draftSaved, this.setMessage('Draft Saved.'));
+        this.on(document, events.mail.saveDraft, this.setMessage(i18n.t('draft-saving')));
+        this.on(document, events.mail.draftSaved, this.setMessage(i18n.t('draft-saved')));
         this.on(document, events.ui.mail.changedSinceLastSave, this.setMessage(''));
       });
     }
diff --git a/web-ui/app/js/mail_view/ui/forward_box.js b/web-ui/app/js/mail_view/ui/forward_box.js
index 970fad7f..a34bd55d 100644
--- a/web-ui/app/js/mail_view/ui/forward_box.js
+++ b/web-ui/app/js/mail_view/ui/forward_box.js
@@ -31,7 +31,7 @@ define(
     return defineComponent(forwardBox, withHideAndShow, withComposeInline);
 
     function forwardBox() {
-      var fwd = function(v) { return i18n.t('fwd') + v; };
+      var fwd = function(v) { return i18n.t('fwd') + ': ' + v; };
 
       this.fetchTargetMail = function (ev) {
         this.trigger(document, events.mail.want, { mail: this.attr.ident, caller: this });
diff --git a/web-ui/app/js/mail_view/ui/reply_box.js b/web-ui/app/js/mail_view/ui/reply_box.js
index fdc9dd0f..a174d185 100644
--- a/web-ui/app/js/mail_view/ui/reply_box.js
+++ b/web-ui/app/js/mail_view/ui/reply_box.js
@@ -46,7 +46,7 @@ define(
         }
       };
 
-      var re = function(v) { return i18n.t('re') + v; };
+      var re = function(v) { return i18n.t('re') + ': ' + v; };
 
       this.setupReplyBox = function() {
         var recipients, body;
diff --git a/web-ui/app/js/search/search_trigger.js b/web-ui/app/js/search/search_trigger.js
index 4b9cb1dc..2aff027c 100644
--- a/web-ui/app/js/search/search_trigger.js
+++ b/web-ui/app/js/search/search_trigger.js
@@ -19,19 +19,19 @@ define(
   [
     'flight/lib/component',
     'views/templates',
-    'page/events'
-  ], function (defineComponent, templates, events) {
+    'page/events',
+    'views/i18n'
+  ], function (defineComponent, templates, events, i18n) {
 
     'use strict';
 
     return defineComponent(searchTrigger);
 
     function searchTrigger() {
-      var placeHolder = 'Search results for: ';
-
       this.defaultAttrs({
         input: 'input[type=search]',
-        form: 'form'
+        form: 'form',
+        searchResultsPrefix: 'search-results-for'
       });
 
       this.render = function() {
@@ -57,14 +57,14 @@ define(
 
       this.showOnlySearchTerms = function(event){
         var value = this.select('input').val();
-        var searchTerms = value.slice(placeHolder.length);
+        var searchTerms = value.slice((i18n.t(this.attr.searchResultsPrefix) + ': ').length);
         this.select('input').val(searchTerms);
       };
 
       this.showSearchTermsAndPlaceHolder = function(event){
         var value = this.select('input').val();
         if (value.length > 0){
-          this.select('input').val(placeHolder + value);
+          this.select('input').val(i18n.t(this.attr.searchResultsPrefix) + ': ' + value);
         }
       };
 
diff --git a/web-ui/app/js/services/mail_service.js b/web-ui/app/js/services/mail_service.js
index 529a43b8..bc56daf8 100644
--- a/web-ui/app/js/services/mail_service.js
+++ b/web-ui/app/js/services/mail_service.js
@@ -151,7 +151,7 @@ define(
           contentType: 'application/json; charset=utf-8',
           data: JSON.stringify({idents: mailIdents})
         }).done(this.triggerArchived(dataToArchive))
-          .fail(this.errorMessage(i18n.t('Could not archive emails')));
+          .fail(this.errorMessage(i18n.t('could-not-archive')));
       };
 
       this.deleteMail = function (ev, data) {