In Bug 455749 some TLDs were added or removed but the changes are missing today. bl - Saint Barthélemy (was added? and is missing now) cs - Serbia and Montenegro (was removed? and is still in) cw - Curaçao (is missing) me - Montenegro (was added? and is missing now) mf - Saint Martin (was added? and is missing now) rs - Serbia (was added? and is missing now) sx - Sint Maarten (is missing) Compared to http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm we should at least add the missing TLDs to our list.
The current version of the file is http://mxr.mozilla.org/mozilla-central/source/toolkit/locales/en-US/chrome/global/regionNames.properties, not as in the URL field. Comparing that file with http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm, http://www.iana.org/assignments/language-subtag-registry and the list in comment 0: bl - is present cs - is removed cw - is missing me - is present mf - is present rs - is present sx - is missing Other than those there are also: an - deprecated 2011-01-07, should be removed bq - is missing ss - is missing
Uh, sorry for confusing. Then adding bq, cw, ss, and sx would be fine.
I forgot this bug existed, so I incorporated it into bug 716321. There is a patch there (attachment 612048 [details] [diff] [review]).
Created attachment 630174 [details] [diff] [review] Update regionNames.properties (v1) This is the same as attachment 612048 [details] [diff] [review] on bug 716321. I'm re-separating the bugs to ensure that the lengthy discussion about language subtags does not interfere with the uncontroversial region subtag changes. For reference, here is my explanation of this patch (from bug 716321 comment 9 and bug 716321 comment 10): (In reply to Axel Hecht [:Pike] from bug 716321 comment #8) > Comment on attachment 612048 [details] [diff] [review] > Update regionNames.properties (v1) > > Review of attachment 612048 [details] [diff] [review]: > ----------------------------------------------------------------- > > The regionNames pose the same question, what's the data set, and why? > > I find a footnote on > http://de.wikipedia.org/wiki/ISO-3166-1-Kodierliste#cite_note-anm1-0 which > claims that ea etc shouldn't be included, for example. Can't find a > corresponding note in English, sorry. Well, first off, I should remind you that we're implementing BCP 47, not ISO 3166. It is up to curators of the IANA Language Subtag Registry to determine whether a particular ISO 3166 is appropriate for use in a language tag. They have determined that certain reserved codes are appropriate and certain ones are not. (You'll note, for example, that reserved code 'UK' is not in this list, because 'GB' is the code that should be used.) With that being said, this list is generated from the region subtags listed in the IANA Language Subtag Registry, with the deprecated and private use subtags removed. (It is actually debatable whether we want to exclude the deprecated subtags, but we made the decision to do so.) The files involved in generating this patch are here: https://github.com/GPHemsley/BCP47/blob/master/get_subtags.py https://github.com/GPHemsley/BCP47/blob/master/region.txt https://github.com/GPHemsley/BCP47/blob/master/regionNames.properties https://github.com/GPHemsley/BCP47/blob/master/regionDeprecated.properties https://github.com/GPHemsley/BCP47/blob/master/makefile#L67 https://github.com/GPHemsley/BCP47/blob/master/regionNames-l10n.properties I should also note that some of the English names have been overridden from the names that are listed in the registry. The regions in question are here: https://github.com/GPHemsley/BCP47/blob/master/get_subtags.py#L213 My original justification for these choices is here: http://groups.google.com/group/mozilla.dev.l10n/browse_thread/thread/97d2dddb8db97248/1231aceeaf2cfc06 (Note: Some of the "renames" I justify in that thread merely involve reverting to the name used in the registry. The get_subtags.py lists the manual overrides in relation to the registry, not the existing names in the Mozilla source.) > Technically, I'd prefer if you didn't change whitespace. If you have to, > don't align the '=', but just go consistently for ' = '. r- for the > technical nit. Per BCP 47, a region subtag is either 2 letters or 3 numbers. As such, I readjusted the whitespace to match the maximum possible length of a region subtag (instead of the seemingly-arbitrary number that currently exists in the file). If you'd like to me to change it to a single space on either side, that's fine by me. Just know that the numerical entries won't be aligned with the alphabetical entries.
So... are you now going to use my patch in bug 754960 or are you going to make more changes?
(In reply to Stefan [:stefanh] from comment #6) > So... are you now going to use my patch in bug 754960 or are you going to > make more changes? This update is part of a much larger effort to improve BCP47 support throughout the codebase. My patch attached here is going to be the basis of the changes made for this bug. I'm awaiting feedback from Axel on how to proceed with that, but I expect my patch will supersede yours.
Created attachment 655836 [details] [diff] [review] Update regionNames.properties (v2) Rebasing the original patch. No content changes compared to that.
Comment on attachment 655836 [details] [diff] [review] Update regionNames.properties (v2) Review of attachment 655836 [details] [diff] [review]: ----------------------------------------------------------------- Sorry for the lag. There's some junk at the end of the patch, not sure where that's coming from? I'm torn on SH, but I guess the Queen gets what the Queen wants. For MF, could we add a comment (and for SX) to explain why you're using french and dutch names? I guess localizers will find it hard to follow otherwise. Also, I think we should stick with the short form of Micronesia? r- mostly because I think we need comments. For a new patch, could you also attach a diff -w? That'd be much easier to review. ::: toolkit/locales/en-US/chrome/global/regionNames.properties @@ +78,5 @@ > +eu = European Union > +fi = Finland > +fj = Fiji > +fk = Falkland Islands (Malvinas) > +fm = Federated States of Micronesia This used to be just 'Micronesia', should we get that back?