Fix l10n support for javascript generated text

The text contained hardcoded English string (which was concealed
by the fact that Javascript was broken anyway and so the text
was never displayed). Now that I fixed the Javascript, fix
the l10n support, too.

diff --git a/static/packages.js b/static/packages.js
index 1de28bcfa323becb315beea8c277489724ebb878..172e6b404409e8ab4d3d1060e00c19584b0e1322 100644 (file)
--- a/static/packages.js
+++ b/static/packages.js
@@ -1,13 +1,14 @@
 
 

-function init_toggle_elem(id_str,user_str) {
-       toggle_toggle_elem(id_str,user_str,'hide');
+function init_toggle_elem(id_str,show_user_str,hide_user_str) {
+       toggle_toggle_elem(id_str,show_user_str,hide_user_str,'hide');

 }
 
 }
 

-function toggle_toggle_elem(id_str,user_str,mode) {
+function toggle_toggle_elem(id_str,show_user_str,hide_user_str,mode) {

        var other_mode = ( mode == "hide" ) ? "show" : "hide";
        var other_mode = ( mode == "hide" ) ? "show" : "hide";

+       var user_str = ( mode == "hide" ) ? show_user_str : hide_user_str;

        var link = document.createElement("a");
        var link = document.createElement("a");

-       link.setAttribute("href","javascript:toggle_toggle_elem(\""+id_str+"\",\""+user_str+"\",\""+other_mode+"\")");
-       var txt = document.createTextNode("["+other_mode+" "+user_str+"]");
+       link.setAttribute("href","javascript:toggle_toggle_elem(\""+id_str+"\",\""+show_user_str+"\",\""+hide_user_str+"\",\""+other_mode+"\")");
+       var txt = document.createTextNode("["+user_str+"]");

        link.appendChild(txt);
        if (document.getElementById("js_"+id_str).childNodes.length > 0) { 
                document.getElementById("js_"+id_str).replaceChild(link,document.getElementById("js_"+id_str).firstChild);
        link.appendChild(txt);
        if (document.getElementById("js_"+id_str).childNodes.length > 0) { 
                document.getElementById("js_"+id_str).replaceChild(link,document.getElementById("js_"+id_str).firstChild);


@@ -146,4 +147,4 @@ function show_all_tabs() {
        if (item) {
                item.style.fontWeight = "bold";
        }
        if (item) {
                item.style.fontWeight = "bold";
        }

-}
\ No newline at end of file
+}

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index 2cf2aeb1a249fe6d7f033b7efcc97dd92788f3aa..52e8c308e03d6bdf24127c61fe403aa9b054bb87 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -112,7 +112,7 @@
       [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]
     <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF binaries.size > 10 %]
       [%- IF real_archive %] [<strong class="pmarker">[% real_archive %]</strong>][% END %]
     <br>[% g('Binary packages:') %] <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]" class="binaries">[% FOREACH binary IN binaries.sort %]<a href="[% make_url(binary,'','source','','suite',suite,'archive',archive,'arch','','archive','') %]">[% binary %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF binaries.size > 10 %]

-       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('%u binary packages', binaries.size) %]")</script>
+       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u binary packages', binaries.size) %]","[% g('hide %u binary packages', binaries.size) %]")</script>

        [% END %]
     </li>
   [% END %]
        [% END %]
     </li>
   [% END %]

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 9ab8f48ff73fd2526d40480c15efd1e9fada4f3f..5389798b472ced60600a0a9d74d291b64d4991ca 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -256,7 +256,7 @@
          [% js_id = name %]
            <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs.sort %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF providers.pkgs.size > 10 %]
          [% js_id = name %]
            <span id="js_[% js_id %]" class="p_js_elem"></span> <span id="html_[% js_id %]">[% FOREACH provider IN providers.pkgs.sort %]<a href="[% make_url(provider,'','suite',suite,'source','') %]">[% provider %]</a>[% ', ' UNLESS loop.last %][% END %]</span>
        [% IF providers.pkgs.size > 10 %]

-       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('%u providing packages', providers.pkgs.size) %]")</script>
+       <script type="text/javascript">init_toggle_elem("[% js_id %]","[% g('show %u providing packages', providers.pkgs.size) %]", "[% g('hide %u providing packages', providers.pkgs.size) %]")</script>

        [% END %]
         [% END %]
         </dd>
        [% END %]
         [% END %]
         </dd>