← Back to branch summary

~eugenenuke/ubuntu/wily/console-setup/fix-for-1565542

« back to all changes in this revision

Viewing changes to Keyboard/kbdcompiler

  • Committer: Bazaar Package Importer
  • Author(s): Anton Zinoviev
  • Date: 2006-11-13 21:24:44 UTC
  • mto: (3.2.1 squeeze)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: james.westby@ubuntu.com-20061113212444-6qxdbq8dxxtr4tnu
Tags: 1.13
Unfuzzy the translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Keyboard/kbdcompiler
24
24
}
25
25
 
26
26
# Don't forget to update also the list in config.proto
27
 
my $nonlatin = ' am ara ben bd bg bt by cs deva ge gh gr guj guru \
 
27
my $nonlatin = ' am ara ben bd bg bt by deva ge gh gr guj guru \
28
28
                 il in ir iku jp kan kh la lao lk mk mm mn mv mal \
29
29
                 ori pk ru scc sy syr tel th tj tam ua uz ';
30
30
 
71
71
                            ? "us,$layout"
72
72
                            : $layout));
73
73
    if (! -f "$dir/$model-$layout") {
74
 
        execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
75
 
                 ." -model $model -layout $actual_layout"
76
 
                 ." >$dir/$model-$layout")
77
 
            and die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
 
74
        if ($layout eq 'cs') {
 
75
            execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
 
76
                     ." -model $model"
 
77
                     ." -layout $actual_layout -variant latin,"
 
78
                     ." >$dir/$model-$layout");
 
79
        } else {
 
80
            execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
 
81
                     ." -model $model -layout $actual_layout"
 
82
                     ." >$dir/$model-$layout");
 
83
        }
 
84
        die "$0: ckbcomp failed\n" if (! -f "$dir/$model-$layout");
78
85
    }
79
86
    if (-f "$dir/$model-$layout") {
80
87
        read_temp_kmap $layout;
81
88
    }
82
89
    for my $variant (values %{$KeyboardNames::variants{$layout}}) {
83
 
        my $actual_variant = (($actual_layout =~ /,/)
84
 
                              ? ",$variant"
85
 
                              : $variant);
 
90
        my $actual_variant;
 
91
        if ($actual_layout eq 'cs,cs') {
 
92
            if ($variant =~ /latin/) {
 
93
                $actual_variant = "$variant,$variant";
 
94
            } elsif ($variant eq 'yz') {
 
95
                $actual_variant = "latinyz,$variant";
 
96
            } elsif ($variant eq 'alternatequotes') {
 
97
                $actual_variant = "latinalternatequotes,$variant";
 
98
            } else {
 
99
                $actual_variant = "latin,$variant";
 
100
            }
 
101
        } elsif ($actual_layout =~ /,/) {
 
102
            $actual_variant = ",$variant";
 
103
        } else {
 
104
            $actual_variant = $variant;
 
105
        }
86
106
        if (! -f "$dir/$model-$layout:$variant") {
87
107
            execute ("./ckbcomp -compact -I. -I${xkbdir} -rules xorg"
88
108
                     ." -model $model"