updating language lists, fixing language list update script

6 files changed, 222 insertions, 133 deletions

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f35bb5055..b69874b93 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -34,6 +34,8 @@ url="https://wiki.parabola.nu/icedove"
 license=('MPL' 'GPL')
 makedepends=('unzip' 'zip')
 
+_src_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/linux-x86_64/xpi
+
 pkgname=()
 source=()
 source+=(brand.dtd
@@ -50,13 +52,11 @@ source languages.${CARCH} # sets $_languages
 for _lang in "${_languages[@]}"; do
   _locale=${_lang%% *}
   _pkgname=$pkgbase-${_locale,,}
-  _src_arch=$( [[ "${CARCH}" == 'x86_64' ]] && echo 'x86_64' || echo 'i686' )
-  _src_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/linux-${_src_arch}/xpi
-#     _calurl=https://ftp.mozilla.org/pub/calendar/lightning/candidates/$_calver-candidates/build1/linux-${_src_arch}
+  # _calurl=https://ftp.mozilla.org/pub/calendar/lightning/candidates/$_calver-candidates/build1/linux-${_src_arch}
 
   pkgname+=($_pkgname)
   source+=("$pkgbase-$pkgver-$_locale.xpi::$_src_url/$_locale.xpi")
-#            "$_calbase-l10n-$_calver-$_locale.xpi::$_calurl/lightning-$_calver.$_locale.linux-${_src_arch}.xpi")
+           # "$_calbase-l10n-$_calver-$_locale.xpi::$_calurl/lightning-$_calver.$_locale.linux-${_src_arch}.xpi")
 
   eval "package_$_pkgname() {
     _package $_lang
@@ -67,7 +67,7 @@ done
 noextract=(${source[@]%%::*})
 
 _package() {
-  pkgdesc="$2 language pack for Icedove and Iceowl."
+  pkgdesc="$2 for Icedove and Iceowl."
   depends=("$_pkgbase>=$epoch:$pkgver")
   replaces=(thunderbird-i18n-${1,,})
   provides=(thunderbird-i18n-${1,,})
diff --git a/libre/icedove-l10n/check.sh b/libre/icedove-l10n/check.sh
deleted file mode 100644
index ea37f4c4f..000000000
--- a/libre/icedove-l10n/check.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# helper script to check the local language list against upstream
-
-# extract pkgbase from pkgbuild
-pkgbase="$(bash -c "source PKGBUILD && echo \"\$pkgbase\"")"
-
-# extract language list from pkgbuild
-bash -c "source PKGBUILD && printf '%s\n' \"\${_languages[@]}\" | cut -d ' ' -f1 | sort" \
-  > $pkgbase-l10n.local
-
-# load language list from upstream
-url="$(bash -c "source PKGBUILD && echo \"\$_url\"")/"
-curl -sL $url | \
-  grep '\.xpi' | cut -d'"' -f2 | rev | cut -d'/' -f1 | cut -d'.' -f2 | rev | sort\
-  > $pkgbase-l10n.remote
-
-diff -rupN $pkgbase-l10n.local $pkgbase-l10n.remote
-rm -f $pkgbase-l10n.{local,remote}
diff --git a/libre/icedove-l10n/languages.armv7h b/libre/icedove-l10n/languages.armv7h
index 9f418e170..fc8e50c8e 100644
--- a/libre/icedove-l10n/languages.armv7h
+++ b/libre/icedove-l10n/languages.armv7h
@@ -1,2 +1,63 @@
 _languages=(
+  'ar     "العربية Language Pack"'
+  'ast    "Asturianu Language Pack"'
+  'be     "Беларуская Language Pack"'
+  'bg     "Български Language Pack"'
+  'br     "Breton Language Pack"'
+  'ca     "Català Language Pack"'
+  'cak    "Kaqchikel (Guatemala) Language Pack"'
+  'cs     "Czech (CZ) Language Pack"'
+  'cy     "Cymraeg Language Pack"'
+  'da     "Dansk (da) Language Pack"'
+  'de     "Deutsch (DE) Language Pack"'
+  'dsb    "Dolnoserbšćina Language Pack"'
+  'el     "Ελληνικά Language Pack"'
+  'en-GB  "English (GB) Language Pack"'
+  'en-US  "English (US) Language Pack"'
+  'es-AR  "Español (AR) Language Pack"'
+  'es-ES  "Español (España) Language Pack"'
+  'et     "Estonian Language Pack"'
+  'eu     "Basque Language Pack"'
+  'fi     "Finnish Language Pack"'
+  'fr     "Français Language Pack"'
+  'fy-NL  "Frysk (fy) Language Pack"'
+  'ga-IE  "Béarla (SAM) Language Pack"'
+  'gd     "Gàidhlig Language Pack"'
+  'gl     "Galego (España) Language Pack"'
+  'he     "Hebrew (IL) Language Pack"'
+  'hr     "Hrvatski (HR) Language Pack"'
+  'hsb    "Hornjoserbšćina Language Pack"'
+  'hu     "Magyar (HU) Language Pack"'
+  'hy-AM  "Armenian (AM) Language Pack"'
+  'id     "Bahasa Indonesia (ID) Language Pack"'
+  'is     "Icelandic (IS) Language Pack"'
+  'it     "Italiano (IT) Language Pack"'
+  'ja     "Japanese Language Pack"'
+  'ka     "Georgian (ქართული) Language Pack"'
+  'kab    "Taqbaylit Language Pack"'
+  'kk     "Kazakh (KZ) Language Pack"'
+  'ko     "Korean (KR) Language Pack"'
+  'lt     "Lietuvių Language Pack"'
+  'ms     "Bahasa Melayu (ms) Language Pack"'
+  'nb-NO  "Norsk bokmål (NO) Language Pack"'
+  'nl     "Nederlands (NL) Language Pack"'
+  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
+  'pl     "Polski Language Pack"'
+  'pt-BR  "Português (pt-BR) Language Pack"'
+  'pt-PT  "Português (Europeu) Language Pack"'
+  'rm     "Rumantsch Language Pack"'
+  'ro     "Română (România) Language Pack"'
+  'ru     "Russian (RU) Language Pack"'
+  'si     "Sinhala (si-LK) Language Pack"'
+  'sk     "Slovak (SK) Language Pack"'
+  'sl     "Slovenski jezik Language Pack"'
+  'sq     "Shqip Language Pack"'
+  'sr     "српски (sr) Language Pack"'
+  'sv-SE  "Svenska (SE) Language Pack"'
+  'tr     "Türkçe (TR) Language Pack"'
+  'uk     "Ukrainian (UA) Language Pack"'
+  'uz     "Uzbek Language Pack"'
+  'vi     "Tiếng Việt Language Pack"'
+  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
+  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
 )
diff --git a/libre/icedove-l10n/languages.i686 b/libre/icedove-l10n/languages.i686
index 4951199b3..fc8e50c8e 100644
--- a/libre/icedove-l10n/languages.i686
+++ b/libre/icedove-l10n/languages.i686
@@ -1,57 +1,63 @@
 _languages=(
-  'ar     "Arabic"'
-  'ast    "Asturian"'
-  'be     "Belarusian"'
-  'bg     "Bulgarian"'
-  'br     "Breton"'
-  'ca     "Catalan"'
-  'cs     "Czech"'
-  'cy     "Welsh"'
-  'da     "Danish"'
-  'de     "German"'
-  'dsb    "Lower Sorbian"'
-  'el     "Greek"'
-  'en-GB  "English (British)"'
-  'en-US  "English (US)"'
-  'es-AR  "Spanish (Argentina)"'
-  'es-ES  "Spanish (Spain)"'
-  'et     "Estonian"'
-  'eu     "Basque"'
-  'fi     "Finnish"'
-  'fr     "French"'
-  'fy-NL  "Frisian"'
-  'ga-IE  "Irish"'
-  'gd     "Gaelic (Scotland)"'
-  'gl     "Galician"'
-  'he     "Hebrew"'
-  'hr     "Croatian"'
-  'hsb    "Upper Sorbian"'
-  'hu     "Hungarian"'
-  'hy-AM  "Armenian"'
-  'id     "Indonesian"'
-  'is     "Icelandic"'
-  'it     "Italian"'
-  'ja     "Japanese"'
-  'ko     "Korean"'
-  'lt     "Lithuanian"'
-  'nb-NO  "Norwegian (Bokmål)"'
-  'nl     "Dutch"'
-  'nn-NO  "Norwegian (Nynorsk)"'
-  'pl     "Polish"'
-  'pt-BR  "Portuguese (Brazilian)"'
-  'pt-PT  "Portuguese (Portugal)"'
-  'rm     "Romansh"'
-  'ro     "Romanian"'
-  'ru     "Russian"'
-  'si     "Sinhala"'
-  'sk     "Slovak"'
-  'sl     "Slovenian"'
-  'sq     "Albanian"'
-  'sr     "Serbian"'
-  'sv-SE  "Swedish"'
-  'tr     "Turkish"'
-  'uk     "Ukrainian"'
-  'vi     "Vietnamese"'
-  'zh-CN  "Chinese (Simplified)"'
-  'zh-TW  "Chinese (Traditional)"'
+  'ar     "العربية Language Pack"'
+  'ast    "Asturianu Language Pack"'
+  'be     "Беларуская Language Pack"'
+  'bg     "Български Language Pack"'
+  'br     "Breton Language Pack"'
+  'ca     "Català Language Pack"'
+  'cak    "Kaqchikel (Guatemala) Language Pack"'
+  'cs     "Czech (CZ) Language Pack"'
+  'cy     "Cymraeg Language Pack"'
+  'da     "Dansk (da) Language Pack"'
+  'de     "Deutsch (DE) Language Pack"'
+  'dsb    "Dolnoserbšćina Language Pack"'
+  'el     "Ελληνικά Language Pack"'
+  'en-GB  "English (GB) Language Pack"'
+  'en-US  "English (US) Language Pack"'
+  'es-AR  "Español (AR) Language Pack"'
+  'es-ES  "Español (España) Language Pack"'
+  'et     "Estonian Language Pack"'
+  'eu     "Basque Language Pack"'
+  'fi     "Finnish Language Pack"'
+  'fr     "Français Language Pack"'
+  'fy-NL  "Frysk (fy) Language Pack"'
+  'ga-IE  "Béarla (SAM) Language Pack"'
+  'gd     "Gàidhlig Language Pack"'
+  'gl     "Galego (España) Language Pack"'
+  'he     "Hebrew (IL) Language Pack"'
+  'hr     "Hrvatski (HR) Language Pack"'
+  'hsb    "Hornjoserbšćina Language Pack"'
+  'hu     "Magyar (HU) Language Pack"'
+  'hy-AM  "Armenian (AM) Language Pack"'
+  'id     "Bahasa Indonesia (ID) Language Pack"'
+  'is     "Icelandic (IS) Language Pack"'
+  'it     "Italiano (IT) Language Pack"'
+  'ja     "Japanese Language Pack"'
+  'ka     "Georgian (ქართული) Language Pack"'
+  'kab    "Taqbaylit Language Pack"'
+  'kk     "Kazakh (KZ) Language Pack"'
+  'ko     "Korean (KR) Language Pack"'
+  'lt     "Lietuvių Language Pack"'
+  'ms     "Bahasa Melayu (ms) Language Pack"'
+  'nb-NO  "Norsk bokmål (NO) Language Pack"'
+  'nl     "Nederlands (NL) Language Pack"'
+  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
+  'pl     "Polski Language Pack"'
+  'pt-BR  "Português (pt-BR) Language Pack"'
+  'pt-PT  "Português (Europeu) Language Pack"'
+  'rm     "Rumantsch Language Pack"'
+  'ro     "Română (România) Language Pack"'
+  'ru     "Russian (RU) Language Pack"'
+  'si     "Sinhala (si-LK) Language Pack"'
+  'sk     "Slovak (SK) Language Pack"'
+  'sl     "Slovenski jezik Language Pack"'
+  'sq     "Shqip Language Pack"'
+  'sr     "српски (sr) Language Pack"'
+  'sv-SE  "Svenska (SE) Language Pack"'
+  'tr     "Türkçe (TR) Language Pack"'
+  'uk     "Ukrainian (UA) Language Pack"'
+  'uz     "Uzbek Language Pack"'
+  'vi     "Tiếng Việt Language Pack"'
+  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
+  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
 )
diff --git a/libre/icedove-l10n/languages.x86_64 b/libre/icedove-l10n/languages.x86_64
index 4951199b3..fc8e50c8e 100644
--- a/libre/icedove-l10n/languages.x86_64
+++ b/libre/icedove-l10n/languages.x86_64
@@ -1,57 +1,63 @@
 _languages=(
-  'ar     "Arabic"'
-  'ast    "Asturian"'
-  'be     "Belarusian"'
-  'bg     "Bulgarian"'
-  'br     "Breton"'
-  'ca     "Catalan"'
-  'cs     "Czech"'
-  'cy     "Welsh"'
-  'da     "Danish"'
-  'de     "German"'
-  'dsb    "Lower Sorbian"'
-  'el     "Greek"'
-  'en-GB  "English (British)"'
-  'en-US  "English (US)"'
-  'es-AR  "Spanish (Argentina)"'
-  'es-ES  "Spanish (Spain)"'
-  'et     "Estonian"'
-  'eu     "Basque"'
-  'fi     "Finnish"'
-  'fr     "French"'
-  'fy-NL  "Frisian"'
-  'ga-IE  "Irish"'
-  'gd     "Gaelic (Scotland)"'
-  'gl     "Galician"'
-  'he     "Hebrew"'
-  'hr     "Croatian"'
-  'hsb    "Upper Sorbian"'
-  'hu     "Hungarian"'
-  'hy-AM  "Armenian"'
-  'id     "Indonesian"'
-  'is     "Icelandic"'
-  'it     "Italian"'
-  'ja     "Japanese"'
-  'ko     "Korean"'
-  'lt     "Lithuanian"'
-  'nb-NO  "Norwegian (Bokmål)"'
-  'nl     "Dutch"'
-  'nn-NO  "Norwegian (Nynorsk)"'
-  'pl     "Polish"'
-  'pt-BR  "Portuguese (Brazilian)"'
-  'pt-PT  "Portuguese (Portugal)"'
-  'rm     "Romansh"'
-  'ro     "Romanian"'
-  'ru     "Russian"'
-  'si     "Sinhala"'
-  'sk     "Slovak"'
-  'sl     "Slovenian"'
-  'sq     "Albanian"'
-  'sr     "Serbian"'
-  'sv-SE  "Swedish"'
-  'tr     "Turkish"'
-  'uk     "Ukrainian"'
-  'vi     "Vietnamese"'
-  'zh-CN  "Chinese (Simplified)"'
-  'zh-TW  "Chinese (Traditional)"'
+  'ar     "العربية Language Pack"'
+  'ast    "Asturianu Language Pack"'
+  'be     "Беларуская Language Pack"'
+  'bg     "Български Language Pack"'
+  'br     "Breton Language Pack"'
+  'ca     "Català Language Pack"'
+  'cak    "Kaqchikel (Guatemala) Language Pack"'
+  'cs     "Czech (CZ) Language Pack"'
+  'cy     "Cymraeg Language Pack"'
+  'da     "Dansk (da) Language Pack"'
+  'de     "Deutsch (DE) Language Pack"'
+  'dsb    "Dolnoserbšćina Language Pack"'
+  'el     "Ελληνικά Language Pack"'
+  'en-GB  "English (GB) Language Pack"'
+  'en-US  "English (US) Language Pack"'
+  'es-AR  "Español (AR) Language Pack"'
+  'es-ES  "Español (España) Language Pack"'
+  'et     "Estonian Language Pack"'
+  'eu     "Basque Language Pack"'
+  'fi     "Finnish Language Pack"'
+  'fr     "Français Language Pack"'
+  'fy-NL  "Frysk (fy) Language Pack"'
+  'ga-IE  "Béarla (SAM) Language Pack"'
+  'gd     "Gàidhlig Language Pack"'
+  'gl     "Galego (España) Language Pack"'
+  'he     "Hebrew (IL) Language Pack"'
+  'hr     "Hrvatski (HR) Language Pack"'
+  'hsb    "Hornjoserbšćina Language Pack"'
+  'hu     "Magyar (HU) Language Pack"'
+  'hy-AM  "Armenian (AM) Language Pack"'
+  'id     "Bahasa Indonesia (ID) Language Pack"'
+  'is     "Icelandic (IS) Language Pack"'
+  'it     "Italiano (IT) Language Pack"'
+  'ja     "Japanese Language Pack"'
+  'ka     "Georgian (ქართული) Language Pack"'
+  'kab    "Taqbaylit Language Pack"'
+  'kk     "Kazakh (KZ) Language Pack"'
+  'ko     "Korean (KR) Language Pack"'
+  'lt     "Lietuvių Language Pack"'
+  'ms     "Bahasa Melayu (ms) Language Pack"'
+  'nb-NO  "Norsk bokmål (NO) Language Pack"'
+  'nl     "Nederlands (NL) Language Pack"'
+  'nn-NO  "Norsk nynorsk (NO) Language Pack"'
+  'pl     "Polski Language Pack"'
+  'pt-BR  "Português (pt-BR) Language Pack"'
+  'pt-PT  "Português (Europeu) Language Pack"'
+  'rm     "Rumantsch Language Pack"'
+  'ro     "Română (România) Language Pack"'
+  'ru     "Russian (RU) Language Pack"'
+  'si     "Sinhala (si-LK) Language Pack"'
+  'sk     "Slovak (SK) Language Pack"'
+  'sl     "Slovenski jezik Language Pack"'
+  'sq     "Shqip Language Pack"'
+  'sr     "српски (sr) Language Pack"'
+  'sv-SE  "Svenska (SE) Language Pack"'
+  'tr     "Türkçe (TR) Language Pack"'
+  'uk     "Ukrainian (UA) Language Pack"'
+  'uz     "Uzbek Language Pack"'
+  'vi     "Tiếng Việt Language Pack"'
+  'zh-CN  "Chinese Simplified (zh-CN) Language Pack"'
+  'zh-TW  "Traditional Chinese (zh-TW) Language Pack"'
 )
diff --git a/libre/icedove-l10n/updatelanglist.sh b/libre/icedove-l10n/updatelanglist.sh
new file mode 100644
index 000000000..b188b3ee9
--- /dev/null
+++ b/libre/icedove-l10n/updatelanglist.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# helper script to check the local language list against upstream
+
+export CARCH="${CARCH:-$(uname -m)}"
+
+# extract pkgbase from pkgbuild
+pkgbase="$(bash -c "source PKGBUILD && echo \"\$_pkgbase\"")"
+
+echo "attempting update to language lists for $pkgbase"
+echo "  CARCH: $CARCH"
+
+# produce new language list
+url="$(bash -c "source PKGBUILD && echo \"\$_src_url\"")/"
+
+echo "_languages=(" > "languages.$CARCH.pkgnew"
+
+for lang in $(curl -sL $url | grep '\.xpi' | cut -d'"' -f2 | rev | cut -d'/' -f1 | cut -d'.' -f2 | rev | sort); do
+  rm -rf ".updatelanglist.$CARCH"
+  mkdir -p ".updatelanglist.$CARCH"
+
+  pushd ".updatelanglist.$CARCH"
+  wget "$url/$lang.xpi"
+  unzip "$lang.xpi"
+
+  name="$(grep "  \"name" manifest.json | cut -d':' -f2- | cut -d'"' -f2)"
+  popd
+
+  printf "  '%-5s  \"%s\"'\n" "$lang" "$name" \
+      >> "languages.$CARCH.pkgnew"
+done
+rm -rf ".updatelanglist.$CARCH"
+
+echo ")" >> "languages.$CARCH.pkgnew"
+vimdiff "languages.$CARCH"{,.pkgnew}