Merge 8686887695 into bca62e6204

app/assets/javascripts/application.js

@@ -34,6 +34,7 @@
 //= require osem-datepickers
 //= require osem-datatables
 //= require osem-tickets
+//= require osem-translation
 
 $(document).ready(function() {
     $('a[disabled=disabled]').click(function(event){

app/assets/javascripts/osem-translation.js

@@ -0,0 +1,6 @@
+window.liveSettings = {
+    api_key: "CONFIG['transifex_live_api_key']",
+    picker: "bottom-right",
+    detectlang: true,
+    autocollect: true
+};

app/views/layouts/application.html.haml

@@ -8,15 +8,8 @@
     = stylesheet_link_tag "application", :media => "all"
     = javascript_include_tag "application"
     = csrf_meta_tags
-    :javascript
-      window.liveSettings = {
-        api_key: "<%= CONFIG['transifex_live_api_key'] %>",
-        picker: "bottom-right",
-        detectlang: true,
-        autocollect: true
-      };
     = content_for(:script_head)
-    =# javascript_include_tag "//cdn.transifex.com/live.js"
+    = javascript_include_tag "//cdn.transifex.com/live.js"
 
     = yield(:head)
   %body

config/config.yml.example

@@ -21,6 +21,9 @@ defaults: &defaults
     ichain:
       enabled: false
 
+  # Enter your key, provided by transifex live settings, in the quotes
+  transifex_live_api_key: ''
+
 development:
   <<: *defaults
 
@@ -31,5 +34,3 @@ production:
   <<: *defaults
 
   # If you add more providers that do not require a key, you still have to create the 2 variables with sample data
-
-  transifex_live_api_key: ''