Skip to content

Commit f747054

Browse files
garethbowenjkuester
authored andcommittedAug 3, 2022
Use the locale cookie to set the language
#7617 (cherry picked from commit e8403e3)
1 parent a9facab commit f747054

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed
 

‎admin/src/js/controllers/main.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ angular.module('controllers').controller('MainCtrl',
33
$log,
44
$scope,
55
$state,
6-
$translate,
76
$window,
87
Auth,
8+
Language,
99
Location,
10-
Session
10+
Session,
11+
SetLanguage
1112
) {
1213
'ngInject';
1314

@@ -23,7 +24,7 @@ angular.module('controllers').controller('MainCtrl',
2324
});
2425
};
2526

26-
$translate.use('en');
27+
Language().then(locale => SetLanguage(locale));
2728
$scope.authorized = false;
2829
$scope.navbarCollapsed = true;
2930
Auth.any([['can_configure'], ['can_view_outgoing_messages'], ['can_export_all']])

‎admin/src/js/services/language.js

-8
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,8 @@ const moment = require('moment');
2424
SetLanguageCookie
2525
) {
2626
'ngInject';
27-
28-
const setDatepickerLanguage = function(language) {
29-
const availableCalendarLanguages = Object.keys($.fn.datepicker.dates);
30-
const calendarLanguage = availableCalendarLanguages.indexOf(language) >= 0 ? language : 'en';
31-
$.fn.datepicker.defaults.language = calendarLanguage;
32-
};
33-
3427
return function(code, setLanguageCookie) {
3528
moment.locale([code, 'en']);
36-
setDatepickerLanguage(code);
3729
$translate.use(code);
3830

3931
if (setLanguageCookie !== false) {

0 commit comments

Comments
 (0)
Please sign in to comment.