From 72d1893703e6f109c27a8343fb883ca7e2c66eb8 Mon Sep 17 00:00:00 2001 From: taitus Date: Fri, 25 Jan 2019 16:32:46 +0100 Subject: [PATCH] Manage the remote translation button display - Add remote_translation_button partial to layout - Only display button when we have remote_translations and if current locale is include on available locales from remote translations service. - Recover available locales from remote translations service. Use daily_cache to detect every day if remote translation service has added new available locale. Co-Authored-By: alessandro --- app/helpers/remote_translations_helper.rb | 6 ++ app/views/layouts/_header.html.erb | 3 + .../microsoft/available_locales.rb | 14 +++- spec/features/remote_translations_spec.rb | 83 +++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 app/helpers/remote_translations_helper.rb create mode 100644 spec/features/remote_translations_spec.rb diff --git a/app/helpers/remote_translations_helper.rb b/app/helpers/remote_translations_helper.rb new file mode 100644 index 000000000..d81fb64f8 --- /dev/null +++ b/app/helpers/remote_translations_helper.rb @@ -0,0 +1,6 @@ +module RemoteTranslationsHelper + + def display_remote_translation_info?(remote_translations, locale) + remote_translations.present? && RemoteTranslations::Microsoft::AvailableLocales.include_locale?(locale) + end +end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 03014f740..e93075833 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,7 @@
+ <% if display_remote_translation_info?(@remote_translations, I18n.locale) %> + <%= render "shared/remote_translations_button", remote_translations: @remote_translations %> + <% end %>
diff --git a/lib/remote_translations/microsoft/available_locales.rb b/lib/remote_translations/microsoft/available_locales.rb index 5a9d0fcb8..0e2651ee0 100644 --- a/lib/remote_translations/microsoft/available_locales.rb +++ b/lib/remote_translations/microsoft/available_locales.rb @@ -5,8 +5,10 @@ require "json" module RemoteTranslations::Microsoft::AvailableLocales - def load_remote_locales - remote_available_locales.map { |locale| locale.first } + def available_locales + daily_cache("locales") do + remote_available_locales.map { |locale| locale.first } + end end def parse_locale(locale) @@ -22,6 +24,10 @@ module RemoteTranslations::Microsoft::AvailableLocales end end + def include_locale?(locale) + available_locales.include?(parse_locale(locale).to_s) + end + private def remote_available_locales @@ -42,4 +48,8 @@ module RemoteTranslations::Microsoft::AvailableLocales JSON.parse(result)["translation"] end + def daily_cache(key, &block) + Rails.cache.fetch("remote_available_locales/#{Time.current.strftime('%Y-%m-%d')}/#{key}", &block) + end + end diff --git a/spec/features/remote_translations_spec.rb b/spec/features/remote_translations_spec.rb new file mode 100644 index 000000000..f9e047951 --- /dev/null +++ b/spec/features/remote_translations_spec.rb @@ -0,0 +1,83 @@ +require "rails_helper" +include RemoteTranslations::Microsoft::AvailableLocales + +describe "Remote Translations" do + + before do + Setting["feature.remote_translations"] = true + create(:proposal) + available_locales_response = ["ar", "de", "en", "es", "fa", "fr", "he", "it", "nl", "pl", + "pt", "sv", "zh-Hans", "zh-Hant"] + expect_any_instance_of(RemoteTranslations::Microsoft::AvailableLocales).to receive(:available_locales). + and_return(available_locales_response) + end + + after do + allow(I18n).to receive(:available_locales).and_call_original + allow(I18n.fallbacks).to receive(:[]).and_call_original + Globalize.set_fallbacks_to_all_available_locales + end + + describe "Display remote translation button when locale is included in microsoft translate client" do + + context "with locale that has :en fallback" do + + before do + allow(I18n.fallbacks).to receive(:[]).and_return([:en]) + Globalize.set_fallbacks_to_all_available_locales + end + + scenario "should display text in English" do + available_locales_with_fallback_en = [:ar, :de, :fa, :he, :nl, :pl, :sv] + + visit root_path(locale: available_locales_with_fallback_en.sample) + + expect(page).to have_css ".remote-translations-button" + expect(page).to have_content "The content of this page is not available in your language" + end + + scenario "should display text in English after parse key" do + available_locales_with_fallback_en = [:"zh-CN", :"zh-TW"] + + visit root_path(locale: available_locales_with_fallback_en.sample) + + expect(page).to have_css ".remote-translations-button" + expect(page).to have_content "The content of this page is not available in your language" + end + end + + context "with locale that has :en fallback" do + + before do + allow(I18n.fallbacks).to receive(:[]).and_return([:es]) + Globalize.set_fallbacks_to_all_available_locales + end + + scenario "with locale that has :es fallback" do + available_locales_with_fallback_es = [:es, :fr, :it] + + visit root_path(locale: available_locales_with_fallback_es.sample) + + expect(page).to have_css ".remote-translations-button" + expect(page).to have_content "El contenido de esta página no está disponible en tu idioma" + end + + scenario "with locale that has :es fallback and need parse key" do + visit root_path(locale: :"pt-BR") + + expect(page).to have_css ".remote-translations-button" + expect(page).to have_content "El contenido de esta página no está disponible en tu idioma" + end + end + + end + + scenario "Not display remote translation button when locale is not included in microsoft translate client" do + not_available_locales = [:val, :gl, :sq] + + visit root_path(locale: not_available_locales.sample) + + expect(page).not_to have_css ".remote-translations-button" + end + +end