summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-20 01:51:58 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-20 01:51:58 +0000
commitc53e74888916d504993bf17dfe3defaf92978667 (patch)
tree0d8b2e1621cf5b0646ef02690932321b78f9ca35
parentea59d2a78f08e2e20a72f335496db9433c4df0a4 (diff)
downloaddrakx-c53e74888916d504993bf17dfe3defaf92978667.tar
drakx-c53e74888916d504993bf17dfe3defaf92978667.tar.gz
drakx-c53e74888916d504993bf17dfe3defaf92978667.tar.bz2
drakx-c53e74888916d504993bf17dfe3defaf92978667.tar.xz
drakx-c53e74888916d504993bf17dfe3defaf92978667.zip
update OpenOffice/BrOffice alternative according to selected lang (#37820)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/lang.pm8
3 files changed, 11 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 611434e3f..cd157ddb6 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,6 +6,8 @@
(no timezone selection, ntp settings as advanced)
- move functions to get available space from installer
(to be used in draklive-install)
+- localedrake: update OpenOffice/BrOffice alternative according to
+ selected lang (#37820)
Version 10.16.1 - 18 March 2008
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d199a5dc0..d23bd5716 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- do not unconfigure timezone if timezone screen is canceled (#33565)
+- update OpenOffice/BrOffice alternative according to selected lang (#37820)
Version 10.16 - 18 March 2008
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 272c61e6f..6e1dfbcfc 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1209,6 +1209,14 @@ sub write {
}
} if !$b_dont_touch_kde_files;
+
+ #- update alternatives for OpenOffice/BrOffice if present
+ foreach my $name (grep { /^oobr_bootstraprc/ } all("$::prefix/var/lib/alternatives/")) {
+ my $alternative = common::get_alternatives($name) or next;
+ my $wanted = $locale->{lang} eq 'pt_BR' ? 'bootstraprc.bro' : 'bootstraprc.ooo';
+ my $path = find { basename($_) eq $wanted } map { $_->{file} } @{$alternative->{alternatives}};
+ common::symlinkf_update_alternatives($name, $path) if $path;
+ }
}
sub configure_hal {