From e5290d696f57c749937b768ac0a67baf88ed21f3 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Thu, 15 Mar 2018 12:16:22 +0000 Subject: [PATCH] Allow customizing link to bug writing guidelines This URL occurs in a number of places, so it's a good candidate for customization. --- .../en/default/bug/create/create-web-bounty.html.tmpl | 2 +- .../BMO/template/en/default/bug/create/user-message.html.tmpl | 2 +- .../BMO/template/en/default/pages/bug-writing.html.tmpl | 2 +- extensions/BMO/template/en/default/pages/etiquette.html.tmpl | 2 +- .../template/en/default/guided/guided.html.tmpl | 2 +- template/en/default/bug/create/user-message.html.tmpl | 2 +- template/en/default/bug/new_bug.html.tmpl | 2 +- template/en/default/global/variables.none.tmpl | 4 +++- template/en/default/index.html.tmpl | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl index 92517cb80a..803f2a7465 100644 --- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl @@ -88,7 +88,7 @@ function validateAndSubmit() {
- + [% terms.Bug %] writing guidelines
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl index 6ecd0bc754..d3c7412bf2 100644 --- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl @@ -17,7 +17,7 @@ [% END +%] [% UNLESS no_bug_guidelines %] Before reporting a [% terms.bug %], make sure you've read our - + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already been reported. Consult our list of most frequently reported [% terms.bugs %] and diff --git a/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl b/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl index e1c67605f1..a6b9a5f449 100644 --- a/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl +++ b/extensions/BMO/template/en/default/pages/bug-writing.html.tmpl @@ -7,5 +7,5 @@ #%] [% PROCESS global/redirect.html.tmpl - url = "https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines" + url = "[% terms.BugWritingGuidelinesURL %]" %] diff --git a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl index 45dd5bd659..fe7d2cd3db 100644 --- a/extensions/BMO/template/en/default/pages/etiquette.html.tmpl +++ b/extensions/BMO/template/en/default/pages/etiquette.html.tmpl @@ -173,7 +173,7 @@

See Also

- The [% terms.Bug %] Writing Guidelines. + The [% terms.Bug %] Writing Guidelines.

[% INCLUDE global/footer.html.tmpl %] diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl index e1a9e0bc5d..7ffa049220 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl @@ -356,7 +356,7 @@ Product: ?: diff --git a/template/en/default/bug/create/user-message.html.tmpl b/template/en/default/bug/create/user-message.html.tmpl index fa42ace818..51e7878704 100644 --- a/template/en/default/bug/create/user-message.html.tmpl +++ b/template/en/default/bug/create/user-message.html.tmpl @@ -30,7 +30,7 @@ [% PROCESS global/variables.none.tmpl %] Before reporting [% terms.abug %], please read the - + [% terms.bug %] writing guidelines, please look at the list of most frequently reported [% terms.bugs %], and please search for the [% terms.bug %]. diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index ef5e361c05..fcbe7edd41 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -27,7 +27,7 @@

Create New [% terms.Bug %]

Before reporting a [% terms.bug %], make sure you've read our - + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already been reported. Consult our list of most frequently reported [% terms.bugs %] and diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index faf1a5427b..93002efa39 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -37,7 +37,9 @@ "bugs" => "bugs", "Bugs" => "Bugs", "zeroSearchResults" => "Zarro Boogs found", - "Bugzilla" => "Bugzilla" + "Bugzilla" => "Bugzilla", + + "BugWritingGuidelinesURL" => "https://developer.mozilla.org/docs/Mozilla/QA/Bug_writing_guidelines", } %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 3c42ce71ef..14cdb599a2 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -75,7 +75,7 @@ [%- terms.Bugzilla %] Etiquette

  • - | [%- terms.Bug %] Writing Guidelines + | [%- terms.Bug %] Writing Guidelines
    • [% Hook.process('additional_links') %]