From 02cc6623eab97f1efd8ce56bf9fa405b1a39e723 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 24 Dec 2015 22:50:27 -0800
Subject: [PATCH] i18n ConversationView

// FREEBIE
---
 _locales/en/messages.json     | 16 ++++++++++++++++
 _locales/it/messages.json     | 12 ++++++++++++
 background.html               | 10 +++++-----
 js/views/conversation_view.js |  8 +++++++-
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 2c63c0851..294781ba1 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1,2 +1,18 @@
 {
+    "sendMessage": {
+        "message": "Send a message",
+        "description": "Placeholder text in the message entry field"
+    },
+    "members": {
+      "message": "Members"
+    },
+    "resetSession": {
+        "message": "Reset Session"
+    },
+    "verifyIdentity": {
+        "message": "Verify Identity"
+    },
+    "deleteMessages": {
+        "message": "Delete messages"
+    }
 }
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 2c63c0851..bf7ce0410 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -1,2 +1,14 @@
 {
+    "sendMessage": {
+        "message": "Invia messaggio"
+    },
+    "resetSession": {
+        "message": "Resetta Sessione"
+    },
+    "verifyIdentity": {
+        "message": "Verifica Identità"
+    },
+    "deleteMessages": {
+        "message": "Cancella messaggi"
+    }
 }
diff --git a/background.html b/background.html
index 46a0d2244..c26a3c3ff 100644
--- a/background.html
+++ b/background.html
@@ -39,15 +39,15 @@
             <button class='drop-down'></button>
             <ul class='menu-list'>
                 {{#group}}
-                    <li><a class='view-members'>Members</a></li>
+                    <li><a class='view-members'>{{ view-members }}</a></li>
                     <!-- <li><a class='update-group'>Update group</a></li> -->
                     <!-- <li><a class='leave-group'>Leave group</a></li> -->
                 {{/group}}
                 {{^group}}
-                    <li><a class='end-session'>Reset Session</a></li>
-                    <li><a class='verify-identity'>Verify Identity</a></li>
+                    <li><a class='end-session'>{{ end-session }}</a></li>
+                    <li><a class='verify-identity'>{{ verify-identity }}</a></li>
                 {{/group}}
-                <li><a class='destroy'>Delete messages</a></li>
+                <li><a class='destroy'>{{ destroy }}</a></li>
             </ul>
           </div>
           {{> avatar }}
@@ -68,7 +68,7 @@
                   <div class='paperclip thumbnail'></div>
                   <input type='file' class='file-input'>
               </div>
-              <textarea class='send-message' placeholder="Send a message" rows="1"></textarea>
+              <textarea class='send-message' placeholder="{{ send-message }}" rows="1"></textarea>
           </form>
       </div>
     </div>
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index b468b0226..a3065ac74 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -19,7 +19,12 @@
                 group: this.model.get('type') === 'group',
                 title: this.model.getTitle(),
                 number: this.model.getNumber(),
-                avatar: this.model.getAvatar()
+                avatar: this.model.getAvatar(),
+                'view-members'    : i18n('members'),
+                'end-session'     : i18n('resetSession'),
+                'verify-identity' : i18n('verifyIdentity'),
+                'destroy'         : i18n('deleteMessages'),
+                'send-message'    : i18n('sendMessage')
             };
         },
         initialize: function(options) {
@@ -30,6 +35,7 @@
             this.listenTo(this.model, 'opened', this.onOpened);
 
             this.render();
+
             twemoji.parse(this.el, { base: '/images/twemoji/', size: 16 });
 
             this.appWindow = options.appWindow;