Skip to content

CLDR-15830 Refactor/simplify NameType #4287

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.

Sign up for GitHub

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

Merged
btangmu merged 3 commits into from
Jan 31, 2025
Merged

CLDR-15830 Refactor/simplify NameType #4287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2de151
CLDR-15830 Refactor/simplify NameType
btangmu Jan 17, 2025
55d67fc
CLDR-15830 Comment; switch instead of if/else
btangmu Jan 17, 2025
52369da
CLDR-15830 NameType.toCodeType instead of CodeType.fromNameType
btangmu Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tools/cldr-code/src/main/java/org/unicode/cldr/test/CLDRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,7 @@ public void TestDisplayNameCollisions() {
maps[nameTypeIndex].put(value, xpath);
continue;
}
String theName = nameType.getNameTypeName();
collisions.add(theName + "\t" + value + "\t" + xpath + "\t" + xpath2);
collisions.add(nameType + "\t" + value + "\t" + xpath + "\t" + xpath2);
surveyInfo.add(
locale
+ "\t"
Expand Down
2 changes: 1 addition & 1 deletion tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateKaraList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private static void printCodes(
"\t\t<hdterm>"
+ TransliteratorUtilities.toXML.transliterate(ename)
+ "</hdterm>\t<!-- "
+ TransliteratorUtilities.toXML.transliterate(nameType.getNameName())
+ TransliteratorUtilities.toXML.transliterate(nameType.toString())
+ ": "
+ id
+ " -->"); // English
Expand Down
26 changes: 0 additions & 26 deletions tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
*/
package org.unicode.cldr.util;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.UncheckedExecutionException;
import com.ibm.icu.impl.Relation;
Expand Down Expand Up @@ -2361,30 +2359,6 @@ public static String getLongTzid(String code) {
return code;
}

static final ImmutableMap<String, String> FIX_KEY_NAME;

static {
Builder<String, String> temp = ImmutableMap.builder();
for (String s :
Arrays.asList(
"colAlternate",
"colBackwards",
"colCaseFirst",
"colCaseLevel",
"colNormalization",
"colNumeric",
"colReorder",
"colStrength")) {
temp.put(s.toLowerCase(Locale.ROOT), s);
}
FIX_KEY_NAME = temp.build();
}

static String fixKeyName(String code) {
String result = FIX_KEY_NAME.get(code);
return result == null ? code : result;
}

/** For use in getting short names. */
public static final Transform<String, String> SHORT_ALTS =
new Transform<>() {
Expand Down
Loading
Loading