Re: How should we handle translations in languagechooser?
On Mon, Apr 07, 2003 at 08:55:14PM +0200, Denis Barbier wrote:
[...]
> > I suspect it is best to set the language to 'en' before the question
> > is presented, to make sure everyone get their language text the same
> > way every time. But for this to be usefull, cdebconf must be fixed to
> > handle long multiselect lists, and to change langauge when the
> > debconf/language template is set. Then I can add
> >
> > db_set debconf/language en
> >
> > at the start of languagechooser to get the above described behaviour.
>
> Right, I now understand what you have in mind ;)
> About this very specific question, a simpler solution is to put localized
> sentences directly in languagelist, e.g.
> English (Australia);en_AU;en;AU;;Choose this to proceed in English (Australia)
> and replace 'cut -f1' by cut -f6' when generating debian/templates
Here is a patch.
There is then no need to set LANGUAGE=en, and debian/po/en.po becomes
useless.
Denis
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 7 Apr 2003 21:41:33 -0000 1.9
+++ Makefile 8 Apr 2003 22:48:07 -0000
@@ -1,8 +1,8 @@
all: debian/templates check-scripts
debian/templates: Makefile debian/templates.in languagelist
- languagenames=`grep -v "^#" languagelist | cut -d\; -f1 | tr "\n" "," | sed 's/,/, /g' | sed "s/, $$//g"`; \
- sed "s/@languagenames@/$$languagenames/" < debian/templates.in > $@
+ nativemessages=`grep -v "^#" languagelist | cut -d\; -f6 | tr "\n" "," | sed 's/,/, /g' | sed "s/, $$//g"`; \
+ sed "s/@nativemessages@/$$nativemessages/" < debian/templates.in > $@
check-scripts:
if [ -x /bin/ash ] ; then SH=ash ; else SH=dash; fi ; \
Index: languagechooser
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/languagechooser,v
retrieving revision 1.13
diff -u -r1.13 languagechooser
--- languagechooser 7 Apr 2003 21:33:10 -0000 1.13
+++ languagechooser 8 Apr 2003 22:48:07 -0000
@@ -17,10 +17,6 @@
# debconf/language is an alias for debian-installer/language
db_register "$languagecode" "debconf/language"
-# Always use the english "translation" when asking for language
-# If we are lucky, this might change the language imediately
-db_set debconf/language en
-
db_fset "languagechooser/language-name" seen false
db_fset "$languagecode" seen false
db_input critical "languagechooser/language-name" || [ $? -eq 30 ]
Index: languagelist
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/languagelist,v
retrieving revision 1.10
diff -u -r1.10 languagelist
--- languagelist 1 Apr 2003 17:24:10 -0000 1.10
+++ languagelist 8 Apr 2003 22:48:07 -0000
@@ -1,43 +1,43 @@
-#Language [(Region/Country)];locale;langcode;countrycode;langlist
-Catalan;ca_ES;ca;ES;ca:es
-Chinese (Simplified);zh_CN;zh;CN;
-Chinese (Traditional);zh_TW;zh;TW;
-Croatian;hr_HR;hr;HR;
-Czech;cs_CZ;cs;CZ;
-Danish;da_DK;da;DK;
-Dutch (Belgium);nl_BE;nl;BE;nl_BE:nl:nl_NL
-Dutch (The Nederlands);nl_NL;nl;NL;nl_NL:nl:nl_BE
-English (Australia);en_AU;en;AU;
-English (India);en_IN;en;IN;
-English (USA);en_US;en;US;
-English (United Kingdom);en_GB;en;GB;
-Esperanto;eo_EO;eo;;
-Finnish;fi_FI;fi;FI;fi:se
-French (Belgium);fr_BE@euro;fr;BE;
-French (Canada);fr_CA;fr;CA;
-French (France);fr_FR@euro;fr;FR;
-French (Luxembourg);fr_LU@euro;fr;LU;
-French (Switzerland);fr_CH;fr;CH;
-Galician;gl_ES;gl;ES;gl:es
-German (Germany);de_DE@euro;de;DE;
-Hebrew;he_IL;he;IL;
-Hungarian;hu_HU;hu;HU;
-Irish;ga_IE;ga;IE;ga:en_IE
-Iselandic;is_IS;is;IS;
-Italian;it_IT;it;IT;
-Japanese;ja_JP;ja;JP;
+#Language [(Region/Country)];locale;langcode;countrycode;[langlist];message in native language (UTF-8 encoding)
+Catalan;ca_ES;ca;ES;ca:es;Trieu açò i premeu Retorn per a continuar en català .
+Chinese (Simplified);zh_CN;zh;CN;;æ?¨é??æ?©äº?ç®?ä½?ä¸æ??ã??请æ?? Enter é?®ç»§ç»å®?è£?
+Chinese (Traditional);zh_TW;zh;TW;;é?¸æ??æ¤é ?並æ?? Enter å?³å?¯ä»¥ç¹?é«?ä¸æ??ç¹¼çº?å®?è£?ã??
+Croatian;hr_HR;hr;HR;;Odaberite ovo i pritisnite Enter kako bi nastavili na hrvatskom
+Czech;cs_CZ;cs;CZ;;Volite tento a stisknete Enter k pokraÄ?ovánà Ä?esky
+Danish;da_DK;da;DK;;Vælg dette og tryk enter for at fortsætte på dansk.
+Dutch (Belgium);nl_BE;nl;BE;nl_BE:nl:nl_NL;Kies dit en druk op Enter om in het Nederlands verder te gaan. (België)
+Dutch (The Nederlands);nl_NL;nl;NL;nl_NL:nl:nl_BE;Kies dit en druk op Enter om in het Nederlands verder te gaan. (Nederland)
+English (Australia);en_AU;en;AU;;Choose this to proceed in English (Australia)
+English (India);en_IN;en;IN;;Choose this to proceed in English (India)
+English (USA);en_US;en;US;;Choose this to proceed in English (USA)
+English (United Kingdom);en_GB;en;GB;;Choose this to proceed in English (United Kingdom)
+Esperanto;eo_EO;eo;;;lektu Ä?i tion kaj premu ENEN por daÅrigi en Esperanto.
+Finnish;fi_FI;fi;FI;fi:se;Choose this to proceed in Finnish
+French (Belgium);fr_BE@euro;fr;BE;;Sélectionnez ceci et validez pour continuer en français (Belgique)
+French (Canada);fr_CA;fr;CA;;Sélectionnez ceci et validez pour continuer en français (Canada)
+French (France);fr_FR@euro;fr;FR;;Sélectionnez ceci et validez pour continuer en français (France)
+French (Luxembourg);fr_LU@euro;fr;LU;;Sélectionnez ceci et validez pour continuer en français (Luxembourg)
+French (Switzerland);fr_CH;fr;CH;;Sélectionnez ceci et validez pour continuer en français (Suisse)
+Galician;gl_ES;gl;ES;gl:es;Escolla isto e prema Enter para seguir en galego.
+German (Germany);de_DE@euro;de;DE;;Dies auswählen und Return drücken- um auf Deutsch fortzufahren (Deutschland)
+Hebrew;he_IL;he;IL;;Choose this to proceed in Hebrew
+Hungarian;hu_HU;hu;HU;;A magyart választottad. Nyomd meg az Entert a folytatáshoz
+Irish;ga_IE;ga;IE;ga:en_IE;Tóg seo agus thit Enter a lean as Gaeilge
+Iselandic;is_IS;is;IS;;Choose this to proceed in Iselandic
+Italian;it_IT;it;IT;;Si selezioni questa riga e si prema INVIO per l'italiano
+Japanese;ja_JP;ja;JP;;æ?¥æ?¬èª?ã?§è¨å®?ã??è¡?ã??ã?«ã?¯ã?¨ã?³ã?¿ã?¼ã??æ?¼ã??ã?¦ã??ã? ã??ã??
# Could be both 'KR' (South) and 'KP' (North), but the locale is using
# 'KR' so we use it as the country.
-Korean;ko_KR;ko;KR;
-Latvian;lv_LV;lv;LV;lv:ru:en
-Northern Saami (Norway);se_NO;se_NO:se:nb_NO:nb:no_NO:no:nn_NO:nn:en_GB:en
-Norwegian Bokmaal;no_NO;nb;NO;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en_GB:en
-Norwegian Nynorsk;nn_NO;nn;NO;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv:en_GB:en
-Polish;pl_PL;pl;PL;
-Portuguese (Brazil);pt_BR;pt;BR;pt_BR:pt:pt_PT
-Portuguese (Portugal);pt_PT;pt;PT;pt_PT:pt:pt_BR
-Russian;ru_RU;ru;RU;
-Spanish (Spain);es_ES;es;ES;
-Swedish (Finland);sv_FI;sv;FI;
-Swedish (Sweden);sv_SE;sv;SE;
-Turkish;tr_TR;tr;TR;
+Korean;ko_KR;ko;KR;;í??êµì?´ë¥¼ ì? í??í??ì?¨ì?µë??ë?¤. ê³?ì??í??ë ¤ë©´ ì??í?°ë¥¼ ë??르ì?¸ì??
+Latvian;lv_LV;lv;LV;lv:ru:en;Choose this to proceed in Latvian
+Northern Saami (Norway);se_NO;se;NO;se_NO:se:nb_NO:nb:no_NO:no:nn_NO:nn;Choose this to proceed in Northern Saami (Norway)
+Norwegian Bokmål;no_NO;nb;NO;nb_NO:nb:no_NO:no:nn_NO:nn:da:sv;Velg denne for å fortsette med norsk bokmål
+Norwegian Nynorsk;nn_NO;nn;NO;nn_NO:nn:no_NO:no:nb_NO:nb:da:sv;Velg denne for å fortsette med norsk nynorsk
+Polish;pl_PL;pl;PL;;PodÅ?wietl tÄ? pozycjÄ? i wciÅ?nij enter aby wybraÄ? jÄ?zyk polski
+Portuguese (Brazil);pt_BR;pt;BR;pt_BR:pt:pt_PT;Você selecionou o idioma Português- pressione Enter (Brasil)
+Portuguese (Portugal);pt_PT;pt;PT;pt_PT:pt:pt_BR;Você selecionou o idioma Português- pressione Enter (Portugal)
+Russian;ru_RU;ru;RU;;длÑ? Ñ?Ñ?Ñ?ановки на Ñ?Ñ?Ñ?Ñ?ком Ñ?зÑ?ке нажмиÑ?е клавиÑ?Ñ? Enter
+Spanish (Spain);es_ES;es;ES;;Elija esta opción y pulse enter para continuar en español (España)
+Swedish (Finland);sv_FI;sv;FI;;Välj det här för att fortsätta på svenska (Finland)
+Swedish (Sweden);sv_SE;sv;SE;;Välj det här för att fortsätta på svenska (Sverige)
+Turkish;tr_TR;tr;TR;;Türkçeyi seçtiniz. Devam etmek için ENTER'a basın.
Index: languagemap
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/languagemap,v
retrieving revision 1.12
diff -u -r1.12 languagemap
--- languagemap 12 Mar 2003 23:24:00 -0000 1.12
+++ languagemap 8 Apr 2003 22:48:07 -0000
@@ -3,7 +3,7 @@
# This file should be automatically generated.
#
# Usage:
-# LANGNAME="langname"
+# LANGMSG="langname"
# . languagemap
for list in /etc/languagelist /usr/share/languagelist ./languagelist ; do
@@ -25,9 +25,9 @@
# The assumed country (location)
COUNTRY=us
-# echo "Looking up '$LANGNAME'"
+# echo "Looking up '$LANGMSG'"
-line=`grep "^$LANGNAME" $languages`
+line=`grep -F ";$LANGMSG" $languages`
#echo L: $line 1>&2
if [ "$line" ] ; then
@@ -47,5 +47,5 @@
LANGUAGELIST="$LANGUAGE"
fi
else
- echo "error: Unable to locate info on language '$LANGNAME'"
+ echo "error: Unable to locate language when looking for '$LANGMSG'"
fi
Index: debian/templates.in
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/languagechooser/debian/templates.in,v
retrieving revision 1.3
diff -u -r1.3 templates.in
--- debian/templates.in 7 Apr 2003 15:51:40 -0000 1.3
+++ debian/templates.in 8 Apr 2003 22:48:07 -0000
@@ -1,7 +1,7 @@
Template: languagechooser/language-name
Type: select
-__Choices: @languagenames@
-Default: English (USA)
+Choices: @nativemessages@
+Default: Choose this to proceed in English (USA)
_Description: Choose The Language
Please select which language you would like to use. This affects the
translation, the default locale, location and keyboard layout.
Reply to: