From 0e2d2d60c27d9282fd5f3fdca6991a5410c74ca2 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Fri, 25 Dec 2015 22:47:09 -0800
Subject: [PATCH] i18n KeyConflictDialogue

// FREEBIE
---
 _locales/en/messages.json              | 6 ++++++
 background.html                        | 8 +++-----
 js/views/key_conflict_dialogue_view.js | 7 ++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 73e51817..908737d9 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1,4 +1,10 @@
 {
+    "verifyContact": {
+      "message": "You may wish to <span class='verify'>verify</span> this contact."
+    },
+    "acceptNewKey": {
+      "message": "Accept new key"
+    },
     "verify": {
       "message": "Verify"
     },
diff --git a/background.html b/background.html
index 7897b3e4..78c8a502 100644
--- a/background.html
+++ b/background.html
@@ -290,12 +290,10 @@
   <script type='text/x-tmpl-mustache' id='key-conflict-dialogue'>
     <div class='content'>
       <p> {{ message }} </p>
+      <p> {{ verifyContact }} </p>
       <p>
-        You may wish to <span class='verify'>verify</span> this contact.
-      </p>
-      <p>
-        <button class='cancel'>Cancel</button>
-        <button class='resolve'>Accept new key</button>
+        <button class='cancel'>{{ cancel }}</button>
+        <button class='resolve'>{{ resolve }}</button>
       </p>
     </div>
   </script>
diff --git a/js/views/key_conflict_dialogue_view.js b/js/views/key_conflict_dialogue_view.js
index a2b3d080..b852b675 100644
--- a/js/views/key_conflict_dialogue_view.js
+++ b/js/views/key_conflict_dialogue_view.js
@@ -32,7 +32,12 @@
             this.conversation.resolveConflicts(this.model);
         },
         render_attributes: function() {
-            return this.model;
+            return {
+                message: this.model.message,
+                cancel: i18n('cancel'),
+                resolve: i18n('acceptNewKey'),
+                verifyContact: i18n('verifyContact')
+            };
         }
     });
 })();