summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-02-18 23:35:12 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-02-18 23:35:12 +0000
commit245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537 (patch)
treebcd266b2f7cf1c60250decf23319c5d0e8dd45ee
parentc9dff4eee3fd1f35b48336efab7823d84db747da (diff)
downloaddrakx-backup-do-not-use-245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537.tar
drakx-backup-do-not-use-245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537.tar.gz
drakx-backup-do-not-use-245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537.tar.bz2
drakx-backup-do-not-use-245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537.tar.xz
drakx-backup-do-not-use-245eaaf2799f5ad36cde57d4b5ce3eb9bf2a6537.zip
Show description of the printer when an unknown printer is found during automatic queue setup an it is asked for the model.
-rw-r--r--perl-install/printer/printerdrake.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 3cf29d2e2..0913bde7f 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -696,6 +696,10 @@ sub configure_new_printers {
$printer->{OLD_CHOICE} = "XXX";
# Set model selection cursor onto the "Raw Printer" entry.
$printer->{DBENTRY} = N("Raw printer (No driver)");
+ # Info about what was detected
+ my $info = N("(") . if_($p->{val}{DESCRIPTION},
+ $p->{val}{DESCRIPTION} . N(" on ")).
+ $p->{port} . N(")");
# Remove wait message
undef $_w;
# Choose the printer/driver from the list
@@ -704,7 +708,7 @@ sub configure_new_printers {
N("Which printer model do you have?") .
N("
-Printerdrake could not determine which model your printer is. Please choose the correct model from the list.") . " " .
+Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list.", $info) . " " .
N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|',
[ keys %printer::main::thedb ], $printer->{DBENTRY}) or next;
# Rename the queue according to the chosen model