CLDR-17081 Fix PNF test data for ICU (#3270)

* CLDR-17081 Fix PNF test data for ICU * CLDR-17081 More complete test of qualifying PNF data * CLDR-17081 Make fixes to gd and gl * CLDR-17081 Fix case hacks * CLDR-17081 Fix remaining gl issue * CLDR-17081 And run the testData generation
unicode-org · Sep 13, 2023 · 2fa7830 · 2fa7830
1 parent 54d1da7
commit 2fa7830
Show file tree

Hide file tree

Showing 20 changed files with 155 additions and 5,384 deletions.
diff --git a/common/main/gd.xml b/common/main/gd.xml
@@ -15148,27 +15148,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="formal">
 			<namePattern>{surname-core}, {given} {given2} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
 			<namePattern>{surname}, {given-informal} {given2}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
 			<namePattern>{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
-			<namePattern>{surname}, {given-informal} {given2}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
+			<namePattern>{surname}, {given-informal} {given2-informal-initial}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
 			<namePattern>{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="informal">
-			<namePattern>{surname}, {given-informal} {given2}</namePattern>
-			<namePattern alt="1">{surname-core}, {given-informal} {given2} {surname-prefix}</namePattern>
+			<namePattern>{surname}, {given-informal} {given2-informal-initial}</namePattern>
 		</personName>
 		<sampleName item="nativeG">
 			<nameField type="given">Calum</nameField>

diff --git a/common/main/gl.xml b/common/main/gl.xml
@@ -9797,27 +9797,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<personName order="sorting" length="long" usage="referring" formality="formal">
 			<namePattern>{surname-core} {surname2}, {given} {given2} {surname-prefix}</namePattern>
 			<namePattern alt="1">{surname-core}, {given} {given2} {surname-prefix}</namePattern>
-			<namePattern alt="2">↑↑↑</namePattern>
 		</personName>
 		<personName order="sorting" length="long" usage="referring" formality="informal">
 			<namePattern>{surname-core} {surname2}, {given-informal} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
+			<namePattern alt="1">{surname-core}, {given-informal} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="formal">
 			<namePattern>{surname-core} {surname2}, {given} {given2-initial} {surname-prefix}</namePattern>
-			<namePattern alt="1">{surname-core} {surname2}, {given} {given2} {surname-prefix}</namePattern>
+			<namePattern alt="1">{surname-core}, {given} {given2-initial} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="medium" usage="referring" formality="informal">
 			<namePattern>{surname-core} {surname2}, {given-informal} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
+			<namePattern alt="1">{surname-core}, {given-informal} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="formal">
 			<namePattern>{surname-core} {surname2}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
-			<namePattern alt="1">{surname-core} {surname2}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
+			<namePattern alt="1">{surname-core}, {given-initial} {given2-initial} {surname-prefix}</namePattern>
 		</personName>
 		<personName order="sorting" length="short" usage="referring" formality="informal">
 			<namePattern>{surname-core} {surname2}, {given-informal} {surname-prefix}</namePattern>
-			<namePattern alt="1">↑↑↑</namePattern>
+			<namePattern alt="1">{surname-core}, {given-informal} {surname-prefix}</namePattern>
 		</personName>
 		<sampleName item="nativeG">
 			<nameField type="given">Uxía</nameField>

diff --git a/common/testData/personNameTest/br.txt b/common/testData/personNameTest/br.txt