From 98518a99f4b8b2d68a2366f88595f35ecf6dfe89 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Tue, 19 Feb 2002 15:07:49 +0000
Subject: 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.

---
 perl-install/install_steps_interactive.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps_interactive.pm')

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') });
 
 }
-- 
cgit v1.2.1