yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2214 from bjarnef/dev-v7-U4-10461

Browse Source 
U4-10461 - Format dates using culture of current backoffice user
This commit is contained in:
Zsolt
2017-09-29 10:14:27 +02:00
committed by GitHub
parent 828a94bc4f 9282312305
commit 7b106caf95
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function UserEditController($scope, $timeout, $location, $routeParams, formHelper, usersResource, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper) {
function UserEditController($scope, $timeout, $location, $routeParams, formHelper, usersResource, userService, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper, authResource, dateHelper) {
var vm = this;
@@ -92,7 +92,7 @@
});
}
function getLocalDate(date, format) {
function getLocalDate(date, culture, format) {
if(date) {
var dateVal;
var serverOffset = Umbraco.Sys.ServerVariables.application.serverTimeOffset;
@@ -105,7 +105,7 @@
dateVal = moment(date, "YYYY-MM-DD HH:mm:ss");
}
return dateVal.format(format);
return dateVal.locale(culture).format(format);
}
}
@@ -393,11 +393,14 @@
}
function formatDatesToLocal(user) {
user.formattedLastLogin = getLocalDate(user.lastLoginDate, "MMMM Do YYYY, HH:mm");
user.formattedLastLockoutDate = getLocalDate(user.lastLockoutDate, "MMMM Do YYYY, HH:mm");
user.formattedCreateDate = getLocalDate(user.createDate, "MMMM Do YYYY, HH:mm");
user.formattedUpdateDate = getLocalDate(user.updateDate, "MMMM Do YYYY, HH:mm");
user.formattedLastPasswordChangeDate = getLocalDate(user.lastPasswordChangeDate, "MMMM Do YYYY, HH:mm");
// get current backoffice user and format dates
userService.getCurrentUser().then(function (currentUser) {
user.formattedLastLogin = getLocalDate(user.lastLoginDate, currentUser.locale, "LLL");
user.formattedLastLockoutDate = getLocalDate(user.lastLockoutDate, currentUser.locale, "LLL");
user.formattedCreateDate = getLocalDate(user.createDate, currentUser.locale, "LLL");
user.formattedUpdateDate = getLocalDate(user.updateDate, currentUser.locale, "LLL");
user.formattedLastPasswordChangeDate = getLocalDate(user.lastPasswordChangeDate, currentUser.locale, "LLL");
});
}
init();

7
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function UsersController($scope, $timeout, $location, usersResource, userGroupsResource, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService, dateHelper) {
function UsersController($scope, $timeout, $location, usersResource, userGroupsResource, userService, localizationService, contentEditingHelper, usersHelper, formHelper, notificationsService, dateHelper) {
var vm = this;
var localizeSaving = localizationService.localize("general_saving");
@@ -596,7 +596,10 @@
dateVal = moment(user.lastLoginDate, "YYYY-MM-DD HH:mm:ss");
}
user.formattedLastLogin = dateVal.format("MMMM Do YYYY, HH:mm");
// get current backoffice user and format date
userService.getCurrentUser().then(function (currentUser) {
user.formattedLastLogin = dateVal.locale(currentUser.locale).format("LLL");
});
}
});
}