From 9082e5255e8473d2f18a7418dc8e7abff745d5cd Mon Sep 17 00:00:00 2001 From: Etienne Ischer Date: Sat, 24 Apr 2021 23:46:16 +0200 Subject: [PATCH] add traductions --- app/controllers/application_controller.rb | 16 +++++++++++++++- app/javascript/packs/application.js | 1 + app/views/layouts/_locales.html.erb | 19 +++++++++++++++++++ app/views/layouts/_navbar.html.erb | 14 ++++++++++---- app/views/wow_characters/index.html.erb | 14 +++++++------- app/views/wow_mounts/index.html.erb | 6 +++--- app/views/wow_pets/index.html.erb | 6 +++--- config/application.rb | 1 + config/locales/en-gb.yml | 16 ---------------- config/locales/layouts/de-de.yml | 6 ++++++ config/locales/layouts/en-gb.yml | 6 ++++++ config/locales/layouts/en-us.yml | 6 ++++++ config/locales/layouts/es-es.yml | 6 ++++++ config/locales/layouts/es-mx.yml | 6 ++++++ config/locales/layouts/fr-fr.yml | 6 ++++++ config/locales/layouts/it.yml | 6 ++++++ config/locales/layouts/ko.yml | 6 ++++++ config/locales/layouts/pt-br.yml | 6 ++++++ config/locales/layouts/ru-ru.yml | 6 ++++++ config/locales/layouts/zh-cn.yml | 6 ++++++ config/locales/layouts/zh-tw.yml | 6 ++++++ config/locales/wow_characters/de-de.yml | 10 ++++++++++ config/locales/wow_characters/en-gb.yml | 10 ++++++++++ config/locales/wow_characters/en-us.yml | 10 ++++++++++ config/locales/wow_characters/es-es.yml | 10 ++++++++++ config/locales/wow_characters/es-mx.yml | 10 ++++++++++ config/locales/wow_characters/fr-fr.yml | 10 ++++++++++ config/locales/wow_characters/it.yml | 10 ++++++++++ config/locales/wow_characters/ko.yml | 10 ++++++++++ config/locales/wow_characters/pt-br.yml | 10 ++++++++++ config/locales/wow_characters/ru-ru.yml | 10 ++++++++++ config/locales/wow_characters/zh-cn.yml | 10 ++++++++++ config/locales/wow_characters/zh-tw.yml | 10 ++++++++++ config/locales/wow_mounts/de-de.yml | 6 ++++++ config/locales/wow_mounts/en-gb.yml | 6 ++++++ config/locales/wow_mounts/en-us.yml | 6 ++++++ config/locales/wow_mounts/es-es.yml | 6 ++++++ config/locales/wow_mounts/es-mx.yml | 6 ++++++ config/locales/wow_mounts/fr-fr.yml | 6 ++++++ config/locales/wow_mounts/it.yml | 6 ++++++ config/locales/wow_mounts/ko.yml | 6 ++++++ config/locales/wow_mounts/pt-br.yml | 6 ++++++ config/locales/wow_mounts/ru-ru.yml | 6 ++++++ config/locales/wow_mounts/zh-cn.yml | 6 ++++++ config/locales/wow_mounts/zh-tw.yml | 6 ++++++ config/locales/wow_pets/de-de.yml | 6 ++++++ config/locales/wow_pets/en-gb.yml | 6 ++++++ config/locales/wow_pets/en-us.yml | 6 ++++++ config/locales/wow_pets/es-es.yml | 6 ++++++ config/locales/wow_pets/es-mx.yml | 6 ++++++ config/locales/wow_pets/fr-fr.yml | 6 ++++++ config/locales/wow_pets/it.yml | 6 ++++++ config/locales/wow_pets/ko.yml | 6 ++++++ config/locales/wow_pets/pt-br.yml | 6 ++++++ config/locales/wow_pets/ru-ru.yml | 6 ++++++ config/locales/wow_pets/zh-cn.yml | 6 ++++++ config/locales/wow_pets/zh-tw.yml | 6 ++++++ config/routes.rb | 8 +++++--- .../20210424192800_add_locale_to_user.rb | 5 +++++ db/schema.rb | 3 ++- package.json | 1 + yarn.lock | 5 +++++ 62 files changed, 413 insertions(+), 38 deletions(-) create mode 100644 app/views/layouts/_locales.html.erb create mode 100644 config/locales/layouts/de-de.yml create mode 100644 config/locales/layouts/en-gb.yml create mode 100644 config/locales/layouts/en-us.yml create mode 100644 config/locales/layouts/es-es.yml create mode 100644 config/locales/layouts/es-mx.yml create mode 100644 config/locales/layouts/fr-fr.yml create mode 100644 config/locales/layouts/it.yml create mode 100644 config/locales/layouts/ko.yml create mode 100644 config/locales/layouts/pt-br.yml create mode 100644 config/locales/layouts/ru-ru.yml create mode 100644 config/locales/layouts/zh-cn.yml create mode 100644 config/locales/layouts/zh-tw.yml create mode 100644 config/locales/wow_characters/de-de.yml create mode 100644 config/locales/wow_characters/en-gb.yml create mode 100644 config/locales/wow_characters/en-us.yml create mode 100644 config/locales/wow_characters/es-es.yml create mode 100644 config/locales/wow_characters/es-mx.yml create mode 100644 config/locales/wow_characters/fr-fr.yml create mode 100644 config/locales/wow_characters/it.yml create mode 100644 config/locales/wow_characters/ko.yml create mode 100644 config/locales/wow_characters/pt-br.yml create mode 100644 config/locales/wow_characters/ru-ru.yml create mode 100644 config/locales/wow_characters/zh-cn.yml create mode 100644 config/locales/wow_characters/zh-tw.yml create mode 100644 config/locales/wow_mounts/de-de.yml create mode 100644 config/locales/wow_mounts/en-gb.yml create mode 100644 config/locales/wow_mounts/en-us.yml create mode 100644 config/locales/wow_mounts/es-es.yml create mode 100644 config/locales/wow_mounts/es-mx.yml create mode 100644 config/locales/wow_mounts/fr-fr.yml create mode 100644 config/locales/wow_mounts/it.yml create mode 100644 config/locales/wow_mounts/ko.yml create mode 100644 config/locales/wow_mounts/pt-br.yml create mode 100644 config/locales/wow_mounts/ru-ru.yml create mode 100644 config/locales/wow_mounts/zh-cn.yml create mode 100644 config/locales/wow_mounts/zh-tw.yml create mode 100644 config/locales/wow_pets/de-de.yml create mode 100644 config/locales/wow_pets/en-gb.yml create mode 100644 config/locales/wow_pets/en-us.yml create mode 100644 config/locales/wow_pets/es-es.yml create mode 100644 config/locales/wow_pets/es-mx.yml create mode 100644 config/locales/wow_pets/fr-fr.yml create mode 100644 config/locales/wow_pets/it.yml create mode 100644 config/locales/wow_pets/ko.yml create mode 100644 config/locales/wow_pets/pt-br.yml create mode 100644 config/locales/wow_pets/ru-ru.yml create mode 100644 config/locales/wow_pets/zh-cn.yml create mode 100644 config/locales/wow_pets/zh-tw.yml create mode 100644 db/migrate/20210424192800_add_locale_to_user.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 94182c4..98b53bb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,11 +2,25 @@ class ApplicationController < ActionController::Base around_action :switch_locale def switch_locale(&action) - locale = I18n.locale_available?(request.headers['Locale']) ? request.headers['Locale'] : I18n.default_locale + locale = extract_locale I18n.with_locale(locale, &action) end def new_session_path(_scope) new_user_session_path end + + def extract_locale + if params[:locale] + I18n.locale_available?(params[:locale]) ? params[:locale] : I18n.default_locale + elsif request.env['HTTP_ACCEPT_LANGUAGE'] + I18n.locale_available?(request.env['HTTP_ACCEPT_LANGUAGE']) ? request.env['HTTP_ACCEPT_LANGUAGE'] : I18n.default_locale + else + I18n.default_locale + end + end + + def default_url_options + { locale: I18n.locale } + end end diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 95a7375..15eb5d8 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -12,6 +12,7 @@ import "bootstrap" import "../stylesheets/application" import "@fortawesome/fontawesome-free/css/all" +import "flag-icon-css/sass/flag-icon" document.addEventListener("turbolinks:load", () => { $('[data-toggle="tooltip"]').tooltip() diff --git a/app/views/layouts/_locales.html.erb b/app/views/layouts/_locales.html.erb new file mode 100644 index 0000000..36beba9 --- /dev/null +++ b/app/views/layouts/_locales.html.erb @@ -0,0 +1,19 @@ + diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index c4564c1..35740f8 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -5,16 +5,19 @@ <% if user_signed_in? %> +