Skip to content

CLDR-11874 Add conversion of subdivisions to json #4255

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
srl295 merged 1 commit into from
Jan 14, 2025
Merged

CLDR-11874 Add conversion of subdivisions to json #4255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ enum RunType {
annotations,
annotationsDerived,
bcp47(false, false),
transforms(false, false);
transforms(false, false),
subdivisions(false, true);

private final boolean isTiered;
private final boolean hasLocales;
Expand Down Expand Up @@ -748,6 +749,8 @@ private int convertCldrItems(
outFilename = filename + ".json";
} else if (type == RunType.transforms) {
outFilename = filename + ".json";
} else if (type == RunType.subdivisions) {
outFilename = filename + ".json";
} else if (js.section.equals("other")) {
// If you see other-___.json, it means items that were missing from
// JSON_config_*.txt
Expand Down Expand Up @@ -786,7 +789,8 @@ private int convertCldrItems(
}
} else if (type == RunType.rbnf
|| type == RunType.bcp47
|| type == RunType.transforms) {
|| type == RunType.transforms
|| type == RunType.subdivisions) {
// untiered, just use the name
js.packageName = type.name();
tier = "";
Expand Down
3 changes: 1 addition & 2 deletions tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ class LdmlConvertRules {

/** File sets that will not be processed in JSON transformation. */
public static final ImmutableSet<String> IGNORE_FILE_SET =
ImmutableSet.of(
"attributeValueValidity", "coverageLevels", "postalCodeData", "subdivisions");
ImmutableSet.of("attributeValueValidity", "coverageLevels", "postalCodeData");

/**
* The attribute list that should become part of the name in form of name-(attribute)-(value).
Expand Down
10 changes: 10 additions & 0 deletions tools/cldr-code/src/main/resources/org/unicode/cldr/json/JSON_config_subdivisions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Processed by LdmlConfigFileReader

# These are earlier in the file to keep the packageDesc in one place.
package=subdivisions ; packageDesc=Translated versions of locale display name elements: subdivisions.

# mapping paths to sections
section=subdivisions ; path=//cldr/subdivisions/[^/]++/localeDisplayNames/subdivisions/.* ; package=subdivisions

# Depedencies
dependency=core ; package=subdivisions
1 change: 1 addition & 0 deletions tools/cldr-code/src/main/resources/org/unicode/cldr/json/JSON_config_supplemental.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ section=aliases ; path=//cldr/supplemental/metadata/alias/(language|script|subdi
section=units ; path=//cldr/supplemental/(unitConstants|unitQuantities|convertUnits|unitPrefixes).* ; package=core
section=unitsMetadata ; path=//cldr/supplemental/metadata/.*/(unitAlias|usageAlias).* ; package=core
section=unitIdComponents ; path=//cldr/supplemental/unitIdComponents/.* ; package=core
section=subdivisionContainment ; path=//cldr/supplemental/subdivisionContainment/.* ; package=core

# ignored items
section=IGNORE ; path=//cldr/supplemental/metadata/serialElements.* ; package=IGNORE
Expand Down
Loading