From 4b9f7d518e3ed106d1d7d0b70d042159b02161a6 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 31 Aug 2016 13:38:11 -0700
Subject: [PATCH] Remove Android requirement from install flow

// FREEBIE
---
 _locales/en/messages.json | 14 +++++++++-----
 js/views/install_view.js  |  5 +++--
 options.html              |  1 -
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 3786e9e475d..bc203cdd370 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -159,18 +159,22 @@
         "message": "Get started"
     },
     "installSignalLink": {
-        "message": "First, install <a $a_params$>Signal</a> on your Android phone.<br /> We'll link your devices and keep your messages in sync.",
-        "description": "Prompt the user to install Signal on Android before linking",
+        "message": "First, install Signal on your <a $play_store$>Android</a> or <a $app_store$>iPhone</a>.<br /> We'll link your devices and keep your messages in sync.",
+        "description": "Prompt the user to install Signal on their phone before linking",
         "placeholders": {
-          "a_params": {
+          "play_store": {
+            "content": "$1",
+            "example": "href='http://example.com'"
+          },
+          "app_store": {
             "content": "$1",
             "example": "href='http://example.com'"
           }
         }
     },
     "installIHaveSignalButton": {
-        "message": "I have Signal for Android",
-        "description": "Button for the user to confirm that they have Signal for Android"
+        "message": "Got it",
+        "description": "Button for the user to confirm that they have Signal installed."
     },
     "installFollowUs": {
         "message": "<a $a_params$>Follow us</a> for updates about multi-device support for iOS.",
diff --git a/js/views/install_view.js b/js/views/install_view.js
index 185d01178b6..45bbcd2afbd 100644
--- a/js/views/install_view.js
+++ b/js/views/install_view.js
@@ -8,13 +8,14 @@
     Whisper.InstallView = Whisper.View.extend({
         templateName: 'install_flow_template',
         render_attributes: function() {
-            var installSignalHref = 'https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms';
+            var playStoreHref = 'https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms';
+            var appStoreHref = 'https://itunes.apple.com/us/app/signal-private-messenger/id874139669';
             var twitterHref = 'https://twitter.com/whispersystems';
             return {
                 installWelcome: i18n('installWelcome'),
                 installTagline: i18n('installTagline'),
                 installGetStartedButton: i18n('installGetStartedButton'),
-                installSignalLink: this.i18n_with_link('installSignalLink', installSignalHref),
+                installSignalLink: this.i18n_with_link('installSignalLink', playStoreHref, appStoreHref),
                 installIHaveSignalButton: i18n('installIHaveSignalButton'),
                 installFollowUs: this.i18n_with_link('installFollowUs', twitterHref),
                 installAndroidInstructions: i18n('installAndroidInstructions'),
diff --git a/options.html b/options.html
index 58d431cafac..dc0f28e25a9 100644
--- a/options.html
+++ b/options.html
@@ -26,7 +26,6 @@
         <div class='nav'>
           <p>{{{ installSignalLink }}}</p>
           <div> <a class='button step3'>{{ installIHaveSignalButton }}</a> </div>
-          <p>{{{ installFollowUs }}}</p>
           <span class='dot step1'></span>
           <span class='dot step2 selected'></span>
           <span class='dot step3'></span>