-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Intl] Revise timezone name generation #31434
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
@@ -151,7 +151,7 @@ | |||
"America\/Moncton": "Atlantic Time (Moncton)", | |||
"America\/Monterrey": "Central Time (Monterrey)", | |||
"America\/Montevideo": "Uruguay Time (Montevideo)", | |||
"America\/Montreal": "Canada (Montreal)", | |||
"America\/Montreal": "Canada Time (Montreal)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use the regionFormat
for country-based names, this is much more consistent with explicitly translated zones, e.g. Coordinated Universal Time
and Central European Time
@@ -99,7 +99,6 @@ | |||
"Indian\/Mayotte": "heure d’Afrique orientale (Mayotte)", | |||
"Indian\/Reunion": "heure de la Réunion", | |||
"PST8PDT": "heure du Pacifique", | |||
"Pacific\/Easter": "heure de l’île de Pâques", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
here's the bugfix; this should be inherited from fr
locale
@@ -0,0 +1,8 @@ | |||
{ | |||
"Version": "2.1.49.82", | |||
"Meta": { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
root metadata is now compiled into root.json, in order to de-duplicte locale metadata
@@ -3,20 +3,8 @@ | |||
"Names": { | |||
"Africa\/Kigali": "U Rwanda (Kigali)", | |||
"Antarctica\/Troll": "Troll", | |||
"CST6CDT": "CST6CDT", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should never provide zone IDs as translations, in this case the runtime fallback should apply instead.
{ | ||
"Version": "2.1.47.86", | ||
"Names": { | ||
"Africa\/Abidjan": "格林尼治标准时间(阿比贊)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
only alias locales are deleted (related to #31411)
Can you rebase to get green tests? |
Ready for rebase on 4.3. |
Done. (failures unrelated) |
Thank you @ro0NL. |
This PR was merged into the 4.3 branch. Discussion ---------- [Intl] Revise timezone name generation | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes (inlcluding intl-data group) | Fixed tickets | #... <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | symfony/symfony-docs#... <!-- required for new features --> This is the final polishing needed for #31294 :) I've realized it's much easier to de-duplicate by processing fallback locales separate, and then only keep the diff compared to a specific locale. More or less the same approach `LocaleDataGenerator` already follows. I was trying to be clever and filter based on inheritance in a single process; bad idea. Includes https://github.com/ro0NL/symfony/commit/31591d0 (ref #31432) Commits ------- bfdb4ed [Intl] Revise timezone name generation
…mezoneType (ro0NL) This PR was merged into the 4.3 branch. Discussion ---------- [Form] Add intl/choice_translation_locale option to TimezoneType | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #28836 | License | MIT | Doc PR | symfony/symfony-docs#11503 final step :) for now i think any form of grouping is a user concern (i.e. by GMT offset or area name); see #31293 + #31295 having a special built in `group_by' => 'gmt_offset'` util would be nice, and can be done in the future. includes #31434 Commits ------- 001b930 [Form] Add intl/choice_translation_locale option to TimezoneType
This is the final polishing needed for #31294 :)
I've realized it's much easier to de-duplicate by processing fallback locales separate, and then only keep the diff compared to a specific locale. More or less the same approach
LocaleDataGenerator
already follows. I was trying to be clever and filter based on inheritance in a single process; bad idea.Includes https://github.com/ro0NL/symfony/commit/31591d0 (ref #31432)