Merge Request #60
← To merge requests
From
translate-browser-lang
into
master
Translate - Set browser lang like default
Change the default language to navigation.language
defined browser. This was set in angular.config()
flow.
Commits (1)
Showing
1 changed file
Show diff stats
src/app/index.config.ts
... | ... | @@ -25,13 +25,16 @@ export function noosferoModuleConfig($logProvider: ng.ILogProvider, |
25 | 25 | } |
26 | 26 | |
27 | 27 | function configTranslation($translateProvider: angular.translate.ITranslateProvider, tmhDynamicLocaleProvider: any) { |
28 | + let defaultLanguage = (<any>navigator)['languages'] ? (<any>navigator)['languages'][0] : (navigator.language || (<any>navigator)['userLanguage']); | |
29 | + defaultLanguage = defaultLanguage ? defaultLanguage.replace(/-br|-us/i, '') : 'en'; | |
30 | + | |
28 | 31 | $translateProvider.useStaticFilesLoader({ |
29 | 32 | prefix: '/languages/', |
30 | 33 | suffix: '.json' |
31 | 34 | }); |
32 | 35 | $translateProvider.addInterpolation('$translateMessageFormatInterpolation'); |
33 | 36 | $translateProvider.useMissingTranslationHandlerLog(); |
34 | - $translateProvider.preferredLanguage('en'); | |
37 | + $translateProvider.preferredLanguage(defaultLanguage); | |
35 | 38 | $translateProvider.useSanitizeValueStrategy('escape'); |
36 | 39 | tmhDynamicLocaleProvider.localeLocationPattern('bower_components/angular-i18n/angular-locale_{{locale}}.js'); |
37 | 40 | tmhDynamicLocaleProvider.useCookieStorage(); | ... | ... |
-
mentioned in commit d06a730ad1cb76919f1fa7b2a824af56b5e87939
-
Quebrou uns testes por causa dessa configuração no idioma. Corrigido com: 6ee33b19896210d81163a7457eaafeb9216d75be