[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

New language Occitan - console-setup



Hi all,

you might have noticed Occitan showing up as new language for the installer
recently.

Hopefully I got that all right so far ...

Now it comes to keyboard configuration: I am unsure how it exactly needs to be
done in console-setup.

Default locale for Occitan is oc_FR.UTF-8 and the needed keymap is French.

I'm sure where I should Occitan in keyboard-configuration.config (in the 
list of countries or in the list of 'specific languages'?

Since Occitan is spoken in more than one country, I guess adding it to 
the list of specific languages would be suitable?

Patch attached as a proposal.


Holger


-- 
Holger Wansing <hwansing@mailbox.org>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076
diff --git a/debian/changelog b/debian/changelog
index fe2544e..56ae3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+console-setup (1.198) UNRELEASED; urgency=medium
+
+  * Add choice and default keymap for Occitan.
+
+ -- Holger Wansing <hwansing@mailbox.org>  Mon, 05 Oct 2020 13:27:51 +0200
+
 console-setup (1.197) unstable; urgency=medium
 
   * Team upload
 
   [ Anton Zinoviev ]
   * standard.equivalents: map more aggressively the box drawing symbols.
     Mappings for ballot symbols.  Thanks to Nick Black, closes: #965029.
   * sync the Terminus font with the xfonts-terminus package (new upstream
     version with new font size 18x10, apply the patches dv1.diff (modified
diff --git a/debian/keyboard-configuration.config b/debian/keyboard-configuration.config
index 8afd9a6..37ea19e 100644
--- a/debian/keyboard-configuration.config
+++ b/debian/keyboard-configuration.config
@@ -781,18 +781,22 @@ case "$locale" in
 	XKBLAYOUT=us,in  # India
 	XKBVARIANT=,mal # Malayalam
 	;;
     my_*)
 	XKBLAYOUT=us,mm  # Burmese
 	;;
     ne_*)
 	XKBLAYOUT=us,np  # Nepali
 	;;
+    oc_*)
+	XKBLAYOUT=fr  # French
+	XKBVARIANT=latin9  # Occitan
+	;;
     os_*)
 	XKBLAYOUT=ru  # Russia
 	XKBVARIANT=os  # Ossetian
 	;;
     pa_*)
 	XKBLAYOUT=us,in  # India
 	XKBVARIANT=,guru # Gurmukhi
 	;;
     si_*)
diff --git a/debian/keyboard-configuration.templates b/debian/keyboard-configuration.templates
index 0d2c96c..8de0e06 100644
--- a/debian/keyboard-configuration.templates
+++ b/debian/keyboard-configuration.templates
@@ -159,22 +159,22 @@ Template: keyboard-configuration/ctrl_alt_bksp
 Type: boolean
 Default: false
 # :sl3:
 _Description: Use Control+Alt+Backspace to terminate the X server?
  By default the combination Control+Alt+Backspace does nothing.  If
  you want it can be used to terminate the X server.
 
 Template: keyboard-configuration/xkb-keymap
 Type: select
-Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, ba, br, gb, bg, bg(phonetic), mm, ca, ca(multi), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, ua, cn(ug), vn
+Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, ba, br, gb, bg, bg(phonetic), mm, ca, ca(multi), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, oc, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, ua, cn(ug), vn
 # :sl1:
 #flag:partial
-__Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Bosnian, Brazilian, British English, Bulgarian (BDS layout), Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Ukrainian, Uyghur, Vietnamese
+__Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Bosnian, Brazilian, British English, Bulgarian (BDS layout), Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Occitan, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Ukrainian, Uyghur, Vietnamese
 _Description: Keymap to use:
 
 Template: keyboard-configuration/modelcode
 Type: string
 Description: for internal use
 
 Template: keyboard-configuration/layoutcode
 Type: string
 Description: for internal use

Reply to: