Removing dead lang2locale function and associated files, not used anywhere.

diff --git a/Makefile b/Makefile
index e202f85..af6becb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ install:
        cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
        mkdir -p $(DESTDIR)/usr/share/live-boot
-       cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
+       cp bin/live-preseed bin/live-reconfigure $(DESTDIR)/usr/share/live-boot
 
        mkdir -p $(DESTDIR)/usr/share/initramfs-tools
        cp -r initramfs-tools/* $(DESTDIR)/usr/share/initramfs-tools

diff --git a/initramfs-tools/hooks/live b/initramfs-tools/hooks/live
index cfe1534..5fd8dae 100755 (executable)
--- a/initramfs-tools/hooks/live
+++ b/initramfs-tools/hooks/live
@@ -54,13 +54,6 @@ fi
 mkdir -p "${DESTDIR}/lib/live"
 cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
 
-# Configuration
-if [ -e /usr/share/live-boot/languagelist ]
-then
-       mkdir -p "${DESTDIR}"/usr/share/live-boot
-       cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
-fi
-
 # Directories
 mkdir -p "${DESTDIR}"/lib/live-boot
 

diff --git a/local/languagelist b/local/languagelist
deleted file mode 100644 (file)
index cd973ed..0000000
--- a/local/languagelist
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# This is the complete list of languages (locales) to choose from.
-# langcode;language (en);language (orig);supported_environments;countrycode;fallbacklocale;langlist;console-setup
-sq;Albanian;Shqip;2;AL;sq_AL.UTF-8;;console-setup
-am;Amharic;አማርኛ;4;ET;am_ET;;
-ar;Arabic;عربي;3;EG;ar_EG.UTF-8;;console-setup
-ast;Asturian;Asturianu;2;ES;ast_ES.UTF-8;;console-setup
-eu;Basque;Euskara;1;ES;eu_ES.UTF-8;;console-setup
-be;Belarusian;Беларуская;2;BY;be_BY.UTF-8;;console-setup
-bn;Bengali;বাংলা;4;BD;bn_BD;;
-bs;Bosnian;Bosanski;2;BA;bs_BA.UTF-8;;console-setup
-#X br;Breton;Brezhoneg;2;FR;br_FR.UTF-8;;console-setup
-bg;Bulgarian;Български;2;BG;bg_BG.UTF-8;;console-setup
-# For C locale, set language to 'en' to make sure questions are "translated"
-# to English instead of showing codes.
-C;C;No localization;0;;C;en;
-ca;Catalan;Català;1;ES;ca_ES.UTF-8;;console-setup
-# Special case for Chinese as the two flavours share the same ISO 639 code
-# Both will trigger countrychooser. Each will be the backup for the other
-# one
-zh_CN;Chinese (Simplified);中文(简体);3;CN;zh_CN.UTF-8;zh_CN:zh;
-zh_TW;Chinese (Traditional);中文(繁體);3;TW;zh_TW.UTF-8;zh_TW:zh;
-hr;Croatian;Hrvatski;2;HR;hr_HR.UTF-8;;console-setup
-cs;Czech;Čeština;2;CZ;cs_CZ.UTF-8;;console-setup
-da;Danish;Dansk;1;DK;da_DK.UTF-8;;console-setup
-nl;Dutch;Nederlands;1;NL;nl_NL.UTF-8;;console-setup
-dz;Dzongkha;རྫོང་ཁ།;4;BT;dz_BT;;
-en;English;English;0;US;en_US.UTF-8;;console-setup
-# The Esperanto locale is eo.UTF-8
-# so no country on purpose. The default country is Antarctica because...
-# ...why not..:-)
-eo;Esperanto;Esperanto;2;AQ;eo.UTF-8;;console-setup
-et;Estonian;Eesti;2;EE;et_EE.UTF-8;;console-setup
-fi;Finnish;Suomi;1;FI;fi_FI.UTF-8;;console-setup
-fr;French;Français;1;FR;fr_FR.UTF-8;;console-setup
-gl;Galician;Galego;1;ES;gl_ES.UTF-8;;console-setup
-ka;Georgian;ქართული;4;GE;ka_GE.UTF-8;;console-setup
-de;German;Deutsch;1;DE;de_DE.UTF-8;;console-setup
-el;Greek;Ελληνικά;2;GR;el_GR.UTF-8;;console-setup
-gu;Gujarati;ગુજરાતી;4;IN;gu_IN;;
-he;Hebrew;עברית;3;IL;he_IL.UTF-8;;console-setup
-hi;Hindi;हिन्दी ;4;IN;hi_IN;;
-hu;Hungarian;Magyar;2;HU;hu_HU.UTF-8;;console-setup
-#X is;Icelandic;Íslenska;1;IS;is_IS.UTF-8;;console-setup
-id;Indonesian;Bahasa Indonesia;1;ID;id_ID.UTF-8;;console-setup
-ga;Irish;Gaeilge;1;IE;ga_IE.UTF-8;;console-setup
-it;Italian;Italiano;1;IT;it_IT.UTF-8;;console-setup
-ja;Japanese;日本語;3;JP;ja_JP.UTF-8;;
-#X kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;;
-#X ks;Kashmiri;कोशुर;4;IN;ks_IN;;
-kk;Kazakh;Қазақ;2;KZ;kk_KZ.UTF-8;;console-setup
-km;Khmer;ខ្មែរ;4;KH;km_KH;;
-kn;Kannada;ಕನ್ನಡ;4;IN;kn_IN;;
-ko;Korean;한국어;3;KR;ko_KR.UTF-8;;
-ku;Kurdish;Kurdî;2;TR;ku_TR.UTF-8;;console-setup
-#X ky;Kirghiz;Кыргызча;2;KG;ky_KG;;console-setup
-#X lo;Lao;ລາວ;4;LA;lo_LA;;console-setup
-lv;Latvian;Latviski;2;LV;lv_LV.UTF-8;;console-setup
-lt;Lithuanian;Lietuviškai;2;LT;lt_LT.UTF-8;;console-setup
-#X mg;Malagasy;Malagasy;1;MG;mg_MG.UTF-8;mg_MG:fr_FR:fr:en;console-setup
-#X ms;Malay;Bahasa Malaysia;1;MY;ms_MY.UTF-8;;console-setup
-ml;Malayalam;മലയാളം;4;IN;ml_IN;;
-mr;Marathi;मराठी;4;IN;mr_IN;;
-mk;Macedonian;Македонски;2;MK;mk_MK.UTF-8;;console-setup
-ne;Nepali;नेपाली ;4;NP;ne_NP;;
-# The Sami translation is really incomplete. We however keep Sami on request
-# of Skolelinux as a kind of reward to them..:-). They need to be able to
-# choose Sami as an option so that the Sami locale is set as default
-se_NO;Northern Sami;Sámegillii;1;NO;se_NO.UTF-8;se_NO:nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
-nb_NO;Norwegian Bokmaal;Norsk bokmål;1;NO;nb_NO.UTF-8;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en;console-setup
-nn_NO;Norwegian Nynorsk;Norsk nynorsk;1;NO;nn_NO.UTF-8;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en;console-setup
-fa;Persian;فارسی;3;IR;fa_IR;;console-setup
-pl;Polish;Polski;2;PL;pl_PL.UTF-8;;console-setup
-pt;Portuguese;Português;1;PT;pt_PT.UTF-8;pt:pt_BR:en;console-setup
-pt_BR;Portuguese (Brazil);Português do Brasil;1;BR;pt_BR.UTF-8;pt_BR:pt:en;console-setup
-pa;Punjabi (Gurmukhi);ਪੰਜਾਬੀ;4;IN;pa_IN;;
-ro;Romanian;Română;2;RO;ro_RO.UTF-8;;console-setup
-ru;Russian;Русский;2;RU;ru_RU.UTF-8;;console-setup
-#X sa;Sanskrit;संस्कृत;4;IN;sa_IN;;
-#X si;Sinhala;සිංහල;4;IN;si_IN;;
-sr;Serbian (Cyrillic);Српски;2;RS;sr_RS;;console-setup
-sr@latin;Serbian (Latin);Srpski;2;RS;sr_RS@latin;;console-setup
-sk;Slovak;Slovenčina;2;SK;sk_SK.UTF-8;;console-setup
-sl;Slovenian;Slovenščina;2;SI;sl_SI.UTF-8;;console-setup
-es;Spanish;Español;1;ES;es_ES.UTF-8;;console-setup
-sv;Swedish;Svenska;1;SE;sv_SE.UTF-8;;console-setup
-tl;Tagalog;Tagalog;1;PH;tl_PH.UTF-8;;console-setup
-ta;Tamil;தமிழ்;4;IN;ta_IN;;
-te;Telugu;తెలుగు;4;IN;te_IN;;
-th;Thai;ภาษาไทย;3;TH;th_TH.UTF-8;;console-setup
-tr;Turkish;Türkçe;2;TR;tr_TR.UTF-8;;console-setup
-uk;Ukrainian;Українська;2;UA;uk_UA.UTF-8;;console-setup
-#X ur;Urdu;اردو;3;PK;ur_PK.UTF-8;;console-setup
-#X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;ca_ES.UTF-8@valencia;;console-setup
-vi;Vietnamese;Tiếng Việt;3;VN;vi_VN;;console-setup
-#X cy;Welsh;Cymraeg;2;GB;cy_GB.UTF-8;;console-setup
-#X wo;Wolof;Wolof;2;SN;wo_SN;wo:fr:en;
-#X xh;Xhosa;Xhosa;2;ZA;xh_ZA.UTF-8;;console-setup

diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/misc-helpers.sh
index 3f2d7fb..abb2dd2 100755 (executable)
--- a/scripts/boot/misc-helpers.sh
+++ b/scripts/boot/misc-helpers.sh
@@ -17,35 +17,6 @@ really_export ()
        eval export "${STRING}"="${VALUE}"
 }
 
-lang2locale() {
-       langpart="${1%%_*}"
-       if [ "$1" != "C" ]; then
-               # Match the language code with 3rd field in languagelist
-               line=$(grep -v "^#" /usr/share/live-boot/languagelist | cut -f1,3,6 -d\; | grep -v ';C$' | grep "^$langpart;")
-               if [ -n "$line" ]; then
-                       if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
-                               # More than one match; try matching the
-                               # country as well.
-                               countrypart="${1#*_}"
-                               if [ "$countrypart" = "$1" ]; then
-                                       countryline="$(echo "$line" | head -n1)"
-                                       echo "${countryline##*;}"
-                                       return
-                               fi
-                               countrypart="${countrypart%%[@.]*}"
-                               countryline="$(echo "$line" | grep ";$countrypart;" | head -n1 || true)"
-                               if [ "$countryline" ]; then
-                                       echo "${countryline##*;}"
-                                       return
-                               fi
-                       fi
-                       echo "${line##*;}"
-               fi
-       else
-               echo "C"
-       fi
-}
-
 is_in_list_separator_helper () {
        local sep=${1}
        shift