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 "Upgrade i18next backend to i18nextHttpBackend"

Browse source 
This reverts commit 0671cfed3f.
This commit is contained in:
Miguel Angel Mulero Martinez 2020-10-29 19:25:35 +01:00
parent 39808a5477
commit 5213ca0602
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -52,7 +52,7 @@
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"djv": "^2.1.3-alpha.0", "djv": "^2.1.3-alpha.0",
"i18next": "^19.0.0", "i18next": "^19.0.0",
"i18next-http-backend": "^1.0.21", "i18next-xhr-backend": "^3.2.2",
"inflection": "^1.12.0", "inflection": "^1.12.0",
"jbox": "^1.0.8", "jbox": "^1.0.8",
"jquery": "^3.5.1", "jquery": "^3.5.1",
@ -85,6 +85,7 @@
"follow-redirects": "^1.10.0", "follow-redirects": "^1.10.0",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"postcss": "^8.1.1",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-concat": "~2.6.1", "gulp-concat": "~2.6.1",
"gulp-debian": "~0.1.8", "gulp-debian": "~0.1.8",
@ -106,7 +107,6 @@
"mocha": "^7.0.1", "mocha": "^7.0.1",
"nw-builder": "^3.5.7", "nw-builder": "^3.5.7",
"os": "^0.1.1", "os": "^0.1.1",
"postcss": "^8.1.1",
"rollup": "^2.28.2", "rollup": "^2.28.2",
"rollup-plugin-vue": "^5.*.*", "rollup-plugin-vue": "^5.*.*",
"rpm-builder": "^1.2.1", "rpm-builder": "^1.2.1",

2
src/js/localization.js
View file

@ -21,7 +21,7 @@ i18n.init = function(cb) {
getStoredUserLocale(function(userLanguage) { getStoredUserLocale(function(userLanguage) {
i18next i18next
.use(i18nextHttpBackend) .use(i18nextXHRBackend)
.init({ .init({
lng: userLanguage, lng: userLanguage,
getAsync: false, getAsync: false,

2
src/main.html
View file

@ -50,7 +50,7 @@
<!-- CORDOVA_INCLUDE js/cordova_startup.js --> <!-- 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/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/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/i18next-xhr-backend/i18nextXHRBackend.min.js"></script>
<script type="text/javascript" src="./node_modules/marked/marked.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/universal-ga/lib/analytics.min.js"></script>
<script type="text/javascript" src="./node_modules/short-unique-id/dist/short-unique-id.min.js"></script> <script type="text/javascript" src="./node_modules/short-unique-id/dist/short-unique-id.min.js"></script>

27
yarn.lock
View file

@ -9,6 +9,13 @@
dependencies: dependencies:
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/runtime@^7.5.5":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"
integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==
dependencies:
regenerator-runtime "^0.13.2"
"@fortawesome/fontawesome-free@^5.13.0": "@fortawesome/fontawesome-free@^5.13.0":
version "5.13.0" version "5.13.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.0.tgz#fcb113d1aca4b471b709e8c9c168674fbd6e06d9" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.0.tgz#fcb113d1aca4b471b709e8c9c168674fbd6e06d9"
@ -3843,12 +3850,12 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
i18next-http-backend@^1.0.21: i18next-xhr-backend@^3.2.2:
version "1.0.21" version "3.2.2"
resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.0.21.tgz#cee901b3527dad5165fa91de973b6aa6404c1c37" resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-3.2.2.tgz#769124441461b085291f539d91864e3691199178"
integrity sha512-UDeHoV2B+31Gr++0KFAVjM5l+SEwePpF6sfDyaDq5ennM9QNJ78PBEMPStwkreEm4h5C8sT7M1JdNQrLcU1Wdg== integrity sha512-OtRf2Vo3IqAxsttQbpjYnmMML12IMB5e0fc5B7qKJFLScitYaXa1OhMX0n0X/3vrfFlpHL9Ro/H+ps4Ej2j7QQ==
dependencies: dependencies:
node-fetch "2.6.1" "@babel/runtime" "^7.5.5"
i18next@^19.0.0: i18next@^19.0.0:
version "19.5.1" version "19.5.1"
@ -5502,11 +5509,6 @@ node-environment-flags@1.0.6:
object.getownpropertydescriptors "^2.0.3" object.getownpropertydescriptors "^2.0.3"
semver "^5.7.0" 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: node-pre-gyp@^0.12.0:
version "0.12.0" version "0.12.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@ -6751,6 +6753,11 @@ regenerator-runtime@^0.11.0:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.2:
version "0.13.3"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
regenerator-runtime@^0.13.4: regenerator-runtime@^0.13.4:
version "0.13.5" version "0.13.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"