Merge pull request #6228 from AminArria/timezone-information
Timezone information
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
angular.module('habitrpg')
|
||||
.filter('timezoneOffsetToUtc', function () {
|
||||
return function (offset) {
|
||||
var sign = offset > 0 ? '-' : '+';
|
||||
|
||||
offset = Math.abs(offset) / 60;
|
||||
|
||||
var hour = Math.floor(offset);
|
||||
|
||||
var minutes_int = (offset - hour) * 60;
|
||||
var minutes = minutes_int < 10 ? '0'+minutes_int : minutes_int;
|
||||
|
||||
return 'UTC' + sign + hour + ':' + minutes;
|
||||
}
|
||||
});
|
||||
@@ -58,6 +58,7 @@
|
||||
"js/filters/money.js",
|
||||
"js/filters/roundLargeNumbers.js",
|
||||
"js/filters/taskOrdering.js",
|
||||
"js/filters/timezoneOffsetToUtc.js",
|
||||
|
||||
"js/directives/close-menu.directive.js",
|
||||
"js/directives/expand-menu.directive.js",
|
||||
|
||||
@@ -116,6 +116,16 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
|
||||
ng-disabled='dayStart == user.preferences.dayStart')
|
||||
=env.t('saveCustomDayStart')
|
||||
|
||||
hr
|
||||
|
||||
h5=env.t('timezone')
|
||||
.form-horizontal
|
||||
.form-group
|
||||
.col-sm-12
|
||||
p!=env.t('timezoneUTC', {utc: "{{ user.preferences.timezoneOffset | timezoneOffsetToUtc }}"})
|
||||
br
|
||||
p!=env.t('timezoneInfo')
|
||||
|
||||
.personal-options.col-md-6
|
||||
.panel.panel-default
|
||||
.panel-heading
|
||||
|
||||
Reference in New Issue
Block a user