Moving translations away from config scripts (was Re: X Strike Force XFree86 SVN commit: r1762 - trunk/debian)

[barbier@linuxfr.org (Denis Barbier)]

On Mon, Aug 30, 2004 at 07:59:22PM +0200, Denis Barbier wrote:
> On Mon, Aug 30, 2004 at 02:30:32AM -0500, X Strike Force SVN Repository Admin wrote:
> > Author: fabbione
> > Date: 2004-08-30 02:30:28 -0500 (Mon, 30 Aug 2004)
> > New Revision: 1762
> > 
> > Modified:
> >    trunk/debian/CHANGESETS
> >    trunk/debian/changelog
> >    trunk/debian/xserver-xfree86.config.in
> > Log:
> > Add french and danish translation of "Generic Monitor" to
> > xserver-xfree86.config.in. Thanks to Christian Perrier and Anders Dybdal.
> 
> Please don't do that, config scripts must not contain non-English
> strings.  For instance your implementation does not consider the
> LANGUAGE environment variable and user's encoding.
> Here is a patch.

Branden disliked this patch for being too disruptive for sarge, so here is
a less intrusive one.

Denis

Index: debian/xserver-xfree86.config.in
===================================================================
--- debian/xserver-xfree86.config.in	(revision 1771)
+++ debian/xserver-xfree86.config.in	(working copy)
@@ -725,21 +725,8 @@
 fi
 if [ -z "$DEFAULT" ]; then
   # fall back to some language-specific generic text
-  case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
-    ca_*) DEFAULT="Targeta de vídeo genèrica" ;;
-    da_*) DEFAULT="Standard Video Kort" ;;
-    de_*) DEFAULT="Standardgrafikkarte" ;;
-    es_*) DEFAULT="Tarjeta de vídeo genérica" ;;
-    fr_*) DEFAULT="Carte vidéo générique" ;;
-    gl_*) DEFAULT="Tarxeta de Video Xenérica" ;;
-    it_*) DEFAULT="Scheda video generica" ;;
-    # ja
-    # nl
-    pt_BR) DEFAULT="Placa de Vídeo Genérica" ;;
-    # ru
-    # sv
-    *) DEFAULT="Generic Video Card" ;;
-  esac
+  db_get xserver-xfree86/config/generic_video_card || debug_report_status "db_get xserver-xfree86/config/generic_video_card" "$?"
+  DEFAULT=$RET
 fi
 # this question requires input validation
 MAY_BE_NULL= auto_answer validate_string_db_input "$(priority_ceil low)" xserver-xfree86/config/device/identifier "$DEFAULT"
@@ -1083,20 +1070,8 @@
   DEFAULT="$DEFAULT_MONITOR_IDENTIFIER"
 else
   # fall back to some language-specific generic text
-  case "${LC_ALL:-${LC_MESSAGES:-$LANG}}" in
-    ca_*) DEFAULT="Monitor genèric" ;;
-    da_*) DEFAULT="Standard Skærm" ;;
-    de_*) DEFAULT="Standardbildschirm" ;;
-    es_*) DEFAULT="Monitor genérico" ;;
-    fr_*) DEFAULT="Écran générique" ;;
-    # gl
-    it_*) DEFAULT="Monitor Generico" ;;
-    # ja
-    # nl
-    pt_BR) DEFAULT="Monitor Genérico" ;;
-    # ru
-    # sv
-    *) DEFAULT="Generic Monitor" ;;
+  db_get xserver-xfree86/config/generic_monitor || debug_report_status "db_get xserver-xfree86/config/generic_monitor" "$?"
+  DEFAULT=$RET
   esac
 fi
 # this question requires input validation
Index: debian/xserver-xfree86.templates
===================================================================
--- debian/xserver-xfree86.templates	(revision 1771)
+++ debian/xserver-xfree86.templates	(working copy)
@@ -114,6 +114,12 @@
  however, the X server configuration files can be edited to support a
  multi-head configuration.
 
+Template: xserver-xfree86/config/generic_video_card
+Type: text
+_Default: Generic Video Card
+Description: internal use only
+ This template is never shown to the user and does not require translation.
+
 Template: xserver-xfree86/config/device/identifier
 Type: string
 _Description: Enter an identifier for your video card.
@@ -448,6 +454,12 @@
  do this, but only if both the video chipset and the driver support it; if in
  doubt, use the video mode recommended by the manufacturer of your LCD.
 
+Template: xserver-xfree86/config/generic_monitor
+Type: text
+_Default: Generic Monitor
+Description: internal use only
+ This template is never shown to the user and does not require translation.
+
 Template: xserver-xfree86/config/monitor/identifier
 Type: string
 _Description: Enter an identifier for your monitor.
Index: debian/po/gl.po
===================================================================
--- debian/po/gl.po	(revision 1771)
+++ debian/po/gl.po	(working copy)
@@ -519,6 +519,12 @@
 "para que soporten unha configuración de varias pantallas."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Tarxeta de Video Xenérica"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1293,6 +1299,12 @@
 "posible no monitor, se quere."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/cs.po
===================================================================
--- debian/po/cs.po	(revision 1771)
+++ debian/po/cs.po	(working copy)
@@ -574,6 +574,12 @@
 "můşete pozdÄ?ji pÅ?idat úpravou konfiguraÄ?ního souboru X serveru."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1427,6 +1433,12 @@
 "displeji by mÄ?li vybrat reÅŸim doporuÄ?enÃœ vÃœrobcem monitoru."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/pt_BR.po
===================================================================
--- debian/po/pt_BR.po	(revision 1771)
+++ debian/po/pt_BR.po	(working copy)
@@ -611,6 +611,12 @@
 "para suportarem uma configuração de diversos monitores."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Placa de Vídeo Genérica"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1510,6 +1516,12 @@
 "caso de dúvidas, use o modo de vídeo recomendado pelo fabricante de seu LCD."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Monitor Genérico"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/es.po
===================================================================
--- debian/po/es.po	(revision 1771)
+++ debian/po/es.po	(working copy)
@@ -614,6 +614,12 @@
 "head»)."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Tarjeta de vídeo genérica"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1509,6 +1515,12 @@
 "dudas, use el modo de vídeo recomendado por el fabricante de su LCD."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Monitor genérico"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/fr.po
===================================================================
--- debian/po/fr.po	(revision 1771)
+++ debian/po/fr.po	(working copy)
@@ -618,6 +618,12 @@
 "pour accepter des systèmes multi-écrans."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Carte vidéo générique"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1540,6 +1546,12 @@
 "certain, utilisez le mode vidéo recommandé par le fabricant de votre écran."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Écran générique"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/nl.po
===================================================================
--- debian/po/nl.po	(revision 1771)
+++ debian/po/nl.po	(working copy)
@@ -614,6 +614,12 @@
 "configuratiebestanden zelf aan te passen."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1511,6 +1517,12 @@
 "beeldmodus."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/pl.po
===================================================================
--- debian/po/pl.po	(revision 1771)
+++ debian/po/pl.po	(working copy)
@@ -504,6 +504,12 @@
 msgstr ""
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1196,6 +1202,12 @@
 msgstr ""
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/it.po
===================================================================
--- debian/po/it.po	(revision 1771)
+++ debian/po/it.po	(working copy)
@@ -584,6 +584,12 @@
 "permettere di avere una configurazione con più monitor."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Scheda video generica"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1482,6 +1488,12 @@
 "produttore del vostro LCD."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Monitor Generico"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/templates.pot
===================================================================
--- debian/po/templates.pot	(revision 1771)
+++ debian/po/templates.pot	(working copy)
@@ -473,6 +473,12 @@
 msgstr ""
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1164,6 +1170,12 @@
 msgstr ""
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/ca.po
===================================================================
--- debian/po/ca.po	(revision 1771)
+++ debian/po/ca.po	(working copy)
@@ -610,6 +610,12 @@
 "suporte una configuració amb múltiples caps."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Targeta de vídeo genÚrica"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1510,6 +1516,12 @@
 "mode de vídeo recomanat pel fabricant del vostre monitor LCD."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Monitor genÚric"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/da.po
===================================================================
--- debian/po/da.po	(revision 1771)
+++ debian/po/da.po	(working copy)
@@ -592,6 +592,12 @@
 "flere."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Standard Video Kort"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1452,6 +1458,12 @@
 "bruge den opløsning, som anbefales af din LCD-skærms producent."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Standard Skærm"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/tr.po
===================================================================
--- debian/po/tr.po	(revision 1771)
+++ debian/po/tr.po	(working copy)
@@ -598,6 +598,12 @@
 "etkinleÅ?tirmek için X sunucu yapılandırma dosyaları dÃŒzenlenebilir."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1475,6 +1481,12 @@
 "seçin."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/ru.po
===================================================================
--- debian/po/ru.po	(revision 1771)
+++ debian/po/ru.po	(working copy)
@@ -596,6 +596,12 @@
 "Ó ÎÅÓËÏÌØËÉÍÉ ÄÉÓÐÌÅÑÍÉ."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1473,6 +1479,12 @@
 "ÐÒÏÉÚ×ÏÄÉÔÅÌÅÍ ×ÁÛÅÇÏ öëé-ÍÏÎÉÔÏÒÁ."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/sv.po
===================================================================
--- debian/po/sv.po	(revision 1771)
+++ debian/po/sv.po	(working copy)
@@ -518,6 +518,12 @@
 "konfigurationsfiler kan redigeras för att stödja en flerskärmskonfiguration."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1275,6 +1281,12 @@
 "om du vill."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/de.po
===================================================================
--- debian/po/de.po	(revision 1771)
+++ debian/po/de.po	(working copy)
@@ -611,6 +611,12 @@
 "Betrieb zu unterstützen."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr "Standardgrafikkarte"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1506,6 +1512,12 @@
 "verwendet werden, den der Hersteller des LCDs empfiehlt."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr "Standardbildschirm"
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/ja.po
===================================================================
--- debian/po/ja.po	(revision 1771)
+++ debian/po/ja.po	(working copy)
@@ -600,6 +600,12 @@
 "¥Ø¥Ã¥É€ÎÀßÄê€â€Ç€­€Þ€¹¡£"
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1463,6 +1469,12 @@
 "€é€Ê€±€ì€Ð¡¢LCD €ÎÀœÂ€žµ€¬¿äŸ©€¹€ë¥Ó¥Ç¥ª¥â¡Œ¥É€ò»È€Ã€Æ€¯€À€µ€€¡£"
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."
Index: debian/po/el.po
===================================================================
--- debian/po/el.po	(revision 1771)
+++ debian/po/el.po	(working copy)
@@ -628,6 +628,12 @@
 "ΌιαÏ? κάÏ?Ï?Ï?Îœ οΞÏ?ΜηÏ?."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:119
+msgid "Generic Video Card"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:119
 msgid "Enter an identifier for your video card."
@@ -1548,6 +1554,12 @@
 "Ï?οÏ? Ï?Ï?οÏ?είΜεÏ?αι αÏ?Ï? Ï?οΜ καÏ?αÏ?κεÏ?αÏ?Ï?ή Ï?ηÏ? LCD οΞÏ?ΜηÏ? Ï?αÏ?."
 
 #. Type: string
+#. Default
+#: ../xserver-xfree86.templates:454
+msgid "Generic Monitor"
+msgstr ""
+
+#. Type: string
 #. Description
 #: ../xserver-xfree86.templates:453
 msgid "Enter an identifier for your monitor."