Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00
Code Issues Wiki Activity

Revert "Replace i18next http backend by filesystem sync backend"

Browse source 
This reverts commit 60d58e7ac9.
This commit is contained in:
Miguel Angel Mulero Martinez 2020-10-29 13:11:28 +01:00
parent d3addd2d25
commit 39808a5477
5 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -52,7 +52,7 @@
"bluebird": "^3.7.2",
"djv": "^2.1.3-alpha.0",
"i18next": "^19.0.0",
"i18next-fs-backend": "^1.0.7",
"i18next-http-backend": "^1.0.21",
"inflection": "^1.12.0",
"jbox": "^1.0.8",
"jquery": "^3.5.1",

5
src/js/localization.js
View file

@ -20,10 +20,8 @@ const languageFallback = {
i18n.init = function(cb) {
getStoredUserLocale(function(userLanguage) {
const I18NextFsBackend = require('i18next-fs-backend');
i18next
.use(I18NextFsBackend)
.use(i18nextHttpBackend)
.init({
lng: userLanguage,
getAsync: false,
@ -35,7 +33,6 @@ i18n.init = function(cb) {
loadPath: './locales/{{lng}}/{{ns}}.json',
parse: i18n.parseInputFile,
},
initImmediate: false,
},
function(err) {
if (err !== undefined) {

1
src/main.html
View file

@ -50,6 +50,7 @@
<!-- CORDOVA_INCLUDE js/cordova_startup.js -->
<script type="text/javascript" src="./node_modules/lru_map/lru.js"></script>
<script type="text/javascript" src="./node_modules/i18next/i18next.min.js"></script>
<script type="text/javascript" src="./node_modules/i18next-http-backend/i18nextHttpBackend.min.js"></script>
<script type="text/javascript" src="./node_modules/marked/marked.min.js"></script>
<script type="text/javascript" src="./node_modules/universal-ga/lib/analytics.min.js"></script>
<script type="text/javascript" src="./node_modules/short-unique-id/dist/short-unique-id.min.js"></script>

1
src/main_cordova.html
View file

@ -40,6 +40,7 @@
</div>
<script type="text/javascript" src="./node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="./node_modules/i18next/i18next.min.js"></script>
<script type="text/javascript" src="./node_modules/i18next-xhr-backend/i18nextXHRBackend.min.js"></script>
<script type="text/javascript" src="./js/localization.js"></script>
<script type="text/javascript" src="cordova.js"></script>
<script type="text/javascript" src="./js/main_cordova.js"></script>

15
yarn.lock
View file

@ -3843,10 +3843,12 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
i18next-fs-backend@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/i18next-fs-backend/-/i18next-fs-backend-1.0.7.tgz#00ca4587e306f8948740408389dda73461a5d07f"
integrity sha512-aAZ3rvshe1Zbl6JSCWrWWqbZS5JpmVNG+84YqLcgdYcm9uAxzw4xWxnA/a3044Nm2PKXE62CT+pIZjk7OEYtTw==
i18next-http-backend@^1.0.21:
version "1.0.21"
resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.0.21.tgz#cee901b3527dad5165fa91de973b6aa6404c1c37"
integrity sha512-UDeHoV2B+31Gr++0KFAVjM5l+SEwePpF6sfDyaDq5ennM9QNJ78PBEMPStwkreEm4h5C8sT7M1JdNQrLcU1Wdg==
dependencies:
node-fetch "2.6.1"
i18next@^19.0.0:
version "19.5.1"
@ -5500,6 +5502,11 @@ node-environment-flags@1.0.6:
object.getownpropertydescriptors "^2.0.3"
semver "^5.7.0"
node-fetch@2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
node-pre-gyp@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"