ICU-22583 BRS 75rc CLDR 45-alpha0 to ICU main part 4 (fix to get new …

…unitPrefixes data)
unicode-org · Feb 7, 2024 · 43ab3d1 · 43ab3d1
1 parent 12cbf73
commit 43ab3d1
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 5 deletions.
diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
@@ -2212,6 +2212,132 @@ units:table(nofallback){
             }
         }
     }
+    unitPrefixes{
+        atto{
+            power10{"-18"}
+            symbol{"a"}
+        }
+        centi{
+            power10{"-2"}
+            symbol{"c"}
+        }
+        deci{
+            power10{"-1"}
+            symbol{"d"}
+        }
+        deka{
+            power10{"1"}
+            symbol{"da"}
+        }
+        exa{
+            power10{"18"}
+            symbol{"E"}
+        }
+        exbi{
+            power2{"60"}
+            symbol{"Ei"}
+        }
+        femto{
+            power10{"-15"}
+            symbol{"f"}
+        }
+        gibi{
+            power2{"30"}
+            symbol{"Gi"}
+        }
+        giga{
+            power10{"9"}
+            symbol{"G"}
+        }
+        hecto{
+            power10{"2"}
+            symbol{"h"}
+        }
+        kibi{
+            power2{"10"}
+            symbol{"Ki"}
+        }
+        kilo{
+            power10{"3"}
+            symbol{"k"}
+        }
+        mebi{
+            power2{"20"}
+            symbol{"Mi"}
+        }
+        mega{
+            power10{"6"}
+            symbol{"M"}
+        }
+        milli{
+            power10{"-3"}
+            symbol{"m"}
+        }
+        nano{
+            power10{"-9"}
+            symbol{"n"}
+        }
+        pebi{
+            power2{"50"}
+            symbol{"Pi"}
+        }
+        peta{
+            power10{"15"}
+            symbol{"P"}
+        }
+        pico{
+            power10{"-12"}
+            symbol{"p"}
+        }
+        quecto{
+            power10{"-30"}
+            symbol{"q"}
+        }
+        quetta{
+            power10{"30"}
+            symbol{"Q"}
+        }
+        ronna{
+            power10{"27"}
+            symbol{"R"}
+        }
+        ronto{
+            power10{"-27"}
+            symbol{"r"}
+        }
+        tebi{
+            power2{"40"}
+            symbol{"Ti"}
+        }
+        tera{
+            power10{"12"}
+            symbol{"T"}
+        }
+        yobi{
+            power2{"80"}
+            symbol{"Yi"}
+        }
+        yocto{
+            power10{"-24"}
+            symbol{"y"}
+        }
+        yotta{
+            power10{"24"}
+            symbol{"Y"}
+        }
+        zebi{
+            power2{"70"}
+            symbol{"Zi"}
+        }
+        zepto{
+            power10{"-21"}
+            symbol{"z"}
+        }
+        zetta{
+            power10{"21"}
+            symbol{"Z"}
+        }
+    }
     unitQuantities{
         {
             candela{"luminous-intensity"}

diff --git a/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/units.res b/icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/units.res
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
@@ -111,7 +111,8 @@ public final class LdmlConverter {
             "convertUnits",
             "unitConstants",
             "unitQuantities",
-            "unitPreferenceData");
+            "unitPreferenceData",
+            "unitPrefixes");
     private static final Predicate<CldrPath> GRAMMATICAL_FEATURES_PATHS =
         supplementalMatcher("grammaticalData");
     private static final Predicate<CldrPath> NUMBERING_SYSTEMS_PATHS =

diff --git a/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt b/tools/cldr/cldr-to-icu/src/main/resources/ldml2icu_supplemental.txt
@@ -186,12 +186,12 @@
 # units.xml
 
 //supplementalData/unitPrefixes/unitPrefix[@type="(%W)"][@symbol="(%W)"][@power10="(%A)"]
-    ; /convertUnits/$1/symbol ; values=$2
-    ; /convertUnits/$1/power10 ; values=$3
+    ; /unitPrefixes/$1/symbol ; values=$2
+    ; /unitPrefixes/$1/power10 ; values=$3
 
 //supplementalData/unitPrefixes/unitPrefix[@type="(%W)"][@symbol="(%W)"][@power2="(%A)"]
-    ; /convertUnits/$1/symbol ; values=$2
-    ; /convertUnits/$1/power2 ; values=$3
+    ; /unitPrefixes/$1/symbol ; values=$2
+    ; /unitPrefixes/$1/power2 ; values=$3
 
 //supplementalData/unitConstants/unitConstant[@constant="(%W)"][@value="(%A)"](?:[@status="%W"])?
     ; /unitConstants/$1 ; values="$2"