diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-02-19 15:07:49 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-02-19 15:07:49 +0000 |
| commit | 98518a99f4b8b2d68a2366f88595f35ecf6dfe89 (patch) | |
| tree | 3809e25d34859780e793dada3e0168ae2276b53f | |
| parent | 122989baf6be4e022a846c16864ced049759012d (diff) | |
| download | drakx-98518a99f4b8b2d68a2366f88595f35ecf6dfe89.tar drakx-98518a99f4b8b2d68a2366f88595f35ecf6dfe89.tar.gz drakx-98518a99f4b8b2d68a2366f88595f35ecf6dfe89.tar.bz2 drakx-98518a99f4b8b2d68a2366f88595f35ecf6dfe89.tar.xz drakx-98518a99f4b8b2d68a2366f88595f35ecf6dfe89.zip | |
Replaced "a4" and "letter" by "A4" and "Letter" so that Foomatic recognizes
the paper sizes.
Also use "Letter" paper for "en_CA" and "fr_CA" locales.
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1b832bca1..3f4831ed4 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1059,7 +1059,9 @@ sub configurePrinter { my $printer = $o->{printer} ||= {}; eval { add2hash($printer, printer::getinfo($o->{prefix})) }; - $printer->{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4'; + $printer->{PAPERSIZE} = (($o->{lang} =~ /^en_US/) || + ($o->{lang} =~ /^en_CA/) || + ($o->{lang} =~ /^fr_CA/)) ? 'Letter' : 'A4'; printerdrake::main($printer, $o, $ask_multiple_printer, sub { install_interactive::upNetwork($o, 'pppAvoided') }); } |