Package: countrychooser
Severity: wishlist
Tags: patch

There is no real motivation in asking the country choice at critical
priority as a reasonable default may be give by languagechooser.

The following patches to languagechooser languagelist (1st patch) and
countrychooser postinst (2nd Ãpatch) should allow getting a reasonable
default for each language and thus will allow having one less question in
critical priority installs

*** languagelist.ori    2004-07-15 12:22:57.000000000 +0200
--- languagelist        2004-07-15 12:22:34.000000000 +0200
***************
*** 44,50 ****
  # That one needs more testing currently
  # C;;;;;C
  Albanian;sq_AL;sq_AL;sq;AL;sq_AL:sq:en_GB:en;kbd=lat0-sun16(iso15)
! Arabic;ar;ar_EG;ar;;ar_EG:en_GB:en;kbd=iso06.f16(utf8)
  Basque;eu_ES;eu_ES;eu;ES;eu_ES:eu:en_GB:en;kbd=lat0-sun16(iso15)
  Bosnian;bs_BA;bs_BA;bs;BA;bs_BA:bs:en_GB:en;kbd=lat2-sun16(iso02)
  Bulgarian;bg_BG;bg_BG;bg;BG;bg_BG:bg:en_GB:en;
--- 44,50 ----
  # That one needs more testing currently
  # C;;;;;C
  Albanian;sq_AL;sq_AL;sq;AL;sq_AL:sq:en_GB:en;kbd=lat0-sun16(iso15)
! Arabic;ar;ar_EG;ar;EG;ar_EG:en_GB:en;kbd=iso06.f16(utf8)
  Basque;eu_ES;eu_ES;eu;ES;eu_ES:eu:en_GB:en;kbd=lat0-sun16(iso15)
  Bosnian;bs_BA;bs_BA;bs;BA;bs_BA:bs:en_GB:en;kbd=lat2-sun16(iso02)
  Bulgarian;bg_BG;bg_BG;bg;BG;bg_BG:bg:en_GB:en;
***************
*** 57,75 ****
  Croatian;hr_HR;hr_HR;hr;HR;hr_HR:hr:en_GB:en;kbd=lat2-sun16(iso02)
  Czech;cs_CZ;cs_CZ;cs;CZ;cs_CZ:cs:en_GB:en;kbd=lat2-sun16(iso02)
  Danish;da_DK;da_DK;da;DK;da_DK:da:en_GB:en;kbd=lat0-sun16(iso15)
! Dutch;nl;nl_NL;nl;;nl:en_GB:en;kbd=lat0-sun16(iso15)
! English;en;en_US;en;;en_GB:en_US:en;kbd=lat0-sun16(iso15)
  Farsi;fa;fa_IR;fa;IR;fa_IR:en_GB:en;kbd=iso06.f16(utf8)
  Finnish;[EMAIL PROTECTED];[EMAIL 
PROTECTED];fi;FI;fi_FI:fi:sv:en_GB:en;kbd=lat0-sun16(iso15)
! French;fr;[EMAIL PROTECTED];fr;;fr_FR:fr:en_GB:en;kbd=lat0-sun16(iso15)
  Galician;gl_ES;gl_ES;gl;ES;gl_ES:gl:es;kbd=lat0-sun16(iso15)
! German;de;[EMAIL PROTECTED];de;;de_DE:de:en_GB:en;kbd=lat0-sun16(iso15)
  Greek;el_GR.UTF-8;el_GR.UTF-8;el;GR;el_GR:el:en_GB:en;kbd=iso07.f16(utf8)
  Hebrew;he_IL;he_IL;he;IL;he_IL:he:en_GB:en;kbd=iso08.f16(utf8)
  Hungarian;hu_HU;hu_HU;hu;HU;hu_HU:hu:en_GB:en;kbd=lat2-sun16(iso02)
  Indonesian;id_ID;id_ID;id;ID;id_ID:id:en_GB:en;kbd=lat0-sun16(iso15)
  #X Irish;[EMAIL PROTECTED];[EMAIL 
PROTECTED];ga;IE;ga_IE;ga:en_IE:en_GB:en;kbd=lat0-sun16(iso15)
! Italian;it;[EMAIL PROTECTED];it;;it_IT;it:en_GB:en;kbd=lat0-sun16(iso15)
  Japanese;ja_JP.EUC-JP;ja_JP.EUC-JP;ja;JP;ja_JP:ja:en_GB:en;
  Korean;ko_KR.UTF-8;ko_KR.UTF-8;ko;KR;ko_KR:ko:en_GB:en;
  #X Latvian;lv_LV;lv_LV;lv;LV;lv_LV:lv:ru:en_GB:en;kbd=lat7-14(iso13)
--- 57,75 ----
  Croatian;hr_HR;hr_HR;hr;HR;hr_HR:hr:en_GB:en;kbd=lat2-sun16(iso02)
  Czech;cs_CZ;cs_CZ;cs;CZ;cs_CZ:cs:en_GB:en;kbd=lat2-sun16(iso02)
  Danish;da_DK;da_DK;da;DK;da_DK:da:en_GB:en;kbd=lat0-sun16(iso15)
! Dutch;nl;nl_NL;nl;NL;nl:en_GB:en;kbd=lat0-sun16(iso15)
! English;en;en_US;en;US;en_GB:en_US:en;kbd=lat0-sun16(iso15)
  Farsi;fa;fa_IR;fa;IR;fa_IR:en_GB:en;kbd=iso06.f16(utf8)
  Finnish;[EMAIL PROTECTED];[EMAIL 
PROTECTED];fi;FI;fi_FI:fi:sv:en_GB:en;kbd=lat0-sun16(iso15)
! French;fr;[EMAIL PROTECTED];fr;FR;fr_FR:fr:en_GB:en;kbd=lat0-sun16(iso15)
  Galician;gl_ES;gl_ES;gl;ES;gl_ES:gl:es;kbd=lat0-sun16(iso15)
! German;de;[EMAIL PROTECTED];de;DE;de_DE:de:en_GB:en;kbd=lat0-sun16(iso15)
  Greek;el_GR.UTF-8;el_GR.UTF-8;el;GR;el_GR:el:en_GB:en;kbd=iso07.f16(utf8)
  Hebrew;he_IL;he_IL;he;IL;he_IL:he:en_GB:en;kbd=iso08.f16(utf8)
  Hungarian;hu_HU;hu_HU;hu;HU;hu_HU:hu:en_GB:en;kbd=lat2-sun16(iso02)
  Indonesian;id_ID;id_ID;id;ID;id_ID:id:en_GB:en;kbd=lat0-sun16(iso15)
  #X Irish;[EMAIL PROTECTED];[EMAIL 
PROTECTED];ga;IE;ga_IE;ga:en_IE:en_GB:en;kbd=lat0-sun16(iso15)
! Italian;it;[EMAIL PROTECTED];it;IT;it_IT;it:en_GB:en;kbd=lat0-sun16(iso15)
  Japanese;ja_JP.EUC-JP;ja_JP.EUC-JP;ja;JP;ja_JP:ja:en_GB:en;
  Korean;ko_KR.UTF-8;ko_KR.UTF-8;ko;KR;ko_KR:ko:en_GB:en;
  #X Latvian;lv_LV;lv_LV;lv;LV;lv_LV:lv:ru:en_GB:en;kbd=lat7-14(iso13)
***************
*** 78,91 ****
  Norwegian 
Nynorsk;nn_NO;nn_NO;nn;NO;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en_GB:en;kbd=lat0-sun16(iso15)
  Polish;pl_PL;pl_PL;pl;PL;pl_PL:pl:en_GB:en;kbd=lat2-sun16(iso02)
  Portuguese (Brazil);pt_BR;pt_BR;pt;BR;pt_BR:pt:pt_PT;kbd=lat0-sun16(iso15)
! Portuguese;pt;[EMAIL PROTECTED];pt;;pt:pt_BR:en_GB:en;kbd=lat0-sun16(iso15)
  Romanian;ro_RO;ro_RO;ro;RO;ro_RO:ro:en_GB:en;kbd=lat2-sun16(iso02)
! 
Russian;ru;ru_RU.KOI8-R;ru;;ru_RU:ru:en_GB:en;cyr=uni,16,koi8-r,ru_ms(ctrl_shift_toggle)
  Serbian;[EMAIL PROTECTED];[EMAIL 
PROTECTED];sr;CS;sr_CS:sr_YU:sr:en_GB:en;cyr=uni,16,utf-8,sr(ctrl_shift_toggle)
  Slovak;sk_SK;sk_SK;sk;SK;sk_SK:sk:en_GB:en;kbd=lat2-sun16(iso02)
  Slovenian;sl_SI;sl_SI;sl;SI;sl_SI:sl:en_GB:en;kbd=lat2-sun16(iso02)
! Spanish;es;[EMAIL PROTECTED];es;;es_ES:es:en_GB:en;kbd=lat0-sun16(iso15)
! Swedish;sv;sv_SE.ISO-8859-1;sv;;sv_SV:sv:en_GB:en;kbd=lat0-sun16(iso15)
  Turkish;tr_TR;tr_TR;tr;TR;tr_TR:tr:en_GB:en;kbd=ter-916f(iso09)
  
Ukrainian;uk_UA;uk_UA;uk;UA;uk_UA:uk:en_GB:en;cyr=uni,16,koi8-u,ua_ms(ctrl_shift_toggle)
  Vietnamese;vi_VN;vi_VN;vi;VN;vi_VN:vi:en_GB:en
--- 78,91 ----
  Norwegian 
Nynorsk;nn_NO;nn_NO;nn;NO;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en_GB:en;kbd=lat0-sun16(iso15)
  Polish;pl_PL;pl_PL;pl;PL;pl_PL:pl:en_GB:en;kbd=lat2-sun16(iso02)
  Portuguese (Brazil);pt_BR;pt_BR;pt;BR;pt_BR:pt:pt_PT;kbd=lat0-sun16(iso15)
! Portuguese;pt;[EMAIL PROTECTED];pt;PT;pt:pt_BR:en_GB:en;kbd=lat0-sun16(iso15)
  Romanian;ro_RO;ro_RO;ro;RO;ro_RO:ro:en_GB:en;kbd=lat2-sun16(iso02)
! 
Russian;ru;ru_RU.KOI8-R;ru;RU;ru_RU:ru:en_GB:en;cyr=uni,16,koi8-r,ru_ms(ctrl_shift_toggle)
  Serbian;[EMAIL PROTECTED];[EMAIL 
PROTECTED];sr;CS;sr_CS:sr_YU:sr:en_GB:en;cyr=uni,16,utf-8,sr(ctrl_shift_toggle)
  Slovak;sk_SK;sk_SK;sk;SK;sk_SK:sk:en_GB:en;kbd=lat2-sun16(iso02)
  Slovenian;sl_SI;sl_SI;sl;SI;sl_SI:sl:en_GB:en;kbd=lat2-sun16(iso02)
! Spanish;es;[EMAIL PROTECTED];es;ES;es_ES:es:en_GB:en;kbd=lat0-sun16(iso15)
! Swedish;sv;sv_SE.ISO-8859-1;sv;SE;sv_SE:sv:en_GB:en;kbd=lat0-sun16(iso15)
  Turkish;tr_TR;tr_TR;tr;TR;tr_TR:tr:en_GB:en;kbd=ter-916f(iso09)
  
Ukrainian;uk_UA;uk_UA;uk;UA;uk_UA:uk:en_GB:en;cyr=uni,16,koi8-u,ua_ms(ctrl_shift_toggle)
  Vietnamese;vi_VN;vi_VN;vi;VN;vi_VN:vi:en_GB:en


*** postinst.ori        2004-07-15 12:24:32.000000000 +0200
--- postinst    2004-07-15 12:25:38.000000000 +0200
***************
*** 141,147 ****
  if [ "$LANGUAGE" != "C" ]; then
        STATE=1
        LASTSTATE=3
!       fullprio=critical
        while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
                case "$STATE" in
                1)
--- 141,148 ----
  if [ "$LANGUAGE" != "C" ]; then
        STATE=1
        LASTSTATE=3
!       fullprio=high
!       shortprio=high
        while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
                case "$STATE" in
                1)
***************
*** 170,176 ****
                                        IFS="$OLD_IFS"  
                                        db_subst $shortlist SHORTLIST "${SHORTLIST}"
                                        db_subst $shortlist DEFAULTLOCALE 
"${DEFAULTLOCALE}"
!                                       db_input critical $shortlist || [ $? -eq 30 ]
                                        askedshort=1
                                else
                                        askedshort=0
--- 171,177 ----
                                        IFS="$OLD_IFS"  
                                        db_subst $shortlist SHORTLIST "${SHORTLIST}"
                                        db_subst $shortlist DEFAULTLOCALE 
"${DEFAULTLOCALE}"
!                                       db_input $shortprio $shortlist || [ $? -eq 30 ]
                                        askedshort=1
                                else
                                        askedshort=0

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.7-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (ignored: LC_ALL set to fr_FR.UTF-8)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to