Bug 182975: Bugzilla directory structure to be adopted to l10n needs - Patch by A.A. Shimono (himorin) <shimono@mozilla.gr.jp> r=LpSolit r=mkanat a=LpSolit

6 files changed, 17 insertions, 15 deletions

diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index ab914d771..8544e2ff7 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -35,7 +35,9 @@
                   "$terms.Bugzilla documentation URLs. " _
                   "It may be an absolute URL, or a URL relative to urlbase " _
                   "above. " _
-                  "Leave this empty to suppress links to the documentation.",
+                  "Leave this empty to suppress links to the documentation." _
+                  "'%lang%' will be replaced by user's preferred language " _
+                  "(if available)."
 
   sslbase => "The URL that is the common initial leading part of all HTTPS " _
              "(SSL) $terms.Bugzilla URLs.",
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index db913d9a1..bfd18af4d 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -122,7 +122,7 @@
     [% IF doc_section %]
       <li>
         <span class="separator">| </span>
-        <a href="[% Param("docs_urlbase") _ doc_section FILTER html %]" target="_blank">Help</a>
+        <a href="[% docs_urlbase _ doc_section FILTER html %]" target="_blank">Help</a>
       </li>
     [% END %]
 [% END %]
diff --git a/template/en/default/global/docslinks.html.tmpl b/template/en/default/global/docslinks.html.tmpl
index 7c4e7aba5..712dfb45b 100644
--- a/template/en/default/global/docslinks.html.tmpl
+++ b/template/en/default/global/docslinks.html.tmpl
@@ -45,7 +45,7 @@
 [% BLOCK docslinkslist %]
   [% FOREACH docslink = docstype.keys %]
     <li>
-      <a href="[% Param('docs_urlbase') %]
+      <a href="[% docs_urlbase FILTER html %]
                [% docslink FILTER none %]">[% docstype.$docslink FILTER html %]</a>
     </li>
   [% END %]
diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl
index 6a9f7db0d..c2fc3983d 100644
--- a/template/en/default/global/per-bug-queries.html.tmpl
+++ b/template/en/default/global/per-bug-queries.html.tmpl
@@ -71,7 +71,7 @@
         </select>
 
         [% IF Param('docs_urlbase') %]
-          <a href="[% Param('docs_urlbase') %]query.html#individual-buglists">the named tag</a>
+          <a href="[% docs_urlbase FILTER html %]query.html#individual-buglists">the named tag</a>
         [% ELSE %]
           the named tag
         [% END %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 08ac4f166..9e0ec8aed 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -106,7 +106,7 @@ function addSidebar() {
     of [% terms.Bugzilla %], see the 
     <a href="page.cgi?id=release-notes.html">release notes</a>!
     You may also want to read the 
-    <a href="[% Param('docs_urlbase') FILTER html %]using.html">
+    <a href="[% docs_urlbase FILTER html %]using.html">
     [%- terms.Bugzilla %] User's Guide</a> to find out more about 
     [%+ terms.Bugzilla %] and how to use it.</p>
 
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index d6ed45fc5..3964dea61 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -353,14 +353,14 @@
   to the <kbd>xmlrpc.cgi</kbd> on your installation.</p>
 
 <p>Documentation can be found in the 
-  <a href="[% Param('docs_urlbase') FILTER html %]api/">[% terms.Bugzilla %] 
+  <a href="[% docs_urlbase FILTER html %]api/">[% terms.Bugzilla %] 
   API Docs</a>, in the various <kbd>Bugzilla::WebService</kbd> modules.</p>
 
 <h3><a name="v30_feat_skin"></a>Skins</h3>
 
 <p>[% terms.Bugzilla %] can have multiple &quot;skins&quot; installed,
   and users can pick between them. To write a skin, you just have to
-  write several CSS files. See the <a href="[% Param('docs_urlbase') FILTER html %]cust-skins.html">Custom
+  write several CSS files. See the <a href="[% docs_urlbase FILTER html %]cust-skins.html">Custom
   Skins Documentation</a> for more details.</p>
 
 <p>We currently don't have any alternate skins shipping with
@@ -414,7 +414,7 @@
   unsupported add-on, but it is now an official interface to
   [%+ terms.Bugzilla %].</p>
 
-<p>For more details see the <a href="[% Param('docs_urlbase') FILTER html %]api/email_in.html">documentation
+<p>For more details see the <a href="[% docs_urlbase FILTER html %]api/email_in.html">documentation
   for email_in.pl</a>.</p>
 
 <h3><a name="v30_feat_gw"></a>Users Who Get All [% terms.Bug %] 
@@ -687,7 +687,7 @@
      <kbd>localconfig</kbd> file to the new installation.</p></li>
 
   <li>Now follow the standard 
-    <a href="[% Param('docs_urlbase') FILTER html %]installing-bugzilla.html">
+    <a href="[% docs_urlbase FILTER html %]installing-bugzilla.html">
     [%- terms.Bugzilla %] installation process</a>.</li>
 
   <li>Run <kbd>checksetup.pl</kbd> after you install the new version.</li>
@@ -739,7 +739,7 @@
 
 <p>[% terms.Bugzilla %] now supports a code hook mechanism. See the 
   documentation for 
-  <a href="[% Param('docs_urlbase') FILTER html %]api/Bugzilla/Hook.html">Bugzilla::Hook</a>
+  <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Hook.html">Bugzilla::Hook</a>
   for more details.</p>
 
 <p>This gives [% terms.Bugzilla %] very advanced plugin support. You can
@@ -756,7 +756,7 @@
 
 <p>[% terms.Bugzilla %] now ships with all of its perldoc built
   as HTML. Go ahead and read the
-  <a href="[% Param('docs_urlbase') FILTER html %]api/">API Documentation</a>
+  <a href="[% docs_urlbase FILTER html %]api/">API Documentation</a>
   for all of the [% terms.Bugzilla %] modules now! Even scripts like
   <kbd>checksetup.pl</kbd> have HTML documentation.</p>
 
@@ -799,7 +799,7 @@ sub y { $var++ }</pre>
 <p>The <kbd>Bugzilla::Auth</kbd> family of modules have been completely
   re-written. For details on how the new structure of authentication,
   read the 
-  <a href="[% Param('docs_urlbase') FILTER html %]api/Bugzilla/Auth.html">Bugzilla::Auth
+  <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Auth.html">Bugzilla::Auth
   API docs</a>.</p>
 
 <p>It should be very easy to write new authentication plugins, now.</p>
@@ -807,7 +807,7 @@ sub y { $var++ }</pre>
 <h3><a name="v30_code_obj"></a>Bugzilla::Object</h3>
 
 <p>There is a new base class for most of our objects, 
-  <a href="[% Param('docs_urlbase') FILTER html %]api/Bugzilla/Object.html">Bugzilla::Object</a>.
+  <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Object.html">Bugzilla::Object</a>.
   It makes it really easy to create new objects based on things that are 
   in the database.</p>
 
@@ -832,7 +832,7 @@ sub y { $var++ }</pre>
   <li><code>checksetup.pl</code> has been completely re-written, and most
     of its code moved into modules in the <kbd>Bugzilla::Install</kbd>
     namespace. See the
-    <a href="[% Param('docs_urlbase') FILTER html %]api/checksetup.html">checksetup
+    <a href="[% docs_urlbase FILTER html %]api/checksetup.html">checksetup
     documentation</a> and <a href="https://bugzilla.mozilla.org/showdependencytree.cgi?id=277502&amp;hide_resolved=0">[% terms.Bugzilla %]
    [%+ terms.bug %] 277502</a> for details.</li>
   <li>Instead of <kbd>UserInGroup()</kbd>, all of [% terms.Bugzilla %] now 
@@ -866,7 +866,7 @@ sub y { $var++ }</pre>
 
 <p>Release notes for versions of [% terms.Bugzilla %] for versions
   prior to 3.0 are only available in text format: 
-  <a href="docs/rel_notes.txt">Release Notes for [% terms.Bugzilla %] 2.22
+  <a href="[% docs_urlbase FILTER remove('html/$') FILTER html %]rel_notes.txt">Release Notes for [% terms.Bugzilla %] 2.22
   and Earlier</a>.</p>
 
 [% INCLUDE global/footer.html.tmpl %]