amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-12 11:55:09 +00:00
Code Issues Projects Releases Wiki Activity

Localize datepicker and respect user's defaults

Browse Source
This commit is contained in:
Francis Lachapelle
2016-01-11 16:32:12 -05:00
parent 09b3b4e13f
commit 77baffb85c
5 changed files with 238 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Preferences/Preferences.service.js
+20 -2
View File
@@ -65,11 +65,28 @@
angular.extend(_this.defaults, data);
angular.extend(Preferences.$mdDateLocaleProvider, data.locale);
Preferences.$mdDateLocaleProvider.firstDayOfWeek = parseInt(data.SOGoFirstDayOfWeek);
Preferences.$mdDateLocaleProvider.weekNumberFormatter = function(weekNumber) {
return l('Week %d', weekNumber);
};
Preferences.$mdDateLocaleProvider.msgCalendar = l('Calender');
Preferences.$mdDateLocaleProvider.msgOpenCalendar = l('Open Calendar');
Preferences.$mdDateLocaleProvider.parseDate = function(dateString) {
return dateString? dateString.parseDate(Preferences.$mdDateLocaleProvider, data.SOGoShortDateFormat) : new Date(NaN);
};
Preferences.$mdDateLocaleProvider.formatDate = function(date) {
return date? date.format(Preferences.$mdDateLocaleProvider, data.SOGoShortDateFormat) : '';
};
Preferences.$mdDateLocaleProvider.formatTime = function(date) {
return date? date.format(Preferences.$mdDateLocaleProvider, data.SOGoTimeFormat) : '';
};
return _this.defaults;
});
this.settingsPromise = Preferences.$$resource.fetch("jsonSettings").then(function(data) {
// We convert our PreventInvitationsWhitelist hash into a array of user
// We convert our PreventInvitationsWhitelist hash into a array of user
if (data.Calendar) {
if (data.Calendar.PreventInvitationsWhitelist)
data.Calendar.PreventInvitationsWhitelist = _.map(data.Calendar.PreventInvitationsWhitelist, function(value, key) {
@@ -91,11 +108,12 @@
* @desc The factory we'll use to register with Angular
* @returns the Preferences constructor
*/
Preferences.$factory = ['$q', '$timeout', '$log', 'sgSettings', 'Resource', 'User', function($q, $timeout, $log, Settings, Resource, User) {
Preferences.$factory = ['$q', '$timeout', '$log', '$mdDateLocale', 'sgSettings', 'Resource', 'User', function($q, $timeout, $log, $mdDateLocaleProvider, Settings, Resource, User) {
angular.extend(Preferences, {
$q: $q,
$timeout: $timeout,
$log: $log,
$mdDateLocaleProvider: $mdDateLocaleProvider,
$$resource: new Resource(Settings.activeUser('folderURL'), Settings.activeUser()),
activeUser: Settings.activeUser(),
$User: User