From f773df26fd65c268765d04b4b6207144555a067c Mon Sep 17 00:00:00 2001 From: gnrunge Date: Tue, 22 Sep 2020 16:26:26 -0700 Subject: [PATCH] ICU-21028 Modifies ICU data generator so that the CLDR version is no longer added to the .txt data files with the exception of the root.txt files. This will drastically limit the number of changed files during a version upgrade because the version change is the only change in many of the data files. ICU-21028 Fixed an indent. ICU-21028 Factor in feedback from review. --- .../java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java index 29a4966aab4..0b842dcc050 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java @@ -348,7 +348,9 @@ public final class LdmlConverter { }); if (!splitData.getPaths().isEmpty() || isBaseLanguage || dir.includeEmpty()) { - splitData.setVersion(cldrVersion); + if (id.equals("root")) { + splitData.setVersion(cldrVersion); + } write(splitData, outDir, false); writtenLocaleIds.put(dir, id); } @@ -561,7 +563,7 @@ public final class LdmlConverter { } else { // These empty files only exist because the target of an alias has a parent locale // which is itself not in the set of written ICU files. An "indirect alias target". - icuData.setVersion(config.getVersionInfo().getCldrVersion()); + // No need to add data: Just write a resource bundle with an empty top-level table. } write(icuData, dir, false); }