From fcfe1a4df13f0d23fbbb66e1ca361ae4dee5808d Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Wed, 10 Sep 2014 20:22:37 +0300 Subject: [PATCH 1/3] add js code for live translation feature of transifex --- app/assets/javascripts/application.js | 1 + app/assets/javascripts/transifex-live.js | 6 ++++++ app/views/layouts/application.html.haml | 1 + 3 files changed, 8 insertions(+) create mode 100644 app/assets/javascripts/transifex-live.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d78e69ec..9e840f7f 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,6 +30,7 @@ //= require osem-datepickers //= require osem-datatables //= require osem-tickets +//= require transifex-live $(document).ready(function() { $('a[disabled=disabled]').click(function(event){ diff --git a/app/assets/javascripts/transifex-live.js b/app/assets/javascripts/transifex-live.js new file mode 100644 index 00000000..e8539dfb --- /dev/null +++ b/app/assets/javascripts/transifex-live.js @@ -0,0 +1,6 @@ +window.liveSettings = { + api_key: "cf866a61277842b39c897c5a0b5ec075", + picker: "bottom-right", + detectlang: true, + autocollect: true +}; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 06acac77..775140b3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,6 +8,7 @@ = stylesheet_link_tag "application", :media => "all" = stylesheet_link_tag "splash" if content_for :splash = javascript_include_tag "application" + = javascript_include_tag "//cdn.transifex.com/live.js" = csrf_meta_tags :javascript $(function() { From b43b68ac4f04402abeca271bb6103416c065dd00 Mon Sep 17 00:00:00 2001 From: Stella Date: Wed, 12 Nov 2014 18:44:25 +0200 Subject: [PATCH 2/3] api key not visible --- app/assets/javascripts/transifex-live.js | 2 +- config/config.yml.example | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/transifex-live.js b/app/assets/javascripts/transifex-live.js index e8539dfb..a93b35ac 100644 --- a/app/assets/javascripts/transifex-live.js +++ b/app/assets/javascripts/transifex-live.js @@ -1,5 +1,5 @@ window.liveSettings = { - api_key: "cf866a61277842b39c897c5a0b5ec075", + api_key: CONFIG['transifex_live_api_key'], picker: "bottom-right", detectlang: true, autocollect: true diff --git a/config/config.yml.example b/config/config.yml.example index 787427bb..412e109a 100644 --- a/config/config.yml.example +++ b/config/config.yml.example @@ -29,3 +29,7 @@ test: 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: '' From 40fc1a32d43df4ca93cd45e30968f1ee1cfaaddf Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Fri, 14 Nov 2014 15:20:56 +0200 Subject: [PATCH 3/3] put live js code into application layout --- app/assets/javascripts/application.js | 1 - app/assets/javascripts/transifex-live.js | 6 ------ app/views/layouts/application.html.haml | 10 +++++++++- 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 app/assets/javascripts/transifex-live.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9e840f7f..d78e69ec 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -30,7 +30,6 @@ //= require osem-datepickers //= require osem-datatables //= require osem-tickets -//= require transifex-live $(document).ready(function() { $('a[disabled=disabled]').click(function(event){ diff --git a/app/assets/javascripts/transifex-live.js b/app/assets/javascripts/transifex-live.js deleted file mode 100644 index a93b35ac..00000000 --- a/app/assets/javascripts/transifex-live.js +++ /dev/null @@ -1,6 +0,0 @@ -window.liveSettings = { - api_key: CONFIG['transifex_live_api_key'], - picker: "bottom-right", - detectlang: true, - autocollect: true -}; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 775140b3..2567eaab 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -8,14 +8,22 @@ = stylesheet_link_tag "application", :media => "all" = stylesheet_link_tag "splash" if content_for :splash = javascript_include_tag "application" - = javascript_include_tag "//cdn.transifex.com/live.js" = csrf_meta_tags :javascript + window.liveSettings = { + api_key: "<%= CONFIG['transifex_live_api_key'] %>", + picker: "bottom-right", + detectlang: true, + autocollect: true + }; + $(function() { $('.dropdown input, .dropdown label').click(function(e) { e.stopPropagation(); }); }); + + = javascript_include_tag "//cdn.transifex.com/live.js" = yield(:head) %body{ data: (content_for?(:splash_nav) ? {spy: 'scroll', offset: 0, target: 'splash-nav'} : {} ) } = render 'layouts/navigation'