summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2016-04-26 18:59:52 +0200
committerDylan William Hardison <dylan@hardison.net>2016-05-10 15:59:10 +0200
commitaf3c716b7dbe9e44719766593f6c51cf30a054e7 (patch)
tree08cacbfed0fd57fba9868fa11379df65e404b290 /template
parent516ac2aed77eb1a6f8f06320ecf502a4dd6a44ed (diff)
downloadbugzilla-af3c716b7dbe9e44719766593f6c51cf30a054e7.tar.gz
bugzilla-af3c716b7dbe9e44719766593f6c51cf30a054e7.tar.xz
Bug 1251100 - checksetup.pl no longer tells admins which modules are installed and which version is installed
Diffstat (limited to 'template')
-rw-r--r--template/en/default/global/code-error.html.tmpl3
-rw-r--r--template/en/default/global/user-error.html.tmpl6
-rw-r--r--template/en/default/setup/strings.txt.pl5
3 files changed, 6 insertions, 8 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 40abfe5c1..3f83dbb68 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -114,7 +114,8 @@
[% ELSIF error == "cookies_need_value" %]
Every cookie must have a value.
-
+ [% ELSIF error == "cpan_meta_missing" %]
+ META.json/MYMETA.json file is missing.
[% ELSIF error == "env_no_email" %]
Bugzilla did not receive an email address from the
environment.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index bdb90a2a2..dd6c71539 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -565,12 +565,10 @@
(You specified '[% name FILTER html %]'.)
[% ELSIF error == "feature_disabled" %]
- The [% install_string("feature_$feature") FILTER html %] feature is not
- available in this Bugzilla.
+ The [% feature_description(feature) FILTER html %] feature is not available in this Bugzilla.
[% IF user.in_group('admin') %]
If you would like to enable this feature, please run
- <kbd>checksetup.pl</kbd> to see how to install the necessary
- requirements for this feature.
+ <kbd>cpanm -l local --installdeps --with-feature [% feature FILTER html %] "."</kbd>
[% END %]
[% ELSIF error == "field_already_exists" %]
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 6bb4615e9..4b1bc873e 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -16,6 +16,7 @@
# Please keep the strings in alphabetical order by their name.
%strings = (
+ all_optional_features_require => 'All optional features above require the following modules to be found:',
any => 'any',
apachectl_failed => <<END,
WARNING: We could not check the configuration of Apache. This sometimes
@@ -44,9 +45,6 @@ can connect to your MySQL database and drop the bz_schema table, as a last
resort.
END
checking_for => 'Checking for',
- checking_dbd => 'Checking available perl DBD modules...',
- checking_optional => 'The following Perl modules are optional:',
- checking_modules => 'Checking perl modules...',
chmod_failed => '##path##: Failed to change permissions: ##error##',
chown_failed => '##path##: Failed to change ownership: ##error##',
commands_dbd => <<EOT,
@@ -93,6 +91,7 @@ END
file_rename => 'Renaming ##from## to ##to##...',
header => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n"
. "* Running on ##os_name## ##os_ver##",
+ installation_failed => '*** Installation aborted. Read the messages above. ***',
install_data_too_long => <<EOT,
WARNING: Some of the data in the ##table##.##column## column is longer than
its new length limit of ##max_length## characters. The data that needs to be