From 6715b4dbad317ac79ff55c3c761cf6af58651a26 Mon Sep 17 00:00:00 2001 From: Max Kanat-Alexander Date: Wed, 11 Aug 2010 03:20:30 -0700 Subject: Bug 586210: Make every important string printed by checksetup.pl localizable, including the localconfig parameter descriptions r=mkanat, a=mkanat (module owner) --- Bugzilla/Install/Requirements.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Bugzilla/Install/Requirements.pm') diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 12a9c20c5..25dc15665 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -501,16 +501,19 @@ sub _translate_feature { sub check_graphviz { my ($output) = @_; - return 1 if (Bugzilla->params->{'webdotbase'} =~ /^https?:/); + my $webdotbase = Bugzilla->params->{'webdotbase'}; + return 1 if $webdotbase =~ /^https?:/; - printf("Checking for %15s %-9s ", "GraphViz", "(any)") if $output; + my $checking_for = install_string('checking_for'); + my $any = install_string('any'); + printf("%s %15s %-9s ", $checking_for, "GraphViz", "($any)") if $output; my $return = 0; - if(-x Bugzilla->params->{'webdotbase'}) { - print "ok: found\n" if $output; + if(-x $webdotbase) { + print install_string('module_ok'), "\n" if $output; $return = 1; } else { - print "not a valid executable: " . Bugzilla->params->{'webdotbase'} . "\n"; + print install_string('bad_executable', { bin => $webdotbase }), "\n"; } my $webdotdir = bz_locations()->{'webdotdir'}; @@ -519,8 +522,8 @@ sub check_graphviz { my $htaccess = new IO::File("$webdotdir/.htaccess", 'r') || die "$webdotdir/.htaccess: " . $!; if (!grep(/png/, $htaccess->getlines)) { - print "Dependency graph images are not accessible.\n"; - print "delete $webdotdir/.htaccess and re-run checksetup.pl to fix.\n"; + print STDERR install_string('webdot_bad_htaccess', + { dir => $webdotdir }), "\n"; } $htaccess->close; } -- cgit v1.2.3-24-g4f1b