From 223678e5bdde179626a759274bdda8a851e5edc9 Mon Sep 17 00:00:00 2001 From: mchev Date: Wed, 27 Mar 2024 11:00:36 +0100 Subject: [PATCH] Fix locales issue #43 (#46) * Fix locales issue #43 * Adding open-direction bottom to the language multiselect --- .gitignore | 1 + app/Providers/AppServiceProvider.php | 1 - config/modules.php | 4 ++-- crowdin.yml | 4 ++-- {resources/scripts/locales => lang}/ar.json | 0 {resources/scripts/locales => lang}/cs.json | 0 {resources/scripts/locales => lang}/de.json | 0 {resources/scripts/locales => lang}/el.json | 0 {resources/scripts/locales => lang}/en.json | 0 {resources/lang => lang}/en/auth.php | 0 {resources/lang => lang}/en/pagination.php | 0 {resources/lang => lang}/en/passwords.php | 0 {resources/lang => lang}/en/validation.php | 0 {resources/scripts/locales => lang}/es.json | 0 {resources/scripts/locales => lang}/fa.json | 0 {resources/scripts/locales => lang}/fi.json | 0 {resources/scripts/locales => lang}/fr.json | 0 {resources/scripts/locales => lang}/hi.json | 0 {resources/scripts/locales => lang}/hr.json | 0 {resources/scripts/locales => lang}/id.json | 0 {resources/scripts/locales => lang}/it.json | 0 {resources/scripts/locales => lang}/ja.json | 0 {resources/scripts/locales => lang}/ko.json | 0 {resources/scripts/locales => lang}/locales.js | 0 {resources/scripts/locales => lang}/lt.json | 0 {resources/scripts/locales => lang}/lv.json | 0 {resources/scripts/locales => lang}/nl.json | 0 {resources/scripts/locales => lang}/pl.json | 0 {resources/scripts/locales => lang}/pt-br.json | 0 {resources/scripts/locales => lang}/pt.json | 0 {resources/scripts/locales => lang}/ro.json | 0 {resources/scripts/locales => lang}/ru.json | 0 {resources/scripts/locales => lang}/sk.json | 0 {resources/scripts/locales => lang}/sl.json | 0 {resources/scripts/locales => lang}/sr.json | 0 {resources/scripts/locales => lang}/sv.json | 0 {resources/scripts/locales => lang}/th.json | 0 {resources/scripts/locales => lang}/tr.json | 0 {resources/lang => lang}/vendor/backup/ar/notifications.php | 0 {resources/lang => lang}/vendor/backup/cs/notifications.php | 0 {resources/lang => lang}/vendor/backup/da/notifications.php | 0 {resources/lang => lang}/vendor/backup/de/notifications.php | 0 {resources/lang => lang}/vendor/backup/en/notifications.php | 0 {resources/lang => lang}/vendor/backup/es/notifications.php | 0 {resources/lang => lang}/vendor/backup/fa/notifications.php | 0 {resources/lang => lang}/vendor/backup/fi/notifications.php | 0 {resources/lang => lang}/vendor/backup/fr/notifications.php | 0 {resources/lang => lang}/vendor/backup/hi/notifications.php | 0 {resources/lang => lang}/vendor/backup/id/notifications.php | 0 {resources/lang => lang}/vendor/backup/it/notifications.php | 0 {resources/lang => lang}/vendor/backup/nl/notifications.php | 0 {resources/lang => lang}/vendor/backup/pl/notifications.php | 0 .../lang => lang}/vendor/backup/pt-BR/notifications.php | 0 {resources/lang => lang}/vendor/backup/ro/notifications.php | 0 {resources/lang => lang}/vendor/backup/ru/notifications.php | 0 {resources/lang => lang}/vendor/backup/tr/notifications.php | 0 {resources/lang => lang}/vendor/backup/uk/notifications.php | 0 {resources/lang => lang}/vendor/backup/vi/notifications.php | 0 .../lang => lang}/vendor/backup/zh-CN/notifications.php | 0 .../lang => lang}/vendor/backup/zh-TW/notifications.php | 0 {resources/scripts/locales => lang}/vi.json | 0 {resources/scripts/locales => lang}/zh.json | 0 resources/scripts/InvoiceShelf.js | 2 +- resources/scripts/admin/stores/global.js | 2 +- resources/scripts/admin/views/settings/AccountSetting.vue | 3 ++- yarn.lock | 2 +- 66 files changed, 10 insertions(+), 9 deletions(-) rename {resources/scripts/locales => lang}/ar.json (100%) rename {resources/scripts/locales => lang}/cs.json (100%) rename {resources/scripts/locales => lang}/de.json (100%) rename {resources/scripts/locales => lang}/el.json (100%) rename {resources/scripts/locales => lang}/en.json (100%) rename {resources/lang => lang}/en/auth.php (100%) rename {resources/lang => lang}/en/pagination.php (100%) rename {resources/lang => lang}/en/passwords.php (100%) rename {resources/lang => lang}/en/validation.php (100%) rename {resources/scripts/locales => lang}/es.json (100%) rename {resources/scripts/locales => lang}/fa.json (100%) rename {resources/scripts/locales => lang}/fi.json (100%) rename {resources/scripts/locales => lang}/fr.json (100%) rename {resources/scripts/locales => lang}/hi.json (100%) rename {resources/scripts/locales => lang}/hr.json (100%) rename {resources/scripts/locales => lang}/id.json (100%) rename {resources/scripts/locales => lang}/it.json (100%) rename {resources/scripts/locales => lang}/ja.json (100%) rename {resources/scripts/locales => lang}/ko.json (100%) rename {resources/scripts/locales => lang}/locales.js (100%) rename {resources/scripts/locales => lang}/lt.json (100%) rename {resources/scripts/locales => lang}/lv.json (100%) rename {resources/scripts/locales => lang}/nl.json (100%) rename {resources/scripts/locales => lang}/pl.json (100%) rename {resources/scripts/locales => lang}/pt-br.json (100%) rename {resources/scripts/locales => lang}/pt.json (100%) rename {resources/scripts/locales => lang}/ro.json (100%) rename {resources/scripts/locales => lang}/ru.json (100%) rename {resources/scripts/locales => lang}/sk.json (100%) rename {resources/scripts/locales => lang}/sl.json (100%) rename {resources/scripts/locales => lang}/sr.json (100%) rename {resources/scripts/locales => lang}/sv.json (100%) rename {resources/scripts/locales => lang}/th.json (100%) rename {resources/scripts/locales => lang}/tr.json (100%) rename {resources/lang => lang}/vendor/backup/ar/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/cs/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/da/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/de/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/en/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/es/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/fa/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/fi/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/fr/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/hi/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/id/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/it/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/nl/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/pl/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/pt-BR/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/ro/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/ru/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/tr/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/uk/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/vi/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/zh-CN/notifications.php (100%) rename {resources/lang => lang}/vendor/backup/zh-TW/notifications.php (100%) rename {resources/scripts/locales => lang}/vi.json (100%) rename {resources/scripts/locales => lang}/zh.json (100%) diff --git a/.gitignore b/.gitignore index 23c1620e..f3ceb21a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ Homestead.yaml .DS_Store .php-cs-fixer.cache /storage/fonts* +package-lock.json diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c496ffc2..62881023 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -18,7 +18,6 @@ class AppServiceProvider extends ServiceProvider public function boot() { Paginator::useBootstrapThree(); - $this->loadJsonTranslationsFrom(resource_path('scripts/locales')); if (InstallUtils::isDbCreated()) { $this->addMenus(); diff --git a/config/modules.php b/config/modules.php index f756f608..9e81b9e0 100644 --- a/config/modules.php +++ b/config/modules.php @@ -39,8 +39,8 @@ return [ 'resources/sass/module' => 'Resources/sass/module.scss', 'resources/scripts/stores/sample-store' => 'Resources/scripts/stores/sample-store.js', 'resources/scripts/views/SamplePage' => 'Resources/scripts/views/SamplePage.vue', - 'resources/locales/en' => 'Resources/locales/en.json', - 'resources/locales/locales' => 'Resources/locales/locales.js', + 'lang/en' => 'Lang/en.json', + 'lang/locales' => 'Lang/locales.js', 'package' => 'package.json', 'postcss.config' => 'postcss.config.js', 'tailwind.config' => 'tailwind.config.js', diff --git a/crowdin.yml b/crowdin.yml index da4a46a6..71d77891 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - - source: /resources/scripts/locales/en.json - translation: /resources/scripts/locales/%two_letters_code%.json + - source: /lang/en.json + translation: /lang/%two_letters_code%.json diff --git a/resources/scripts/locales/ar.json b/lang/ar.json similarity index 100% rename from resources/scripts/locales/ar.json rename to lang/ar.json diff --git a/resources/scripts/locales/cs.json b/lang/cs.json similarity index 100% rename from resources/scripts/locales/cs.json rename to lang/cs.json diff --git a/resources/scripts/locales/de.json b/lang/de.json similarity index 100% rename from resources/scripts/locales/de.json rename to lang/de.json diff --git a/resources/scripts/locales/el.json b/lang/el.json similarity index 100% rename from resources/scripts/locales/el.json rename to lang/el.json diff --git a/resources/scripts/locales/en.json b/lang/en.json similarity index 100% rename from resources/scripts/locales/en.json rename to lang/en.json diff --git a/resources/lang/en/auth.php b/lang/en/auth.php similarity index 100% rename from resources/lang/en/auth.php rename to lang/en/auth.php diff --git a/resources/lang/en/pagination.php b/lang/en/pagination.php similarity index 100% rename from resources/lang/en/pagination.php rename to lang/en/pagination.php diff --git a/resources/lang/en/passwords.php b/lang/en/passwords.php similarity index 100% rename from resources/lang/en/passwords.php rename to lang/en/passwords.php diff --git a/resources/lang/en/validation.php b/lang/en/validation.php similarity index 100% rename from resources/lang/en/validation.php rename to lang/en/validation.php diff --git a/resources/scripts/locales/es.json b/lang/es.json similarity index 100% rename from resources/scripts/locales/es.json rename to lang/es.json diff --git a/resources/scripts/locales/fa.json b/lang/fa.json similarity index 100% rename from resources/scripts/locales/fa.json rename to lang/fa.json diff --git a/resources/scripts/locales/fi.json b/lang/fi.json similarity index 100% rename from resources/scripts/locales/fi.json rename to lang/fi.json diff --git a/resources/scripts/locales/fr.json b/lang/fr.json similarity index 100% rename from resources/scripts/locales/fr.json rename to lang/fr.json diff --git a/resources/scripts/locales/hi.json b/lang/hi.json similarity index 100% rename from resources/scripts/locales/hi.json rename to lang/hi.json diff --git a/resources/scripts/locales/hr.json b/lang/hr.json similarity index 100% rename from resources/scripts/locales/hr.json rename to lang/hr.json diff --git a/resources/scripts/locales/id.json b/lang/id.json similarity index 100% rename from resources/scripts/locales/id.json rename to lang/id.json diff --git a/resources/scripts/locales/it.json b/lang/it.json similarity index 100% rename from resources/scripts/locales/it.json rename to lang/it.json diff --git a/resources/scripts/locales/ja.json b/lang/ja.json similarity index 100% rename from resources/scripts/locales/ja.json rename to lang/ja.json diff --git a/resources/scripts/locales/ko.json b/lang/ko.json similarity index 100% rename from resources/scripts/locales/ko.json rename to lang/ko.json diff --git a/resources/scripts/locales/locales.js b/lang/locales.js similarity index 100% rename from resources/scripts/locales/locales.js rename to lang/locales.js diff --git a/resources/scripts/locales/lt.json b/lang/lt.json similarity index 100% rename from resources/scripts/locales/lt.json rename to lang/lt.json diff --git a/resources/scripts/locales/lv.json b/lang/lv.json similarity index 100% rename from resources/scripts/locales/lv.json rename to lang/lv.json diff --git a/resources/scripts/locales/nl.json b/lang/nl.json similarity index 100% rename from resources/scripts/locales/nl.json rename to lang/nl.json diff --git a/resources/scripts/locales/pl.json b/lang/pl.json similarity index 100% rename from resources/scripts/locales/pl.json rename to lang/pl.json diff --git a/resources/scripts/locales/pt-br.json b/lang/pt-br.json similarity index 100% rename from resources/scripts/locales/pt-br.json rename to lang/pt-br.json diff --git a/resources/scripts/locales/pt.json b/lang/pt.json similarity index 100% rename from resources/scripts/locales/pt.json rename to lang/pt.json diff --git a/resources/scripts/locales/ro.json b/lang/ro.json similarity index 100% rename from resources/scripts/locales/ro.json rename to lang/ro.json diff --git a/resources/scripts/locales/ru.json b/lang/ru.json similarity index 100% rename from resources/scripts/locales/ru.json rename to lang/ru.json diff --git a/resources/scripts/locales/sk.json b/lang/sk.json similarity index 100% rename from resources/scripts/locales/sk.json rename to lang/sk.json diff --git a/resources/scripts/locales/sl.json b/lang/sl.json similarity index 100% rename from resources/scripts/locales/sl.json rename to lang/sl.json diff --git a/resources/scripts/locales/sr.json b/lang/sr.json similarity index 100% rename from resources/scripts/locales/sr.json rename to lang/sr.json diff --git a/resources/scripts/locales/sv.json b/lang/sv.json similarity index 100% rename from resources/scripts/locales/sv.json rename to lang/sv.json diff --git a/resources/scripts/locales/th.json b/lang/th.json similarity index 100% rename from resources/scripts/locales/th.json rename to lang/th.json diff --git a/resources/scripts/locales/tr.json b/lang/tr.json similarity index 100% rename from resources/scripts/locales/tr.json rename to lang/tr.json diff --git a/resources/lang/vendor/backup/ar/notifications.php b/lang/vendor/backup/ar/notifications.php similarity index 100% rename from resources/lang/vendor/backup/ar/notifications.php rename to lang/vendor/backup/ar/notifications.php diff --git a/resources/lang/vendor/backup/cs/notifications.php b/lang/vendor/backup/cs/notifications.php similarity index 100% rename from resources/lang/vendor/backup/cs/notifications.php rename to lang/vendor/backup/cs/notifications.php diff --git a/resources/lang/vendor/backup/da/notifications.php b/lang/vendor/backup/da/notifications.php similarity index 100% rename from resources/lang/vendor/backup/da/notifications.php rename to lang/vendor/backup/da/notifications.php diff --git a/resources/lang/vendor/backup/de/notifications.php b/lang/vendor/backup/de/notifications.php similarity index 100% rename from resources/lang/vendor/backup/de/notifications.php rename to lang/vendor/backup/de/notifications.php diff --git a/resources/lang/vendor/backup/en/notifications.php b/lang/vendor/backup/en/notifications.php similarity index 100% rename from resources/lang/vendor/backup/en/notifications.php rename to lang/vendor/backup/en/notifications.php diff --git a/resources/lang/vendor/backup/es/notifications.php b/lang/vendor/backup/es/notifications.php similarity index 100% rename from resources/lang/vendor/backup/es/notifications.php rename to lang/vendor/backup/es/notifications.php diff --git a/resources/lang/vendor/backup/fa/notifications.php b/lang/vendor/backup/fa/notifications.php similarity index 100% rename from resources/lang/vendor/backup/fa/notifications.php rename to lang/vendor/backup/fa/notifications.php diff --git a/resources/lang/vendor/backup/fi/notifications.php b/lang/vendor/backup/fi/notifications.php similarity index 100% rename from resources/lang/vendor/backup/fi/notifications.php rename to lang/vendor/backup/fi/notifications.php diff --git a/resources/lang/vendor/backup/fr/notifications.php b/lang/vendor/backup/fr/notifications.php similarity index 100% rename from resources/lang/vendor/backup/fr/notifications.php rename to lang/vendor/backup/fr/notifications.php diff --git a/resources/lang/vendor/backup/hi/notifications.php b/lang/vendor/backup/hi/notifications.php similarity index 100% rename from resources/lang/vendor/backup/hi/notifications.php rename to lang/vendor/backup/hi/notifications.php diff --git a/resources/lang/vendor/backup/id/notifications.php b/lang/vendor/backup/id/notifications.php similarity index 100% rename from resources/lang/vendor/backup/id/notifications.php rename to lang/vendor/backup/id/notifications.php diff --git a/resources/lang/vendor/backup/it/notifications.php b/lang/vendor/backup/it/notifications.php similarity index 100% rename from resources/lang/vendor/backup/it/notifications.php rename to lang/vendor/backup/it/notifications.php diff --git a/resources/lang/vendor/backup/nl/notifications.php b/lang/vendor/backup/nl/notifications.php similarity index 100% rename from resources/lang/vendor/backup/nl/notifications.php rename to lang/vendor/backup/nl/notifications.php diff --git a/resources/lang/vendor/backup/pl/notifications.php b/lang/vendor/backup/pl/notifications.php similarity index 100% rename from resources/lang/vendor/backup/pl/notifications.php rename to lang/vendor/backup/pl/notifications.php diff --git a/resources/lang/vendor/backup/pt-BR/notifications.php b/lang/vendor/backup/pt-BR/notifications.php similarity index 100% rename from resources/lang/vendor/backup/pt-BR/notifications.php rename to lang/vendor/backup/pt-BR/notifications.php diff --git a/resources/lang/vendor/backup/ro/notifications.php b/lang/vendor/backup/ro/notifications.php similarity index 100% rename from resources/lang/vendor/backup/ro/notifications.php rename to lang/vendor/backup/ro/notifications.php diff --git a/resources/lang/vendor/backup/ru/notifications.php b/lang/vendor/backup/ru/notifications.php similarity index 100% rename from resources/lang/vendor/backup/ru/notifications.php rename to lang/vendor/backup/ru/notifications.php diff --git a/resources/lang/vendor/backup/tr/notifications.php b/lang/vendor/backup/tr/notifications.php similarity index 100% rename from resources/lang/vendor/backup/tr/notifications.php rename to lang/vendor/backup/tr/notifications.php diff --git a/resources/lang/vendor/backup/uk/notifications.php b/lang/vendor/backup/uk/notifications.php similarity index 100% rename from resources/lang/vendor/backup/uk/notifications.php rename to lang/vendor/backup/uk/notifications.php diff --git a/resources/lang/vendor/backup/vi/notifications.php b/lang/vendor/backup/vi/notifications.php similarity index 100% rename from resources/lang/vendor/backup/vi/notifications.php rename to lang/vendor/backup/vi/notifications.php diff --git a/resources/lang/vendor/backup/zh-CN/notifications.php b/lang/vendor/backup/zh-CN/notifications.php similarity index 100% rename from resources/lang/vendor/backup/zh-CN/notifications.php rename to lang/vendor/backup/zh-CN/notifications.php diff --git a/resources/lang/vendor/backup/zh-TW/notifications.php b/lang/vendor/backup/zh-TW/notifications.php similarity index 100% rename from resources/lang/vendor/backup/zh-TW/notifications.php rename to lang/vendor/backup/zh-TW/notifications.php diff --git a/resources/scripts/locales/vi.json b/lang/vi.json similarity index 100% rename from resources/scripts/locales/vi.json rename to lang/vi.json diff --git a/resources/scripts/locales/zh.json b/lang/zh.json similarity index 100% rename from resources/scripts/locales/zh.json rename to lang/zh.json diff --git a/resources/scripts/InvoiceShelf.js b/resources/scripts/InvoiceShelf.js index 3376d37e..9e69d3a1 100644 --- a/resources/scripts/InvoiceShelf.js +++ b/resources/scripts/InvoiceShelf.js @@ -1,7 +1,7 @@ import { createApp } from 'vue' import App from '@/scripts/App.vue' import { createI18n } from 'vue-i18n' -import messages from '@/scripts/locales/locales' +import messages from '/lang/locales' import router from '@/scripts/router/index' import { defineGlobalComponents } from './global-components' import utils from '@/scripts/helpers/utilities.js' diff --git a/resources/scripts/admin/stores/global.js b/resources/scripts/admin/stores/global.js index 7e885962..4c2d1b6f 100644 --- a/resources/scripts/admin/stores/global.js +++ b/resources/scripts/admin/stores/global.js @@ -79,7 +79,7 @@ export const useGlobalStore = (useWindow = false) => { companyStore.selectedCompanyCurrency = response.data.current_company_currency - global.locale = + global.locale.value = response.data.current_user_settings.language || 'en' this.isAppLoaded = true diff --git a/resources/scripts/admin/views/settings/AccountSetting.vue b/resources/scripts/admin/views/settings/AccountSetting.vue index df6d1795..602f043e 100644 --- a/resources/scripts/admin/views/settings/AccountSetting.vue +++ b/resources/scripts/admin/views/settings/AccountSetting.vue @@ -76,7 +76,8 @@ label="name" value-prop="code" track-by="name" - open-direction="top" + :searchable="true" + open-direction="bottom" /> diff --git a/yarn.lock b/yarn.lock index b86005a5..eadf7a4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2710,4 +2710,4 @@ yaml@^2.3.4: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file