aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-09-17 15:54:00 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-09-17 17:56:04 +0200
commit9a3aeb8a99e7edeb38b5791adf71cfd13059957b (patch)
tree3e7c4c0225fa25f8d5a1d0b8f30f1431b4238725 /phpBB/assets
parent3dbac0f88ba056b19b29fdcabd76074a8dd250d5 (diff)
downloadforums-9a3aeb8a99e7edeb38b5791adf71cfd13059957b.tar
forums-9a3aeb8a99e7edeb38b5791adf71cfd13059957b.tar.gz
forums-9a3aeb8a99e7edeb38b5791adf71cfd13059957b.tar.bz2
forums-9a3aeb8a99e7edeb38b5791adf71cfd13059957b.tar.xz
forums-9a3aeb8a99e7edeb38b5791adf71cfd13059957b.zip
[ticket/12858] Remove hardcoded language entries from timezone selects
PHPBB3-12858
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/core.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index b5187991f9..6ddbba7515 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -786,7 +786,7 @@ phpbb.timezoneSwitchDate = function(keepSelection) {
}
if ($tzDate.val() !== '') {
- $timezone.children('optgroup').remove(':not([label="' + $('#tz_date').val() + '"])');
+ $timezone.children('optgroup').remove(':not([data-tz-value="' + $('#tz_date').val() + '"])');
}
if ($tzDate.val() === $tzSelectDateSuggest.attr('data-suggested-tz')) {
@@ -795,7 +795,7 @@ phpbb.timezoneSwitchDate = function(keepSelection) {
$tzSelectDateSuggest.css('display', 'inline');
}
- var $tzOptions = $timezone.children('optgroup[label="' + $tzDate.val() + '"]').children('option');
+ var $tzOptions = $timezone.children('optgroup[data-tz-value="' + $tzDate.val() + '"]').children('option');
if ($tzOptions.length === 1) {
// If there is only one timezone for the selected date, we just select that automatically.
@@ -849,7 +849,7 @@ phpbb.timezonePreselectSelect = function(forceSelector) {
minutes = minutes.toString();
}
- var prefix = 'GMT' + sign + hours + ':' + minutes;
+ var prefix = 'UTC' + sign + hours + ':' + minutes;
var prefixLength = prefix.length;
var selectorOptions = $('option', '#tz_date');
var i;