Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'bug/fix-i18n-detection' into 'master'

Browse Source 
Fix locale handling

See merge request framasoft/mobilizon!245
This commit is contained in:
Thomas Citharel 2019-10-11 10:04:35 +02:00
commit c2f6254e5c
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/i18n/index.js
View File

@ -1,7 +1,27 @@
import en_US from './en_US';
import fr_FR from './fr_FR';
import en from './en_US';
import fr from './fr_FR';
import cs from './cs';
import de from './de';
import es from './es';
import it from './it';
import ja from './ja';
import nl from './nl';
import oc from './oc';
import pl from './pl';
import pt from './pt';
import ru from './ru';
export default {
en_US,
fr_FR
fr,
en,
cs,
de,
es,
it,
ja,
nl,
oc,
pl,
pt,
ru
}

3
js/src/main.ts
View File

@ -24,8 +24,9 @@ const language = (window.navigator as any).userLanguage || window.navigator.lang
Vue.use(VueI18n);
const i18n = new VueI18n({
locale: language.replace('-', '_'), // set locale
locale: language.split('-')[0], // set locale
messages, // set locale messages
fallbackLocale: 'en_US',
});
// Register the router hooks with their names