Mageia Bugzilla – Attachment 6637 Details for
Bug 15761
localedrake: input method for CJK is in advanced settings on second run
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
fix regression
15761.diff (text/plain), 643 bytes, created by
Thierry Vignaud
on 2015-05-25 11:14:27 CEST
(
hide
)
Description:
fix regression
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2015-05-25 11:14:27 CEST
Size:
643 bytes
patch
obsolete
>diff -up ./lang.pm.tv7 ./lang.pm >--- ./lang.pm.tv7 2015-05-22 12:14:44.227578851 -0400 >+++ ./lang.pm 2015-05-22 12:16:36.512580558 -0400 >@@ -1345,7 +1345,7 @@ sub read { > $f2 = "$::prefix/etc/sysconfig/i18n" if ! -e $f2 && -e "$::prefix/etc/sysconfig/i18n"; > my %h = getVarsFromSh($b_user_only && -e $f1 ? $f1 : $f2); > # Fill in defaults (from LANG= variable) >- %h = map { $_ => $h{$_} || $h{LANG} || 'en_US' } @locale_conf_fields; >+ $h{$_} ||= $h{LANG} || 'en_US' foreach @locale_conf_fields; > my $locale = system_locales_to_ourlocale($h{LC_MESSAGES}, $h{LC_MONETARY}); > > if (find { $h{$_} } @IM_i18n_fields) {
diff -up ./lang.pm.tv7 ./lang.pm --- ./lang.pm.tv7 2015-05-22 12:14:44.227578851 -0400 +++ ./lang.pm 2015-05-22 12:16:36.512580558 -0400 @@ -1345,7 +1345,7 @@ sub read { $f2 = "$::prefix/etc/sysconfig/i18n" if ! -e $f2 && -e "$::prefix/etc/sysconfig/i18n"; my %h = getVarsFromSh($b_user_only && -e $f1 ? $f1 : $f2); # Fill in defaults (from LANG= variable) - %h = map { $_ => $h{$_} || $h{LANG} || 'en_US' } @locale_conf_fields; + $h{$_} ||= $h{LANG} || 'en_US' foreach @locale_conf_fields; my $locale = system_locales_to_ourlocale($h{LC_MESSAGES}, $h{LC_MONETARY}); if (find { $h{$_} } @IM_i18n_fields) {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 15761
:
6625
|
6635
|
6636
| 6637