summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-02-28 01:56:13 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-02-28 01:56:13 +0000
commit558c2f8009b6ae2a8082b67a6474de38d866bb57 (patch)
treee8308d62812d22e52bc739a72e188d3d76a2855c
parent070ca629ce0af4283c40aac76e9afc915ced169a (diff)
downloaddrakx-558c2f8009b6ae2a8082b67a6474de38d866bb57.tar
drakx-558c2f8009b6ae2a8082b67a6474de38d866bb57.tar.gz
drakx-558c2f8009b6ae2a8082b67a6474de38d866bb57.tar.bz2
drakx-558c2f8009b6ae2a8082b67a6474de38d866bb57.tar.xz
drakx-558c2f8009b6ae2a8082b67a6474de38d866bb57.zip
- Let country and not language decide about default paper size
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/printer/printerdrake.pm8
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 13cc0a5f2..293b5e8e3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1172,7 +1172,7 @@ sub configurePrinter {
my $printer = $o->{printer} ||= {};
eval { add2hash($printer, printer::main::getinfo($o->{prefix})) };
- $printer->{PAPERSIZE} = $o->{locale}{lang} eq 'en_US' || $o->{locale}{country} eq 'CA' ? 'Letter' : 'A4';
+ $printer->{PAPERSIZE} = $o->{locale}{country} eq 'US' || $o->{locale}{country} eq 'CA' ? 'Letter' : 'A4';
printer::printerdrake::main($printer, $o->{security}, $o, $clicked, sub { install_interactive::upNetwork($o, 'pppAvoided') });
}
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index d9e1183ae..5bbcaa4b3 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -3057,14 +3057,14 @@ sub get_printer_info {
if ($printer->{PAPERSIZE}) {
$printer->{SPECIAL_OPTIONS} .=
" -o PageSize=$printer->{PAPERSIZE}";
- } elsif (($pagesize = $in->{lang}) ||
+ } elsif (($pagesize = $in->{locale}{country}) ||
($pagesize = $ENV{LC_PAPER}) ||
+ ($pagesize = $in->{locale}{lang}) ||
($pagesize = $ENV{LANG}) ||
($pagesize = $ENV{LANGUAGE}) ||
($pagesize = $ENV{LC_ALL})) {
- if ($pagesize =~ /^en_CA/ ||
- $pagesize =~ /^fr_CA/ ||
- $pagesize =~ /^en_US/) {
+ if ($pagesize =~ /US/ ||
+ $pagesize =~ /CA/) {
$pagesize = "Letter";
} else {
$pagesize = "A4";