summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Install/Requirements.pm
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2010-08-11 12:20:30 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-08-11 12:20:30 +0200
commit6715b4dbad317ac79ff55c3c761cf6af58651a26 (patch)
tree0cb8529400a2c9feb8590749fbdf6a2b693c8582 /Bugzilla/Install/Requirements.pm
parentaec17c9f7769c22173d9d722250628a6aa3ffd2a (diff)
downloadbugzilla-6715b4dbad317ac79ff55c3c761cf6af58651a26.tar.gz
bugzilla-6715b4dbad317ac79ff55c3c761cf6af58651a26.tar.xz
Bug 586210: Make every important string printed by checksetup.pl localizable,
including the localconfig parameter descriptions r=mkanat, a=mkanat (module owner)
Diffstat (limited to 'Bugzilla/Install/Requirements.pm')
-rw-r--r--Bugzilla/Install/Requirements.pm17
1 files changed, 10 insertions, 7 deletions
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;
}