Remove additional calendars in the ICU data

android/patch_locale.sh

Index: android/patch_locale.sh
diff --git a/android/patch_locale.sh b/android/patch_locale.sh
index bc860b4c285e12e99c8d18ca569ca12423b12765..a03b466d1e91d4405cd0606d45a614db0af38686 100755
--- a/android/patch_locale.sh
+++ b/android/patch_locale.sh
@@ -164,12 +164,17 @@ for i in locales/*.txt; do
     ja)
       EXTRA_CAL='japanese'
       ;;
+    *)
+      EXTRA_CAL=''
+      ;;
   esac
 
   # Add 'roc' calendar to zh_Hant*.
-  [[ "$(basename $i .txt)" =~ 'zh_Hant' ]] && { EXTRA_CAL="$EXTRA_CAL|roc"; }
+  [[ "$(basename $i .txt)" =~ 'zh_Hant' ]] && { EXTRA_CAL="${EXTRA_CAL}|roc"; }
 
-  CAL_PATTERN="(${COMMON_CALENDARS}|${EXTRA_CAL})"
+  CAL_PATTERN="(${COMMON_CALENDARS})"

[Mark Mentovai, 2015/04/03 12:51:09]

You can write all of this in one line:

  CAL_PATTERN="${COMMON_CALENDARS}${EXTRA_CAL:+|${EXTRA_CAL}}"

${var:+text} expands to nothing if var is empty and to text if var is nonempty.

+  [[ -n "${EXTRA_CAL}" ]] && \
+    { CAL_PATTERN="(${COMMON_CALENDARS}|${EXTRA_CAL})"; }
   echo $CAL_PATTERN
 
   echo Overwriting $i...