[PATCH] rhpl: when multiple layout variants are specified, use the national one first

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

 



Hi,

as a response to bug #473056 I propose this patch, which should make the
locally common keyboard layout the primary one.

We have to change it for Czech layout, the others I'm not sure, but I
think that this bug applies to them as well.

-- 
Martin Sivak
msivak@xxxxxxxxxx

Red Hat Czech s.r.o.
http://cz.redhat.com
Purkynova 99/71, 612 45 Brno, Czech Republic
Registered in Brno under #CZ27690016

diff --git a/src/keyboard_models.py b/src/keyboard_models.py
index 1075e76..8b6c9ca 100644
--- a/src/keyboard_models.py
+++ b/src/keyboard_models.py
@@ -45,34 +45,34 @@ class KeyboardModels:
         self._modelDict = {
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ar-azerty'               : [N_('keyboard|Arabic (azerty)'), 'us,ara', 'pc105', 'azerty', 'grp:shifts_toggle,grp_led:scroll'],
+            'ar-azerty'               : [N_('keyboard|Arabic (azerty)'), 'ara,us', 'pc105', 'azerty', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ar-azerty-digits'        : [N_('keyboard|Arabic (azerty/digits)'), 'us,ara', 'pc105', 'azerty_digits', 'grp:shifts_toggle,grp_led:scroll'],
+            'ar-azerty-digits'        : [N_('keyboard|Arabic (azerty/digits)'), 'ara,us', 'pc105', 'azerty_digits', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ar-digits'               : [N_('keyboard|Arabic (digits)'), 'us,ara', 'pc105', 'digits', 'grp:shifts_toggle,grp_led:scroll'],
+            'ar-digits'               : [N_('keyboard|Arabic (digits)'), 'ara,us', 'pc105', 'digits', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ar-qwerty'               : [N_('keyboard|Arabic (qwerty)'), 'us,ara', 'pc105', 'qwerty', 'grp:shifts_toggle,grp_led:scroll'],
+            'ar-qwerty'               : [N_('keyboard|Arabic (qwerty)'), 'ara,us', 'pc105', 'qwerty', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ar-qwerty-digits'        : [N_('keyboard|Arabic (qwerty/digits)'), 'us,ara', 'pc105', 'qwerty_digits', 'grp:shifts_toggle,grp_led:scroll'],
+            'ar-qwerty-digits'        : [N_('keyboard|Arabic (qwerty/digits)'), 'ara,us', 'pc105', 'qwerty_digits', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'be-latin1'               : [N_('keyboard|Belgian (be-latin1)'), 'be', 'pc105', '', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ben'                      : [N_('keyboard|Bengali (Inscript)'), 'us,in', 'pc105', 'ben', 'grp:shifts_toggle,grp_led:scroll'],
+            'ben'                      : [N_('keyboard|Bengali (Inscript)'), 'in,us', 'pc105', 'ben', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ben-probhat'             : [N_('keyboard|Bengali (Probhat)'), 'us,in', 'pc105', 'ben_probhat', 'grp:shifts_toggle,grp_led:scroll'],
+            'ben-probhat'             : [N_('keyboard|Bengali (Probhat)'), 'in,us', 'pc105', 'ben_probhat', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'bg_bds-utf8'             : [N_('keyboard|Bulgarian'), 'us,bg', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'bg_bds-utf8'             : [N_('keyboard|Bulgarian'), 'bg,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'bg_pho-utf8'             : [N_('keyboard|Bulgarian (Phonetic)'), 'us,bg', 'pc105', ',phonetic', 'grp:shifts_toggle,grp_led:scroll'],
+            'bg_pho-utf8'             : [N_('keyboard|Bulgarian (Phonetic)'), 'bg,us', 'pc105', ',phonetic', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'br-abnt2'                : [N_('keyboard|Brazilian (ABNT2)'), 'br', 'abnt2', '', ''],
@@ -84,7 +84,7 @@ class KeyboardModels:
             'croat'                   : [N_('keyboard|Croatian'), 'hr', 'pc105', '', '' ],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'cz-us-qwertz'            : [N_('keyboard|Czech'), 'us,cz', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'cz-us-qwertz'            : [N_('keyboard|Czech'), 'cz,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'cz-lat2'                 : [N_('keyboard|Czech (qwerty)'), 'cz', 'pc105', 'qwerty', ''],
@@ -99,7 +99,7 @@ class KeyboardModels:
             'de-latin1-nodeadkeys'    : [N_('keyboard|German (latin1 w/ no deadkeys)'), 'de', 'pc105', 'nodeadkeys', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'dev'                     : [N_('keyboard|Devanagari (Inscript)'), 'us,dev', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'dev'                     : [N_('keyboard|Devanagari (Inscript)'), 'dev,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
            'dvorak'                   : [N_('keyboard|Dvorak'), 'us', 'pc105', 'dvorak', ''],
@@ -141,13 +141,13 @@ class KeyboardModels:
             'fr_CH-latin1'            : [N_('keyboard|Swiss French (latin1)'), 'ch', 'pc105', 'fr', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'gr'                      : [N_('keyboard|Greek'), 'us,gr', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'gr'                      : [N_('keyboard|Greek'), 'gr,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'guj'                     : [N_('keyboard|Gujarati (Inscript)'), 'us,in', 'pc105', 'guj', 'grp:shifts_toggle,grp_led:scroll'],
+            'guj'                     : [N_('keyboard|Gujarati (Inscript)'), 'in,us', 'pc105', 'guj', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'gur'                     : [N_('keyboard|Punjabi (Inscript)'), 'us,gur', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'gur'                     : [N_('keyboard|Punjabi (Inscript)'), 'gur,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'hu'                      : [N_('keyboard|Hungarian'), 'hu', 'pc105', '', ''],
@@ -180,7 +180,7 @@ class KeyboardModels:
             'la-latin1'               : [N_('keyboard|Latin American'), 'latam', 'pc105', '', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'mk-utf'                  : [N_('keyboard|Macedonian'), 'us,mkd', 'pc105', '','grp:shifts_toggle,grp_led:scroll'],
+            'mk-utf'                  : [N_('keyboard|Macedonian'), 'mkd,us', 'pc105', '','grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'nl'                      : [N_('keyboard|Dutch'), 'nl', 'pc105', '', ''],
@@ -207,7 +207,7 @@ class KeyboardModels:
             'ro-std-cedilla'                  : [N_('keyboard|Romanian Standard Cedilla'), 'ro', 'pc105', 'std_cedilla', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ru'                      : [N_('keyboard|Russian'), 'us,ru', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'ru'                      : [N_('keyboard|Russian'), 'ru,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'sr-cy'                 : [N_('keyboard|Serbian'), 'rs', 'pc105', '', ''],
@@ -234,10 +234,10 @@ class KeyboardModels:
             'tj'                      : [N_('keyboard|Tajik'), 'tj', 'pc105', '', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'tml-inscript'            : [N_('keyboard|Tamil (Inscript)'), 'us,in', 'pc105', 'tam', 'grp:shifts_toggle,grp_led:scroll'],
+            'tml-inscript'            : [N_('keyboard|Tamil (Inscript)'), 'in,us', 'pc105', 'tam', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'tml-uni'                 : [N_('keyboard|Tamil (Typewriter)'), 'us,in', 'pc105', 'tam_TAB', 'grp:shifts_toggle,grp_led:scroll'],
+            'tml-uni'                 : [N_('keyboard|Tamil (Typewriter)'), 'in,us', 'pc105', 'tam_TAB', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'trq'                     : [N_('keyboard|Turkish'), 'tr', 'pc105', '', ''],
@@ -246,7 +246,7 @@ class KeyboardModels:
             'uk'                      : [N_('keyboard|United Kingdom'), 'gb', 'pc105', '', ''],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
-            'ua-utf'                  : [N_('keyboard|Ukrainian'), 'us,ua', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
+            'ua-utf'                  : [N_('keyboard|Ukrainian'), 'ua,us', 'pc105', '', 'grp:shifts_toggle,grp_led:scroll'],
             # Translators: the word before the bar is just context and
             # doesn't need to be translated. Only after will be translated.
             'us-acentos'              : [N_('keyboard|U.S. International'), 'us', 'pc105', 'intl', ''],

Attachment: pgpsEFljJG4mo.pgp
Description: PGP signature

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux