Add back display names for non-UI languages in A-L list

scripts/trim_data.sh

 #!/bin/bash
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Remove display names for languages that are not listed in the accept-language
 # list of Chromium.
 function filter_display_language_names {
-  UI_LANG_PATTERN="(${UI_LANGUAGES})[^a-z]"
+  for lang in $(grep -v '^#' accept_lang.list)
+  do
+    # Set $OP to '|' only if $ACCEPT_LANG_PATTERN is not empty.
+    OP=${ACCEPT_LANG_PATTERN:+|}
+    ACCEPT_LANG_PATTERN="${ACCEPT_LANG_PATTERN}${OP}${lang}"
+  done
+  ACCEPT_LANG_PATTERN="(${ACCEPT_LANG_PATTERN})[^a-z]"
 
-  echo "Filtering out display names for non-UI languages in ${langdatapath}"
+  echo "Filtering out display names for non-A-L languages ${langdatapath}"
   for lang in $(grep -v '^#' chrome_ui_languages.list)
   do
     target=${langdatapath}/${lang}.txt
+    echo Overwriting ${target} ...
     sed -r -i \
     '/^    Keys\{$/,/^    \}$/d
      /^    Languages\{$/, /^    \}$/ {
        /^    Languages\{$/p
-       /^        '${UI_LANG_PATTERN}'/p
+       /^        '${ACCEPT_LANG_PATTERN}'/p
        /^    \}$/p
        d
      }
      /^    Types\{$/,/^    \}$/d
      /^    Variants\{$/,/^    \}$/d' ${target}
   done
 }
 
 
 # Keep only the minimum locale data for non-UI languages.
 function abridge_locale_data_for_non_ui_languages {
+  for lang in $(grep -v '^#' chrome_ui_languages.list)
+  do
+    # Set $OP to '|' only if $UI_LANGUAGES is not empty.
+    OP=${UI_LANGUAGES:+|}
+    UI_LANGUAGES="${UI_LANGUAGES}${OP}${lang}"
+  done
+
   EXTRA_LANGUAGES=$(egrep -v -e '^#' -e "(${UI_LANGUAGES})" accept_lang.list)
 
   echo Creating minimum locale data in ${localedatapath}
   for lang in ${EXTRA_LANGUAGES}
   do
     target=${localedatapath}/${lang}.txt
     [  -e ${target} ] || { echo "missing ${lang}"; continue; }
     echo Overwriting ${target} ...
     sed -n -r -i \
       '1, /^'${lang}'\{$/p
+       /^    "%%ALIAS"\{/p
        /^    AuxExemplarCharacters\{.*\}$/p
        /^    AuxExemplarCharacters\{$/, /^    \}$/p
        /^    ExemplarCharacters\{.*\}$/p
        /^    ExemplarCharacters\{$/, /^    \}$/p
        /^    (LocaleScript|layout)\{$/, /^    \}$/p
        /^    Version\{.*$/p
        /^\}$/p' ${target}
   done
 
   echo Creating minimum locale data in ${langdatapath}
@@ skipping 49 matching lines @@
     sed -i '/^    zoneStrings/, /^        "meta:/ {
       /^    zoneStrings/ p
       /^        "meta:/ p
       d
     }' $i
   done
 }
 
 # Keep only duration and compound in units* sections.
 function filter_locale_data {
-  for i in "${dataroot}/locales/*.txt"
+  for i in ${dataroot}/locales/*.txt
   do
     echo Overwriting $i ...
     sed -r -i \
       '/^    units(|Narrow|Short)\{$/, /^    \}$/ {
          /^    units(|Narrow|Short)\{$/ p
          /^        (duration|compound)\{$/, /^        \}$/ p
          /^    \}$/ p
          d
        }' ${i}
   done
 }
 
 # big5han and gb2312han collation do not make any sense and nobody uses them.
 function remove_legacy_chinese_codepoint_collation {
   echo "Removing Big5 / GB2312 collation data from Chinese locale"
   target="${dataroot}/coll/zh.txt"
   echo "Overwriting ${target}"
   sed -r -i '/^        (big5|gb2312)han\{$/,/^        \}$/ d' ${target}
 }
 
 dataroot="$(dirname $0)/../source/data"
 localedatapath="${dataroot}/locales"
 langdatapath="${dataroot}/lang"
 
-for lang in $(grep -v '^#' chrome_ui_languages.list)
-do
-  # Set $OP to '|' only if $UI_LANGUAGES is not empty.
-  OP=${UI_LANGUAGES:+|}
-  UI_LANGUAGES="${UI_LANGUAGES}${OP}${lang}"
-done
 
 
 filter_display_language_names
 abridge_locale_data_for_non_ui_languages
 filter_currency_data
 filter_region_data
 remove_legacy_chinese_codepoint_collation
 filter_locale_data
 
 # Chromium OS needs exemplar cities for timezones, but not Chromium.
 # It'll save 400kB (uncompressed), but the size difference in
 # 7z compressed installer is <= 100kB.
 # TODO(jshin): Make separate data files for CrOS and Chromium.
 #remove_exemplar_cities