diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:35:24 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:35:24 +0200 |
| commit | 61f05e027d7fa86b3656e5186645de6422a4dc76 (patch) | |
| tree | c8655e833dbcd051d75dddf8a50a6bf32d783db6 /phpBB/language | |
| parent | f7f78adeb910c84e86414dd6f6470631f5a47d8f (diff) | |
| parent | 656d2c34e0ca1424f07bb0ec2ed7b8489becbd6c (diff) | |
| download | forums-61f05e027d7fa86b3656e5186645de6422a4dc76.tar forums-61f05e027d7fa86b3656e5186645de6422a4dc76.tar.gz forums-61f05e027d7fa86b3656e5186645de6422a4dc76.tar.bz2 forums-61f05e027d7fa86b3656e5186645de6422a4dc76.tar.xz forums-61f05e027d7fa86b3656e5186645de6422a4dc76.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop
* github-nickvergessen/ticket/11002:
[ticket/11002] Use translating option to rename the Etc/GMT options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d0afb846b4..ab66f38124 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -836,6 +836,35 @@ $lang = array_merge($lang, array( 'Dec' => 'Dec', ), + // Timezones can be translated. We use this for the Etc/GMT timezones here, + // because they are named invers to their offset. + 'timezones' => array( + 'Etc/GMT-12' => 'GMT+12', + 'Etc/GMT-11' => 'GMT+11', + 'Etc/GMT-10' => 'GMT+10', + 'Etc/GMT-9' => 'GMT+9', + 'Etc/GMT-8' => 'GMT+8', + 'Etc/GMT-7' => 'GMT+7', + 'Etc/GMT-6' => 'GMT+6', + 'Etc/GMT-5' => 'GMT+5', + 'Etc/GMT-4' => 'GMT+4', + 'Etc/GMT-3' => 'GMT+3', + 'Etc/GMT-2' => 'GMT+2', + 'Etc/GMT-1' => 'GMT+1', + 'Etc/GMT+1' => 'GMT-1', + 'Etc/GMT+2' => 'GMT-2', + 'Etc/GMT+3' => 'GMT-3', + 'Etc/GMT+4' => 'GMT-4', + 'Etc/GMT+5' => 'GMT-5', + 'Etc/GMT+6' => 'GMT-6', + 'Etc/GMT+7' => 'GMT-7', + 'Etc/GMT+8' => 'GMT-8', + 'Etc/GMT+9' => 'GMT-9', + 'Etc/GMT+10' => 'GMT-10', + 'Etc/GMT+11' => 'GMT-11', + 'Etc/GMT+12' => 'GMT-12', + ), + // The value is only an example and will get replaced by the current time on view 'dateformats' => array( 'd M Y, H:i' => '01 Jan 2007, 13:37', |