summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-11-21 18:37:59 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-11-21 18:37:59 +0000
commit463c2e89e422bebfaf22f63b70b81d773d32faa9 (patch)
treec3153f9cec46c40b0bf5255b817ec4c137b0b770
parent5b6577ab89931ba44492d98354b7a5e09c09195a (diff)
downloaddrakx-backup-do-not-use-463c2e89e422bebfaf22f63b70b81d773d32faa9.tar
drakx-backup-do-not-use-463c2e89e422bebfaf22f63b70b81d773d32faa9.tar.gz
drakx-backup-do-not-use-463c2e89e422bebfaf22f63b70b81d773d32faa9.tar.bz2
drakx-backup-do-not-use-463c2e89e422bebfaf22f63b70b81d773d32faa9.tar.xz
drakx-backup-do-not-use-463c2e89e422bebfaf22f63b70b81d773d32faa9.zip
- don't unconditionally assign lang::read to {locale} because we default to US as a country, and install_steps::selectLanguage relies on a void country to assign default country for a lang (e.g. FR for fr)
- use lang::set so that in mode 3 KDE can start in the right language
-rw-r--r--move/move.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/move/move.pm b/move/move.pm
index d6b9c4c5f..e432436fa 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -140,7 +140,9 @@ sub init {
print "Using existing host configuration\n";
$using_existing_host_config = 1;
}
- $o->{locale} = lang::read('', 0);
+ if (-s '/etc/sysconfig/i18n') {
+ lang::set($o->{locale} = lang::read('', 0));
+ }
drakx_stuff:
$o->{steps}{$_} = { reachable => 1, text => $_ }