diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
commit | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (patch) | |
tree | f6058aff04281232666162f15b5d3054b349240c /phpBB/adm/style | |
parent | f3fef8934ee1614bc158c05699e57f0ba8a3fcb6 (diff) | |
parent | 457e13634e3b371fbb5fbf1116c761311a683957 (diff) | |
download | forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.gz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.bz2 forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.xz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.zip |
Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r-- | phpBB/adm/style/timezone_option.html | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/adm/style/timezone_option.html b/phpBB/adm/style/timezone_option.html index 7a799b69c6..acfff30184 100644 --- a/phpBB/adm/style/timezone_option.html +++ b/phpBB/adm/style/timezone_option.html @@ -1,17 +1,25 @@ <dl> <dt><label for="timezone">{L_BOARD_TIMEZONE}{L_COLON}</label></dt> - <!-- IF S_TZ_DATE_OPTIONS --> + <!-- IF .timezone_date --> <dd id="tz_select_date" style="display: none;"> <select name="tz_date" id="tz_date" class="autowidth tz_select"> <option value="">{L_SELECT_CURRENT_TIME}</option> - {S_TZ_DATE_OPTIONS} + <!-- BEGIN timezone_date --> + <option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option> + <!-- END timezone_date --> </select> </dd> <!-- ENDIF --> <dd> <select name="tz" id="timezone" class="autowidth tz_select"> <option value="">{L_SELECT_TIMEZONE}</option> - {S_TZ_OPTIONS} + <!-- BEGIN timezone_select --> + <optgroup label="{timezone_select.LABEL}" data-tz-value="{timezone_select.VALUE}"> + <!-- BEGIN timezone_options --> + <option title="{timezone_select.timezone_options.TITLE}" value="{timezone_select.timezone_options.VALUE}"<!-- IF timezone_select.timezone_options.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_select.timezone_options.LABEL}</option> + <!-- END timezone_options --> + </optgroup> + <!-- END timezone_select --> </select> <!-- INCLUDEJS timezone.js --> |