AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-21089 Ignoring incomplete alt path mappings.

Browse Source
This commit is contained in:
David Beaumont 2020-04-23 19:52:47 +02:00 committed by David Beaumont
parent a5c940dfd8
commit ef91cc3673
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/cldr/cldr-to-icu/build-icu-data.xml
View File

@ -315,7 +315,7 @@
<!-- The following elements configure alternate values for some special case paths.
The target path will only be replaced if both it, and the source path, exist in
the CLDR data (new paths will not be added if only the source path exists).
the CLDR data (paths will not be modified if only the source path exists).
Since the paths must represent the same semantic type of data, they must be in the
same "namespace" (same element names) and must not contain value attributes. Thus

11
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/AlternateLocaleData.java
View File

@ -104,7 +104,7 @@ public final class AlternateLocaleData {
}
private final class AltData extends FilteredData {
// Calculated per locale/data instance to make lokup as fast as possible.
// Calculated per locale/data instance to make lookup as fast as possible.
private final ImmutableMap<CldrPath, CldrPath> altPaths;
// Any source paths which are not also target paths are removed. This is legacy
// behaviour inherited from the original build tools, the reason for which is not
@ -123,8 +123,13 @@ public final class AlternateLocaleData {
altPaths = ImmutableMap.copyOf(combinedPaths);
}
this.altPaths = altPaths;
this.toRemove = altPaths.values().stream()
.filter(p -> !this.altPaths.containsKey(p))
this.toRemove = altPaths.entrySet().stream()
// Only remove source paths that are not also target paths...
.filter(e -> !this.altPaths.containsKey(e.getValue()))
// ... and if the target path it will be transformed to actually exists.
.filter(e -> getSourceData().get(e.getKey()) != null)
// The value in the mapping is the source path (it's target->source for lookup).
.map(Map.Entry::getValue)
.collect(toImmutableSet());
}

1
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
View File

@ -567,6 +567,7 @@ public final class LdmlConverter {
}
private void writeDependencyGraph(Path dir, DependencyGraph depGraph) {
createDirectory(dir);
try (BufferedWriter w = Files.newBufferedWriter(dir.resolve("LOCALE_DEPS.json"), UTF_8);
PrintWriter out = new PrintWriter(w)) {
depGraph.writeJsonTo(out, fileHeader);

7
tools/cldr/cldr-to-icu/src/test/java/org/unicode/icu/tool/cldrtoicu/AlternateLocaleDataTest.java
View File

@ -96,9 +96,10 @@ public class AlternateLocaleDataTest {
CldrData unresolved = transformed.getDataForLocale("xx", UNRESOLVED);
CldrData resolved = transformed.getDataForLocale("xx", RESOLVED);
// We still remove the source even if there was no target.
assertValuesUnordered(unresolved);
assertValuesUnordered(resolved);
// If there's no target the alt-path mapping is incomplete and we do nothing (this matches
// the old CLDR tool behaviour and reasonable but can hide inconsistencies in CLDR data).
assertValuesUnordered(unresolved, source);
assertValuesUnordered(resolved, source);
}
@Test