From 273248d3fdd9dba7386959412491787610f84bbf Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Wed, 11 Apr 2018 11:41:38 -0400
Subject: [PATCH] =?UTF-8?q?Wire=20up=20=E2=80=98View=20All=20Media?=
 =?UTF-8?q?=E2=80=99=20menu=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _locales/en/messages.json     | 3 ++-
 background.html               | 2 +-
 js/views/conversation_view.js | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 983de1525..fdbcc5d3a 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -523,7 +523,8 @@
       "message": "Show safety number"
     },
     "viewAllMedia": {
-      "message": "View all media"
+      "message": "View all media",
+      "description": "This is a menu item for viewing all media (images + video) in a conversation, using the imperative case, as in a command."
     },
     "verifyHelp": {
       "message": "If you wish to verify the security of your end-to-end encryption with $name$, compare the numbers above with the numbers on their device.",
diff --git a/background.html b/background.html
index af336a241..98b8b3c04 100644
--- a/background.html
+++ b/background.html
@@ -159,7 +159,7 @@
               <button class='hamburger' alt='conversation menu'></button>
               <ul class='menu-list'>
                   <li class='disappearing-messages'>{{ disappearing-messages }}</li>
-                  <li class='view-all-media'>{{ viewAllMedia }}</li>
+                  <li class='view-all-media'>{{ view-all-media }}</li>
                   {{#group}}
                       <li class='show-members'>{{ show-members }}</li>
                       <!-- <li class='update-group'>Update group</li> -->
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index e3b203971..91b09bfb8 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -111,6 +111,7 @@
         'disappearing-messages': i18n('disappearingMessages'),
         'android-length-warning': i18n('androidMessageLengthWarning'),
         timer_options: Whisper.ExpirationTimerOptions.models,
+        'view-all-media': i18n('viewAllMedia'),
       };
     },
     initialize(options) {
@@ -568,6 +569,10 @@
       el[0].scrollIntoView();
     },
 
+    viewAllMedia() {
+      console.log('View All Media');
+    },
+
     scrollToBottom() {
       // If we're above the last seen indicator, we should scroll there instead
       // Note: if we don't end up at the bottom of the conversation, button won't go away!