diff --git a/.gitignore b/.gitignore index e65d398e..46743497 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,7 @@ coverage/ *~ # dont push generated js translations to repository -/app/assets/javascripts/i18n/*.js -/app/javascript/legacy/i18n.js +/app/javascript/retrospring/i18n.ts # every fucking time, dolphin .directory diff --git a/app/javascript/packs/legacy.coffee b/app/javascript/packs/legacy.coffee index 636dbf5c..99148724 100644 --- a/app/javascript/packs/legacy.coffee +++ b/app/javascript/packs/legacy.coffee @@ -5,17 +5,11 @@ import '../legacy/jquery' import 'popper.js' import 'bootstrap' import 'particleground/jquery.particleground.min' -import Cookies from 'js-cookie' -# this file is generated by Rails -import I18n from '../legacy/i18n' import '../legacy/pagination' import '../legacy/locale-box' import '../legacy/util' -I18n.defaultLocale = 'en'; -I18n.locale = Cookies.get('hl') || 'en'; - _ready = -> $('[data-toggle="tooltip"]').tooltip() $('.dropdown-toggle').dropdown() diff --git a/config/i18n-js.yml b/config/i18n-js.yml index c71da13a..9ff4f95e 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -26,7 +26,7 @@ fallbacks: :default_locale export_i18n_js: false translations: - - file: 'app/javascript/legacy/i18n.js' + - file: 'app/javascript/retrospring/i18n.ts' only: ['*.frontend.*', '*.views.actions.*'] - prefix: "import I18n from 'i18n-js'\n" - suffix: "\nexport default I18n" + prefix: "import I18n from 'i18n-js'\nimport Cookies from 'js-cookie'\n" + suffix: "I18n.defaultLocale = 'en';\nI18n.locale = Cookies.get('hl') || 'en';\nexport default I18n"