From c7d2c8f27e90bedca974961b07ce9bdcf9673669 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Thu, 10 Nov 2016 12:16:33 -0500
Subject: [PATCH] send translated strings to javascript

---
 .../javascripts/channels/meeting_updates.js    |  4 ++--
 .../javascripts/channels/recording_update.js   |  6 +++---
 app/assets/javascripts/landing.js              |  2 +-
 app/helpers/application_helper.rb              | 15 +++++++++++++++
 app/views/landing/rooms.html.erb               | 18 ------------------
 app/views/layouts/application.html.erb         |  4 ++++
 config/locales/en-us.yml                       | 13 +++++++------
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/channels/meeting_updates.js b/app/assets/javascripts/channels/meeting_updates.js
index db39b476..7b8c7382 100644
--- a/app/assets/javascripts/channels/meeting_updates.js
+++ b/app/assets/javascripts/channels/meeting_updates.js
@@ -21,12 +21,12 @@
               loopJoin();
             } else {
               sessionStatusRefresh($('.meeting-url').val());
-              showAlert($('.meeting-started-alert').html(), 4000);
+              showAlert(I18n.meeting_started, 4000);
             }
           }
         } else if (data.action === 'meeting_ended') {
           sessionStatusRefresh($('.meeting-url').val());
-          showAlert($('.meeting-ended-alert').html(), 4000);
+          showAlert(I18n.meeting_ended, 4000);
         }
       }
     });
diff --git a/app/assets/javascripts/channels/recording_update.js b/app/assets/javascripts/channels/recording_update.js
index 5650f310..ad75f6c7 100644
--- a/app/assets/javascripts/channels/recording_update.js
+++ b/app/assets/javascripts/channels/recording_update.js
@@ -14,12 +14,12 @@
           rowData.published = data.published
           table.row("#"+data.record_id).data(rowData).draw();
 
-          var publish = (data.published) ? 'publish' : 'unpublish';
-          showAlert($('.recording-'+publish+'-alert').html(), 4000);
+          var published = (data.published) ? 'published' : 'unpublished';
+          showAlert(I18n['recording_'+published], 4000);
         } else if (data.action === 'delete') {
           row.remove().draw();
 
-          showAlert($('.recording-delete-alert').html(), 4000);
+          showAlert(I18n.recording_deleted, 4000);
         }
       }
     });
diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index d904b4df..24aa8725 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -59,7 +59,7 @@
       html: true,
       trigger: 'focus',
       title: function() {
-        return $(".delete-popover-title").html();
+        return I18n.are_you_sure;
       },
       content: function() {
         return $(".delete-popover-body").html();
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de6be794..c0628bd9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,17 @@
 module ApplicationHelper
+  def client_translations
+    locale = I18n.locale
+    if locale.length < 4
+      fallback_locale = I18n.fallbacks[locale].second
+    end
+
+    if fallback_locale
+      I18n.locale = fallback_locale
+      translations = I18n.t('.')
+      I18n.locale = locale
+    else
+      translations = I18n.t('.')
+    end
+    translations[:client]
+  end
 end
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 3cceca19..7bde85f1 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -29,9 +29,6 @@
 </div>
 
 <div hidden class="hidden-elements">
-  <div class="delete-popover-title">
-    <%= t('are_you_sure') %>
-  </div>
   <div class="delete-popover-body">
     <button type="button" class="btn btn-danger recording-delete">
       <%= t('yes') %>
@@ -48,19 +45,4 @@
       <span class="alert-message"></span>
     </div>
   </div>
-  <div class="recording-publish-alert">
-    <%= t('recording_published') %>
-  </div>
-  <div class="recording-unpublish-alert">
-    <%= t('recording_unpublished') %>
-  </div>
-  <div class="recording-delete-alert">
-    <%= t('recording_deleted') %>
-  </div>
-  <div class="meeting-ended-alert">
-    <%= t('meeting_ended') %>
-  </div>
-  <div class="meeting-started-alert">
-    <%= t('meeting_started') %>
-  </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 74c71b91..152c8571 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -49,3 +49,7 @@
     <!-- End of Footer -->
   </body>
 </html>
+
+<script type="text/javascript">
+  window.I18n = <%= client_translations.to_json.html_safe %>
+</script>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index c4ea2d51..22f0e044 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -22,7 +22,13 @@
 en-US:
   actions: Actions
   are_you: Are you %{name}?
-  are_you_sure: Are you sure?
+  client:
+    are_you_sure: Are you sure?
+    meeting_ended: Meeting was ended
+    meeting_started: Meeting was started
+    recording_deleted: Recording was deleted
+    recording_published: Recording was published
+    recording_unpublished: Recording was unpublished
   date_recorded: Date Recorded
   duration: Duration
   end: End
@@ -35,17 +41,12 @@ en-US:
   join_session_user: Join %{name} session
   login: login
   logout: logout
-  meeting_ended: Meeting was ended
-  meeting_started: Meeting was started
   my_room: my room
   no: No
   oauth_signup: Signup for customized sessions
   past_recordings: Past Recordings
   powered_bigbluebutton: Powered by BigBlueButton
   presentation: Presentation
-  recording_deleted: Recording was deleted
-  recording_published: Recording was published
-  recording_unpublished: Recording was unpublished
   refresh_html: <a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
   session_url_explanation: The session will be taking place using the following URL
   start: Start