From 9489e02bb2ef1fb7838bb44692bb99772b6bc87e Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Date: Thu, 3 Apr 2014 15:58:08 -0300 Subject: [PATCH] Bug 11497 - i18n toolchain fails to pick up TT code in the format 'SomeVariable or "Some Text"' for translation i18n toolchain fails to pick text defined inside [% ... %] This patch fixes all the cases I could find To test: 1. Update your preferred language (cd misc/translator; perl translate update fi-FI) 2. Count headers for example egrep "^msgid.*Koha online" misc/translator/po/fi-FI-* | wc -l 3. Apply the patch 4. Repeat 1 and 2, now there are more lines Or translate to som lang and visit every touched page and look the title --- .../en/modules/admin/marc_subfields_structure.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 5 +++-- .../bootstrap/en/modules/opac-readingrecord.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-review.tt | 3 ++- .../bootstrap/en/modules/opac-tags_subject.tt | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 3 ++- .../prog/en/modules/opac-readingrecord.tt | 3 ++- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 3 ++- koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 3 ++- .../opac-tmpl/prog/en/modules/opac-tags_subject.tt | 3 ++- 12 files changed, 25 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt index 4da56af..4936041 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -167,7 +167,7 @@ function populateHiddenCheckboxes(tab) { [% INCLUDE 'cat-search.inc' %] <div id="breadcrumbs"> - <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> › <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&searchfield=[% tagfield %]">[% frameworkcode or "Default" %] framework structure</a> › + <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> › <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode %]&searchfield=[% tagfield %]">[% IF ( frameworkcode ) %][% frameworkcode %][% ELSE %]Default[% END %] framework structure</a> › [% IF ( add_form ) %] [% IF ( use_heading_flags_p ) %] [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield %]&frameworkcode=[% frameworkcode %]">Tag [% tagfield %] subfield structure</a> › Edit subfields constraints diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index c414787..9203d9e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -173,7 +173,7 @@ $(document).ready(function() { [% ELSE %] <tr> [% END %] - <td>[% lette.branchname || "(All libraries)" %]</td> + <td>[% IF ( lette.branchname ) %][% lette.branchname %][% ELSE %](All libraries)[% END %]</td> <td>[% lette.module %]</td> <td>[% lette.code %]</td> <td>[% lette.name %]</td> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt index ac7b2b2..9421fa2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( GetAvailability ) %] ILS-DI › GetAvailability [% ELSIF ( GetRecords ) %] @@ -823,4 +824,4 @@ </div> <!-- / .main --> [% INCLUDE 'opac-bottom.inc' %] -[% BLOCK jsinclude %][% END %] \ No newline at end of file +[% BLOCK jsinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 584e0e3..983dcc8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -1,7 +1,7 @@ [% USE Koha %] [% USE KohaDates %] - -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Your checkout history +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your checkout history [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a { padding:0.6em 1em; }</style> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index d42323c..f551584 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Placing a hold +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] </head> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt index f77b650..7f24db6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Comments on [% title |html %] +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title |html %] <style type="text/css"> #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } </style> diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt index a79ff9f..9333ba0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Subject cloud +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Subject cloud [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] </head> @@ -57,4 +58,5 @@ </div> <!-- / .main --> [% INCLUDE 'opac-bottom.inc' %] -[% BLOCK jsinclude %][% END %] \ No newline at end of file +[% BLOCK jsinclude %][% END %] + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt index a727b29..9eb09be 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] › ILS-DI +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › ILS-DI [% INCLUDE 'doc-head-close.inc' %] </head> <body> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 7ee7e12..3a849c9 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Your checkout history +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your checkout history [% INCLUDE 'doc-head-close.inc' %] <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a { padding:0.6em 1em; }</style> <script type="text/javascript"> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index 0932d20..9c63089 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Placing a hold +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] <script type="text/javascript"> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt index 3df04b4..2641f0f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Comments on [% title |html %] +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title |html %] <style type="text/css"> #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } </style> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt index f84bf77..ebd5149 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › ISBD +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › ISBD [% INCLUDE 'doc-head-close.inc' %] </head> <body id="opac-tags-subject"> -- 1.7.9.5