Default locale to en if translations are missing

Fixes #24
volmer · Mar 7, 2015 · 268e272 · 268e272
1 parent bd90e62
commit 268e272
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/assets/javascripts/bootsy.js b/app/assets/javascripts/bootsy.js
@@ -3,7 +3,7 @@
 //= require bootsy/wysihtml5
 //= require bootsy/bootstrap-wysihtml5
 //= require bootsy/bootsy
-//= require bootsy/bootstrap.file-input.js
+//= require bootsy/bootstrap.file-input
 //= require bootsy/init
 //= require bootsy/editor_options
 //= require bootsy/translations
diff --git a/app/assets/javascripts/bootsy/bootsy.js b/app/assets/javascripts/bootsy/bootsy.js
@@ -5,8 +5,11 @@ window.Bootsy = window.Bootsy || {};
 Bootsy.Area = function($el) {
   this.$el            = $el;
   this.modal          = $el.siblings('.bootsy-modal');
-  this.locale         = $el.data('bootsy-locale') || $('html').attr('lang') || 'en';
   this.unsavedChanges = false;
+  this.locale         = $el.data('bootsy-locale') || $('html').attr('lang');
+  if (!Bootsy.translations[this.locale]) {
+    this.locale = 'en';
+  }
 
   this.options = {
     locale: this.locale,

diff --git a/app/assets/javascripts/bootsy/init.js b/app/assets/javascripts/bootsy/init.js
@@ -27,10 +27,12 @@ Bootsy.init = function() {
 
 /* Initialize Bootsy on document load */
 $(function() {
-  Bootsy.init();
+  $(window).load(function() {
+    Bootsy.init();
 
-  /* Reload Bootsy on page load when using Turbolinks. */
-  if (window.Turbolinks) {
-    $(document).on('page:load', Bootsy.init);
-  }
+    /* Reload Bootsy on page load when using Turbolinks. */
+    if (window.Turbolinks) {
+      $(document).on('page:load', Bootsy.init);
+    }
+  });
 });