Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use fallback locale for JavaScript in I18N

Browse Source
This commit is contained in:
Pig Fang 2017-11-24 20:01:06 +08:00
parent 157c9e8b22
commit 577c5ab8df
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/src/js/common/i18n.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
$.locales = {}; $.locales = Object.create(null);
$.currentLocale = {}; $.currentLocale = Object.create(null);
/** /**
* Load current selected language. * Load current selected language.
@ -11,7 +11,7 @@ $.currentLocale = {};
function loadLocales() { function loadLocales() {
for (let lang in $.locales) { for (let lang in $.locales) {
if (!isEmpty($.locales[lang])) { if (!isEmpty($.locales[lang])) {
$.currentLocale = $.locales[lang] || {}; $.currentLocale = $.locales[lang] || Object.create(null);
} }
} }
} }

7
resources/views/common/dependencies/script.tpl
View File

@ -1,5 +1,10 @@
<script type="text/javascript" src="{{ assets('js/app.js') }}"></script> <script type="text/javascript" src="{{ assets('js/app.js') }}"></script>
<script type="text/javascript" src="{{ assets('lang/'.config('app.locale').'/locale.js') }}"></script>
@if (file_exists(resource_path('lang/'.config('app.locale').'/locale.js')))
<script type="text/javascript" src="{{ assets('lang/'.config('app.locale').'/locale.js') }}"></script>
@else
<script type="text/javascript" src="{{ assets('lang/'.config('app.fallback_locale').'/locale.js') }}"></script>
@endif
@if (isset($module)) @if (isset($module))
<script type="text/javascript" src="{{ assets('js/'.$module.'.js') }}"></script> <script type="text/javascript" src="{{ assets('js/'.$module.'.js') }}"></script>