Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[mobile] fix bug 53253

Browse source
This commit is contained in:
Maxim Kadushkin 2021-10-22 23:04:06 +03:00
parent ec46276bea
commit 1b0b18b691
7 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/mobile/src/index_dev.html
View file

@ -59,12 +59,13 @@
return urlParams; return urlParams;
}; };
window.Common = {Locale: {defaultLang: <%= htmlWebpackPlugin.options.system.env.defaultLang %>}};
let params = getUrlParams(), let params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0]; lang = (params["lang"] || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
window.Common.Locale.currentLang = lang;
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];
window.Common = {Locale: {currentLang: lang}};
</script> </script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>

2
apps/documenteditor/mobile/src/lib/i18n.js
View file

@ -6,7 +6,7 @@ i18n.use(initReactI18next)
.use(Fetch) .use(Fetch)
.init({ .init({
lng: Common.Locale.currentLang, lng: Common.Locale.currentLang,
fallbackLng: "en", fallbackLng: Common.Locale.defaultLang,
escapeValue: false, escapeValue: false,
backend: { backend: {
loadPath: './locale/{{lng}}.json' loadPath: './locale/{{lng}}.json'

2
apps/presentationeditor/mobile/src/index_dev.html
View file

@ -60,7 +60,7 @@
} }
let params = getUrlParams(), let params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0]; lang = (params["lang"] || <%= htmlWebpackPlugin.options.system.env.defaultLang %>).split(/[\-\_]/)[0];
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];

2
apps/presentationeditor/mobile/src/lib/i18n.js
View file

@ -6,7 +6,7 @@ i18n.use(initReactI18next)
.use(Fetch) .use(Fetch)
.init({ .init({
lng: Common.Locale.currentLang, lng: Common.Locale.currentLang,
fallbackLng: "en", fallbackLng: Common.Locale.defaultLang,
escapeValue: false, escapeValue: false,
backend: { backend: {
loadPath: './locale/{{lng}}.json' loadPath: './locale/{{lng}}.json'

2
apps/spreadsheeteditor/mobile/src/index_dev.html
View file

@ -60,7 +60,7 @@
} }
let params = getUrlParams(), let params = getUrlParams(),
lang = (params["lang"] || 'en').split(/[\-\_]/)[0]; lang = (params["lang"] || <%= htmlWebpackPlugin.options.system.env.defaultLang %>).split(/[\-\_]/)[0];
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];

2
apps/spreadsheeteditor/mobile/src/lib/i18n.js
View file

@ -6,7 +6,7 @@ i18n.use(initReactI18next)
.use(Fetch) .use(Fetch)
.init({ .init({
lng: Common.Locale.currentLang, lng: Common.Locale.currentLang,
fallbackLng: "en", fallbackLng: Common.Locale.defaultLang,
escapeValue: false, escapeValue: false,
backend: { backend: {
loadPath: './locale/{{lng}}.json' loadPath: './locale/{{lng}}.json'

5
vendor/framework7-react/build/webpack.config.js vendored
View file

@ -204,6 +204,11 @@ module.exports = {
removeStyleLinkTypeAttributes: true, removeStyleLinkTypeAttributes: true,
useShortDoctype: true useShortDoctype: true
} : false, } : false,
system: {
env: {
defaultLang: JSON.stringify(process.env.DEFAULT_LANG || "en"),
}
},
}), }),
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: 'css/[name].css', filename: 'css/[name].css',