Skip to content

Commit

Permalink
⬆️ updated package dependencies
Browse files Browse the repository at this point in the history
🐛 fix issue #95 - change password functionality thanks @thtuerk for the PR!
🐛 fix issue #100 browser's preferred language setting prevents menus from loading
✨ implemented #97: users can now override the default setting for the start of the week - thanks @kenske for the PR!
  • Loading branch information
faburem committed Feb 5, 2022
1 parent 55c4fa0 commit 056c650
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 54 deletions.
16 changes: 13 additions & 3 deletions imports/utils/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,25 @@ const loadLanguage = (language, i18nextDebugMode) => {
// Meteor.js is not very smart
// eslint-disable-next no-constant-condition
if (false) {
import('/imports/ui/translations/en.json')
import('/imports/ui/translations/de.json')
import('/imports/ui/translations/fr.json')
import('../ui/translations/en.json')
import('../ui/translations/de.json')
import('../ui/translations/fr.json')
}
import(`/imports/ui/translations/${language}.json`).then((lang) => {
i18nReady.set(false)
setup(lang.default, language, i18nextDebugMode)
i18nReady.set(true)
$('html').attr('lang', language)
}).catch(() => {
import('../ui/translations/en.json').then((lang) => {
if (i18nextDebugMode) {
console.log('Language not found, using default language en')
}
i18nReady.set(false)
setup(lang.default, 'en', i18nextDebugMode)
i18nReady.set(true)
$('html').attr('lang', 'en')
})
})
}
export {
Expand Down
126 changes: 79 additions & 47 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "titra",
"version": "0.68.0",
"version": "0.69.0",
"private": true,
"scripts": {
"start": "meteor run"
},
"dependencies": {
"@babel/runtime": "^7.16.7",
"@babel/runtime": "^7.17.0",
"@fortawesome/fontawesome-free": "^5.15.4",
"@fullcalendar/core": "^5.10.1",
"@fullcalendar/daygrid": "^5.10.1",
Expand Down Expand Up @@ -43,8 +43,8 @@
"vm2": "^3.9.5"
},
"devDependencies": {
"@babel/core": "^7.16.12",
"@babel/eslint-parser": "^7.16.5",
"@babel/core": "^7.17.0",
"@babel/eslint-parser": "^7.17.0",
"eslint": "^8.8.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-import-resolver-meteor": "^0.4.0",
Expand Down

0 comments on commit 056c650

Please sign in to comment.