Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3e09816

Browse filesBrowse files
ro0NLro0NL
committed
update zone names to long generic
1 parent 308185e commit 3e09816
Copy full SHA for 3e09816

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

131 files changed

+47355
-47364
lines changed

‎src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
+9-18Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,28 +128,19 @@ private static function generateZones(ArrayAccessibleResourceBundle $typeBundle,
128128

129129
$zones = [];
130130
foreach (array_keys($available) as $zone) {
131-
$name = null;
132-
$city = null;
133-
134-
if (isset($localeBundle['zoneStrings'][$zone])) {
135-
$data = $localeBundle['zoneStrings'][$zone];
136-
$name = $data->get('ls') ?? $data->get('lg') ?? $data->get('ld');
137-
$city = $data->get('ec');
138-
} elseif (isset($rootBundle['zoneStrings'][$zone])) {
139-
$data = $rootBundle['zoneStrings'][$zone];
140-
$name = $data->get('ls') ?? $data->get('lg') ?? $data->get('ld');
141-
$city = $data->get('ec');
131+
// lg: long generic, e.g. "Central European Time"
132+
// ls: long specific (not DST), e.g. "Central European Standard Time"
133+
// ld: long DST, e.g. "Central European Summer Time"
134+
// ec: example city, e.g. "Amsterdam"
135+
$name = $localeBundle['zoneStrings'][$zone]['lg'] ?? $rootBundle['zoneStrings'][$zone]['lg'] ?? null;
136+
$city = $localeBundle['zoneStrings'][$zone]['ec'] ?? $rootBundle['zoneStrings'][$zone]['ec'] ?? null;
137+
138+
if (null === $name && isset($metazones[$zone])) {
139+
$name = $localeBundle['zoneStrings']['meta:'.$metazones[$zone]]['lg'] ?? null;
142140
}
143-
144141
if (null === $city && 0 !== strrpos($zone, 'Etc:') && false !== $i = strrpos($zone, ':')) {
145142
$city = str_replace('_', ' ', substr($zone, $i + 1));
146143
}
147-
148-
if (null === $name && isset($metazones[$zone]) && isset($localeBundle['zoneStrings']['meta:'.$metazones[$zone]])) {
149-
$metadata = $localeBundle['zoneStrings']['meta:'.$metazones[$zone]];
150-
$name = $metadata->get('ls') ?? $metadata->get('lg') ?? $metadata->get('ld') ?? $name;
151-
}
152-
153144
if (null !== $city) {
154145
if (null === $name) {
155146
$name = str_replace('{0}', $city, $localeBundle['zoneStrings']['regionFormat']);

‎src/Symfony/Component/Intl/Resources/data/timezones/af.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/af.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/am.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/am.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/ar.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/ar.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/as.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/as.json
+423-423Lines changed: 423 additions & 423 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/az.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/az.json
+424-424Lines changed: 424 additions & 424 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/be.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/be.json
+423-423Lines changed: 423 additions & 423 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/bg.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/bg.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/bn.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/bn.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/br.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/br.json
+329-329Lines changed: 329 additions & 329 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/bs.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/bs.json
+428-428Lines changed: 428 additions & 428 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/bs_Cyrl.json
+420-420Lines changed: 420 additions & 420 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/ca.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/ca.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/ce.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/ce.json
+422-422Lines changed: 422 additions & 422 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/cs.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/cs.json
+428-428Lines changed: 428 additions & 428 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/cy.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/cy.json
+424-424Lines changed: 424 additions & 424 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/da.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/da.json
+428-428Lines changed: 428 additions & 428 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/de.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/de.json
+428-428Lines changed: 428 additions & 428 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/de_CH.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/de_CH.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
"Asia\/Barnaul": "",
230230
"Asia\/Beirut": "",
231231
"Asia\/Bishkek": "",
232-
"Asia\/Brunei": "Brunei-Zeit (Brunei)",
232+
"Asia\/Brunei": "",
233233
"Asia\/Calcutta": "",
234234
"Asia\/Chita": "",
235235
"Asia\/Choibalsan": "",
@@ -408,7 +408,7 @@
408408
"Pacific\/Funafuti": "",
409409
"Pacific\/Galapagos": "",
410410
"Pacific\/Gambier": "",
411-
"Pacific\/Guadalcanal": "Salomoninseln-Zeit (Guadalcanal)",
411+
"Pacific\/Guadalcanal": "",
412412
"Pacific\/Guam": "",
413413
"Pacific\/Honolulu": "",
414414
"Pacific\/Johnston": "",

‎src/Symfony/Component/Intl/Resources/data/timezones/dz.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/dz.json
+349-349Lines changed: 349 additions & 349 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/ee.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/ee.json
+423-423Lines changed: 423 additions & 423 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/el.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/el.json
+426-426Lines changed: 426 additions & 426 deletions
Large diffs are not rendered by default.

‎src/Symfony/Component/Intl/Resources/data/timezones/en.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/timezones/en.json
+428-428Lines changed: 428 additions & 428 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.