summaryrefslogtreecommitdiffstats
path: root/perl-install/printer
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 /perl-install/printer
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
Diffstat (limited to 'perl-install/printer')
-rw-r--r--perl-install/printer/printerdrake.pm8
1 files changed, 4 insertions, 4 deletions
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";