From 8264f3ba33e883c4e8a52a0a62b0c0ab24f4e5fb Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Wed, 14 Jun 2017 12:29:32 -0700
Subject: [PATCH] Make the term 'Verified' fully localizable

FREEBIE
---
 _locales/en/messages.json     |  3 +++
 background.html               |  8 ++++----
 js/views/contact_list_view.js |  3 ++-
 js/views/conversation_view.js |  3 ++-
 test/index.html               | 22 +++++++++++++---------
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index f260844b9d..2c7d6cad36 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -112,6 +112,9 @@
     "verify": {
       "message": "Verify"
     },
+    "verified": {
+      "message": "Verified"
+    },
     "newIdentity": {
       "message": "New safety number",
       "description": "Header for a key change dialog"
diff --git a/background.html b/background.html
index 9e78754320..3e96e53bfe 100644
--- a/background.html
+++ b/background.html
@@ -79,9 +79,9 @@
     {{ #number }}
       <span class='conversation-number'>{{ number }}</span>
     {{ /number }}
-    {{ #verified }}
-      <span class='verified'>✓ Verified</span>
-    {{ /verified }}
+    {{ #isVerified }}
+      <span class='verified'>✓ {{ verified }}</span>
+    {{ /isVerified }}
   </script>
   <script type='text/x-tmpl-mustache' id='conversation'>
     <div class='conversation-header {{ avatar.color }}'>
@@ -251,7 +251,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='contact_name_and_number'>
       <h3 class='name' dir='auto'> {{ title }} </h3>
-      <div class='number'>{{ #verified }}✓ Verified &middot;{{ /verified }} {{ number }}</div>
+      <div class='number'>{{ #isVerified }}✓ {{ verified }} &middot;{{ /isVerified }} {{ number }}</div>
   </script>
   <script type='text/x-tmpl-mustache' id='contact'>
       {{> avatar }}
diff --git a/js/views/contact_list_view.js b/js/views/contact_list_view.js
index 6486de2048..ca51a3c6b2 100644
--- a/js/views/contact_list_view.js
+++ b/js/views/contact_list_view.js
@@ -35,7 +35,8 @@
                     title: this.model.getTitle(),
                     number: this.model.getNumber(),
                     avatar: this.model.getAvatar(),
-                    verified: this.model.isVerified()
+                    isVerified: this.model.isVerified(),
+                    verified: i18n('verified')
                 };
             },
             showIdentity: function() {
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index e39b196d2b..375dfdae8b 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -64,7 +64,8 @@
         },
         render_attributes: function() {
             return {
-                verified: this.model.isVerified(),
+                isVerified: this.model.isVerified(),
+                verified: i18n('verified'),
                 name: this.model.getName(),
                 number: this.model.getNumber(),
             };
diff --git a/test/index.html b/test/index.html
index bc5cfd1b05..85e461f50e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -86,6 +86,17 @@
   <script type='text/x-tmpl-mustache' id='hint'>
     <p> {{ content }}</p>
   </script>
+  <script type='text/x-tmpl-mustache' id='conversation-title'>
+    {{ #name }}
+      <span class='conversation-name' dir='auto'>{{ name }}</span>
+    {{ /name }}
+    {{ #number }}
+      <span class='conversation-number'>{{ number }}</span>
+    {{ /number }}
+    {{ #isVerified }}
+      <span class='verified'>✓ {{ verified }}</span>
+    {{ /isVerified }}
+  </script>
   <script type='text/x-tmpl-mustache' id='conversation'>
     <div class='conversation-header {{ avatar.color }}'>
         <div class='header-buttons left'>
@@ -115,14 +126,7 @@
             </div>
           </div>
         </div>
-        <span class='conversation-title'>
-          {{ #name }}
-            <span class='conversation-name' dir='auto'>{{ name }}</span>
-          {{ /name }}
-          {{ #number }}
-            <span class='conversation-number'>{{ number }}</span>
-          {{ /number }}
-        </span>
+        <span class='conversation-title'></span>
         {{> avatar }}
     </div>
     <div class='main panel'>
@@ -232,7 +236,7 @@
   </script>
   <script type='text/x-tmpl-mustache' id='contact_name_and_number'>
       <h3 class='name' dir='auto'> {{ title }} </h3>
-      <div class='number'>{{ number }}</div>
+      <div class='number'>{{ #isVerified }}✓ {{ verified }} &middot;{{ /isVerified }} {{ number }}</div>
   </script>
   <script type='text/x-tmpl-mustache' id='contact'>
       {{> avatar }}