ICU update to 58 part 2

scripts/trim_data.sh

Index: scripts/trim_data.sh
diff --git a/scripts/trim_data.sh b/scripts/trim_data.sh
index 208fbb8b93e39ea1263c084da0ae396ab5f1b4f5..46be26c88ac527ef549d81c4069df15142b92a12 100755
--- a/scripts/trim_data.sh
+++ b/scripts/trim_data.sh
@@ -4,6 +4,22 @@
 # found in the LICENSE file.
 
 
+# Remove entries currently not used in Chromium/V8.
+function filter_locale_data {
+  echo Removing unncessary categories in ${localedatapath}
+  for langpath in ${localedatapath}/*.txt
+  do
+    echo Overwriting ${langpath} ...
+    sed -r -i \
+      '/^    characterLabel\{$/,/^    \}$/d
+       /^    AuxExemplarCharacters\{.*\}$/d
+       /^    AuxExemplarCharacters\{$/, /^    \}$/d
+       /^    ExemplarCharacters\{.*\}$/d
+       /^    ExemplarCharacters\{$/, /^    \}$/d
+       /^        (mon|tue|wed|thu|fri|sat|sun|quarter)(|-short|-narrow)\{$/, /^        \}$/d' ${langpath}
+  done
+}
+
 # Remove display names for languages that are not listed in the accept-language
 # list of Chromium.
 function filter_display_language_names {
@@ -15,10 +31,10 @@ function filter_display_language_names {
   done
   ACCEPT_LANG_PATTERN="(${ACCEPT_LANG_PATTERN})[^a-z]"
 
-  echo "Filtering out display names for non-A-L languages ${langdatapath}"
-  for lang in $(grep -v '^#' "${scriptdir}/chrome_ui_languages.list")
+  echo "Filtering out display names for non-A-L languages in ${langdatapath}"
+  for langpath in ${langdatapath}/*.txt
   do
-    target=${langdatapath}/${lang}.txt
+    target=${langpath}
     echo Overwriting ${target} ...
     sed -r -i \
     '/^    Keys\{$/,/^    \}$/d
@@ -29,6 +45,8 @@ function filter_display_language_names {
        d
      }
      /^    Types\{$/,/^    \}$/d
+     /^    Types%short\{$/,/^    \}$/d
+     /^    characterLabelPattern\{$/,/^    \}$/d
      /^    Variants\{$/,/^    \}$/d' ${target}
 
     # Delete an empty "Languages" block. Otherwise, getting the display
@@ -39,7 +57,7 @@ function filter_display_language_names {
     '/^    Languages\{$/ {
        N
        /^    Languages\{\n    \}/ d
-     }' ${target}
+    }' ${target}
   done
 }
 
@@ -67,10 +85,6 @@ function abridge_locale_data_for_non_ui_languages {
     sed -n -r -i \
       '1, /^'${lang}'\{$/p
        /^    "%%ALIAS"\{/p
-       /^    AuxExemplarCharacters\{.*\}$/p
-       /^    AuxExemplarCharacters\{$/, /^    \}$/p
-       /^    ExemplarCharacters\{.*\}$/p
-       /^    ExemplarCharacters\{$/, /^    \}$/p
        /^    (LocaleScript|layout)\{$/, /^    \}$/p
        /^    Version\{.*$/p
        /^\}$/p' ${target}
@@ -189,6 +203,7 @@ langdatapath="${dataroot}/lang"
 
 
 
+filter_locale_data
 filter_display_language_names
 abridge_locale_data_for_non_ui_languages
 filter_currency_data