From eada388534597e467522ab950493e9f1797dea4a Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sun, 27 Sep 2020 20:50:29 +0100 Subject: [PATCH] Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN --- app/assets/javascripts/admin/all.js | 2 +- .../javascripts/admin/spree/handlebar_extensions.js | 9 +++++++++ app/views/spree/admin/shared/_translations.html.erb | 2 +- spec/javascripts/application_spec.js | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/admin/spree/handlebar_extensions.js diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 564c099ccd..d328a39148 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -34,7 +34,7 @@ //= require css_browser_selector_dev //= require responsive-tables //= require admin/spree_paypal_express -//= require handlebars +//= require admin/spree/handlebar_extensions // OFN specific //= require_tree ../templates/admin diff --git a/app/assets/javascripts/admin/spree/handlebar_extensions.js b/app/assets/javascripts/admin/spree/handlebar_extensions.js new file mode 100644 index 0000000000..500f989f86 --- /dev/null +++ b/app/assets/javascripts/admin/spree/handlebar_extensions.js @@ -0,0 +1,9 @@ +//= require handlebars + +Handlebars.registerHelper("t", function(key) { + if (Spree.translations[key]) { + return Spree.translations[key] + } else { + console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?") + } +}); diff --git a/app/views/spree/admin/shared/_translations.html.erb b/app/views/spree/admin/shared/_translations.html.erb index f72a09bd8a..eb9c90808a 100644 --- a/app/views/spree/admin/shared/_translations.html.erb +++ b/app/views/spree/admin/shared/_translations.html.erb @@ -6,7 +6,7 @@ :abbr_day_names => I18n.t(:abbr_day_names, :scope => :date), :add => Spree.t(:add), :are_you_sure_delete => Spree.t(:are_you_sure_delete), - :bill_address => Spree.t(:bill_address), + :bill_address => I18n.t(:bill_address), :choose_a_customer => Spree.t(:choose_a_customer), :confirm_delete => Spree.t(:confirm_delete), :cut => Spree.t(:cut), diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js index 24c76ce9d7..3759a72033 100644 --- a/spec/javascripts/application_spec.js +++ b/spec/javascripts/application_spec.js @@ -14,6 +14,7 @@ //= require textAngular.min.js //= require moment/min/moment.min.js //= require i18n +//= require handlebars angular.module('templates', []) angular.module('uiGmapgoogle-maps', []);