From 5658c6db4ef4880abf71b669c542f2254cfc5d4b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Sun, 8 Jun 2014 15:38:11 +0200
Subject: [PATCH] Update browser not supported dialog Adapt links for android
 (point to Google Play) Don't display browsers download link on iOS, as they
 will not work anyway Fix #62

---
 lib/Vroom/I18N/en.pm           |  5 +++--
 lib/Vroom/I18N/fr.pm           |  6 +++---
 public/vroom.pl                |  3 ++-
 templates/default/join.html.ep | 19 ++++++++++++++++---
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm
index 8b93a79..d3f3b36 100644
--- a/lib/Vroom/I18N/en.pm
+++ b/lib/Vroom/I18N/en.pm
@@ -222,8 +222,9 @@ our %Lexicon = (
   "SCREEN_s"                             => "%s's screen",
   "BROWSER_NOT_SUPPORTED"                => "Browser not supported",
   "NO_WEBRTC_SUPPORT"                    => "Sorry, but the video conference will not work because your web browser doesn't have the " .
-                                            "required functionnalities. We recommand you download one of the following browsers " .
-                                            "which support the latest web technologies required to use VROOM",
+                                            "required functionnalities.",
+  "DOWNLOAD_ONE_OF_THESE_BROWSERS"       => "We recommand you download one of the following browsers which support the latest web " .
+                                            "technologies required to use VROOM",
   "NO_WEBCAM"                            => "Cannot access your webcam",
   "CANT_ACCESS_WEBCAM"                   => "We couldn't access your webcam. Please check it's connected, powered on, and that you've ".
                                             "allowed the browser to access it, then reload this page",
diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm
index 222e9bb..3db0716 100644
--- a/lib/Vroom/I18N/fr.pm
+++ b/lib/Vroom/I18N/fr.pm
@@ -246,9 +246,9 @@ our %Lexicon = (
     "SCREEN_s"                                  => "Écran de %s",
     "BROWSER_NOT_SUPPORTED"                     => "Navigateur non supporté",
     "NO_WEBRTC_SUPPORT"                         => "Désolé, la vidéo conférence ne fonctionnera pas (ou pas correctement) car votre navigateur " .
-                                                   "ne dispose pas des fonctions nécessaires. Nous recommandons de télécharger " .
-                                                   "un des navigateurs suivants, qui supportent les dernières technologies nécessaires " .
-                                                   "à l'utilisation de VROOM",
+                                                   "ne dispose pas des fonctions nécessaires.",
+    "DOWNLOAD_ONE_OF_THESE_BROWSERS"            => "Nous recommandons de télécharger un des navigateurs suivants, qui supportent les dernières " .
+                                                   "technologies nécessaires à l'utilisation de VROOM",
     "NO_WEBCAM"                                 => "Impossible d'accéder à votre webcam",
     "CANT_ACCESS_WEBCAM"                        => "Nous n'avons pas pu accéder à votre webcam, vérifiez qu'elle soit bien connectée, allumée, et que ".
                                                    "vous avez autorisé le navigateur à y accéder, puis raffraichissez cette page",
diff --git a/public/vroom.pl b/public/vroom.pl
index dc9a4f6..43d868e 100755
--- a/public/vroom.pl
+++ b/public/vroom.pl
@@ -818,7 +818,8 @@ get '/(*room)' => sub {
   $self->render('join',
     moh          => $self->choose_moh(),
     turnPassword => $data->{token},
-    video        => $video
+    video        => $video,
+    ua           => $self->req->headers->user_agent
   );
 };
 
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index aea2d4c..6a168fa 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -559,29 +559,42 @@
           </div>
           <div class="modal-body">
             <p><%=l 'NO_WEBRTC_SUPPORT' %></p>
+            <% if ($ua !~ m/iphone|ipad|ipod/i){ %>
+            <p><%=l 'DOWNLOAD_ONE_OF_THESE_BROWSERS' %></p>
             <div class="row">
+              <%
+                my $ffurl = "http://www.mozilla.org/firefox/";
+                my $churl = "http://www.google.com/chrome/";
+                my $opurl = "http://www.opera.com";
+                if ($ua =~ m/android/i){
+                  $ffurl = "https://play.google.com/store/apps/details?id=org.mozilla.firefox";
+                  $churl = "https://play.google.com/store/apps/details?id=com.android.chrome";
+                  $opurl = "https://play.google.com/store/apps/details?id=com.opera.browser";
+                }
+              %>
               <div class="col-xs-4">
-                <a href="http://www.mozilla.org/firefox/" target="_blank">
+                <a href="<%= $ffurl %>" target="_blank">
                   <center>
                     <img class="img-responsive" src="<%= $self->get_url('/') %>img/firefox.png" alt="Mozilla Firefox"/>
                   </center>
                 </a>
               </div>
               <div class="col-xs-4">
-                <a href="http://www.google.com/chrome/" target="_blank">
+                <a href="<%= $churl %>" target="_blank">
                   <center>
                     <img class="img-responsive" src="<%= $self->get_url('/') %>img/chrome.png" alt="Google Chrome"/>
                   </center>
                 </a>
               </div>
               <div class="col-xs-4">
-                <a href="http://www.opera.com" target="_blank">
+                <a href="<%= $opurl %>" target="_blank">
                   <center>
                     <img class="img-responsive" src="<%= $self->get_url('/') %>img/opera.png" alt="Opera"/>
                   </center>
                 </a>
               </div>
             </div>
+            <% } %>
           </div>
         </div>
       </div>