Skip to content

Commit

Permalink
CLDR-11570 Fix test for grc_Cprt
Browse files Browse the repository at this point in the history
Last commit I edited a file but made a slight mistake. This fixes that and hopefully addresses the test issue.

Code ran:

mvn package -DskipTests=true &&  java -jar tools/cldr-code/target/cldr-code.jar ConvertLanguageData &&  java -jar tools/cldr-code/target/cldr-code.jar GenerateLikelySubtags &&  java -jar tools/cldr-code/target/cldr-code.jar GenerateTestData

Note `ht` Changes look like they come from changes after adding the locale in a different pull request.
  • Loading branch information
conradarcturus committed Oct 26, 2024
1 parent dd55636 commit 8b2f7b2
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 3 deletions.
1 change: 0 additions & 1 deletion common/supplemental/likelySubtags.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="gos" to="gos_Latn_NL"/> <!--Gronings‧?‧? ➡ Gronings‧Latin‧Netherlands-->
<likelySubtag from="got" to="got_Goth_UA"/> <!--Gothic‧?‧? ➡ Gothic‧Gothic‧Ukraine-->
<likelySubtag from="grc" to="grc_Grek_GR"/> <!--Ancient Greek‧?‧? ➡ Ancient Greek‧Greek‧Greece-->
<likelySubtag from="grc_Cprt" to="grc_Cprt_CY"/> <!--Ancient Greek‧Cypriot‧? ➡ Ancient Greek‧Cypriot‧Cyprus-->
<likelySubtag from="grt" to="grt_Beng_IN"/> <!--Garo‧?‧? ➡ Garo‧Bangla‧India-->
<likelySubtag from="gsw" to="gsw_Latn_CH"/> <!--Swiss German‧?‧? ➡ Swiss German‧Latin‧Switzerland-->
<likelySubtag from="gu" to="gu_Gujr_IN"/> <!--Gujarati‧?‧? ➡ Gujarati‧Gujarati‧India-->
Expand Down
5 changes: 5 additions & 0 deletions common/testData/localeIdentifiers/likelySubtags.txt
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,11 @@ hsb-AQ ; hsb-Latn-AQ ; hsb-AQ ;
hsb-DE ; hsb-Latn-DE ; hsb ;
hsb-Egyp ; hsb-Egyp-DE ; hsb-Egyp ;
hsb-Latn ; hsb-Latn-DE ; hsb ;
ht ; ht-Latn-HT ; ht ;
ht-AQ ; ht-Latn-AQ ; ht-AQ ;
ht-Egyp ; ht-Egyp-HT ; ht-Egyp ;
ht-HT ; ht-Latn-HT ; ht ;
ht-Latn ; ht-Latn-HT ; ht ;
hu ; hu-Latn-HU ; hu ;
hu-AQ ; hu-Latn-AQ ; hu-AQ ;
hu-Egyp ; hu-Egyp-HU ; hu-Egyp ;
Expand Down
26 changes: 26 additions & 0 deletions common/testData/localeIdentifiers/localeDisplayName.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1310,6 +1310,32 @@ nl-Latn-BE; flamšćina (łaćonsce)
zh-Hans-fonipa; chinšćina [zjednorjena] (FONIPA)


@locale=ht
@languageDisplay=standard

en-MM; anglais (Myanmar [Birmanie])
es; espagnol
es-419; espagnol (Amérique latine)
es-Cyrl-MX; espagnol (cyrillique, Mexique)
hi-Latn; hindi (latin)
nl-BE; néerlandais (Belgique)
nl-Latn-BE; néerlandais (latin, Belgique)
zh-Hans-fonipa; chinois (simplifié, alphabet phonétique international)


@locale=ht
@languageDisplay=dialect

en-MM; anglais (Myanmar [Birmanie])
es; espagnol
es-419; espagnol d’Amérique latine
es-Cyrl-MX; espagnol du Mexique (cyrillique)
hi-Latn; hindi (latin)
nl-BE; flamand
nl-Latn-BE; flamand (latin)
zh-Hans-fonipa; chinois simplifié (alphabet phonétique international)


@locale=hu
@languageDisplay=standard

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ public static void main(String[] args) throws IOException {
{"arc_Hatr", "arc_Hatr_IQ"},
{"hnj_Hmng", "hnj_Hmng_LA"},
{"bap_Krai", "bap_Krai_IN"},
{"grc_Cprt", "grc_Cprt_CY"},
{"und_Cprt", "grc_Cprt_CY"},
});

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public BasicLanguageData freeze() {
@Override
public BasicLanguageData cloneAsThawed() {
BasicLanguageData result = new BasicLanguageData();
result.scripts = new TreesSet<>(scripts);
result.scripts = new TreeSet<>(scripts);
result.territories = new TreeSet<>(territories);
return this;
}
Expand Down

0 comments on commit 8b2f7b2

Please sign in to comment.