Skip to content

Commit

Permalink
Fix timezone detection bug, does not exist in same way in 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Rashid Khan committed Nov 18, 2015
1 parent 4368180 commit ff47988
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/
node_modules/
target/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timelion",
"version": "0.1.176",
"version": "0.1.177",
"dependencies": {
"body-parser": "^1.12.0",
"boom": "^2.8.0",
Expand Down
25 changes: 25 additions & 0 deletions public/services/timezone.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
define(function (require) {
var tzDetect = require('jstimezonedetect').jstz;
var moment = require('moment');

return function timezoneFn(config, Private) {
return function () {
var configuredTZ = config.get('dateFormat:tz', 'Browser');
var configDefaults = Private(require('ui/config/defaults'));
var detectedTimezone = tzDetect.determine().name();
var isDefaultTimezone;

try {
isDefaultTimezone = configuredTZ === configDefaults['dateFormat:tz'].value;
} catch (e) {
return detectedTimezone;
}

var timezone = isDefaultTimezone ?
(detectedTimezone || moment().format('Z')) :
configuredTZ;

return timezone;
};
};
});

0 comments on commit ff47988

Please sign in to comment.