mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-06 21:21:23 +00:00
* Fix locales issue #43 * Adding open-direction bottom to the language multiselect
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -21,3 +21,4 @@ Homestead.yaml
|
||||
.DS_Store
|
||||
.php-cs-fixer.cache
|
||||
/storage/fonts*
|
||||
package-lock.json
|
||||
|
||||
@@ -18,7 +18,6 @@ class AppServiceProvider extends ServiceProvider
|
||||
public function boot()
|
||||
{
|
||||
Paginator::useBootstrapThree();
|
||||
$this->loadJsonTranslationsFrom(resource_path('scripts/locales'));
|
||||
|
||||
if (InstallUtils::isDbCreated()) {
|
||||
$this->addMenus();
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -76,7 +76,8 @@
|
||||
label="name"
|
||||
value-prop="code"
|
||||
track-by="name"
|
||||
open-direction="top"
|
||||
:searchable="true"
|
||||
open-direction="bottom"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
</BaseInputGrid>
|
||||
|
||||
@@ -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==
|
||||
Reference in New Issue
Block a user