From 9d1bcae895166d0ed1c6e7c52e0a1e0a4defe439 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 25 Jun 2018 08:51:28 +0200 Subject: [PATCH] Bug 20988: koha-tmpl/opac-tmpl/bootstrap/en/includes --- .../includes/authorities-search-results.inc | 27 +- .../en/includes/av-build-dropbox.inc | 2 +- .../bootstrap/en/includes/date-format.inc | 3 +- .../bootstrap/en/includes/doc-head-close.inc | 3 +- .../bootstrap/en/includes/item-status.inc | 29 +- .../en/includes/masthead-langmenu.inc | 11 +- .../bootstrap/en/includes/masthead-sco.inc | 3 +- .../bootstrap/en/includes/masthead.inc | 137 ++++---- .../en/includes/opac-authorities.inc | 27 +- .../bootstrap/en/includes/opac-bottom.inc | 9 +- .../en/includes/opac-detail-sidebar.inc | 61 ++-- .../bootstrap/en/includes/opac-facets.inc | 41 +-- .../bootstrap/en/includes/opac-note.inc | 5 +- .../bootstrap/en/includes/opac-topissues.inc | 49 +-- .../en/includes/openlibrary-readapi.inc | 3 +- .../en/includes/overdrive-checkout.inc | 7 +- .../bootstrap/en/includes/page-numbers.inc | 11 +- .../bootstrap/en/includes/resort_form.inc | 61 ++-- .../bootstrap/en/includes/search/facets.inc | 11 +- .../en/includes/search/page-numbers.inc | 7 +- .../en/includes/search/resort_form.inc | 17 +- .../bootstrap/en/includes/shelfbrowser.inc | 31 +- .../en/includes/subtypes_unimarc.inc | 317 +++++++++--------- .../bootstrap/en/includes/usermenu.inc | 31 +- 24 files changed, 463 insertions(+), 440 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc index 8934ccafd5..ce870f0916 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [% BLOCK showreference %] [%# Parameters: %] [%# heading: the heading itself %] @@ -10,13 +11,13 @@ [% IF marcflavour == 'UNIMARC' %] [% SWITCH type %] [% CASE 'broader' %] - BT: [% heading | html %] + [% t('BT') %]: [% heading | html %] [% CASE 'narrower' %] - NT: [% heading | html %] + [% t('NT') %]: [% heading | html %] [% CASE 'seefrom' %] - UF: [% heading | html %] + [% t('UF') %]: [% heading | html %] [% CASE 'seealso' %] - RT: [% heading | html %] + [% t('RT') %]: [% heading | html %] [% END %] [% ELSE %] @@ -33,13 +34,13 @@ [% UNLESS ( type=='seefrom' || type=='seealso' ) %] [% SWITCH type %] - [% CASE 'earlier' %](Earlier heading) - [% CASE 'later' %](Later heading) - [% CASE 'acronym' %](Acronym) - [% CASE 'musical' %](Musical composition) - [% CASE 'broader' %](Broader heading) - [% CASE 'narrower' %](Narrower heading) - [% CASE 'parent' %](Immediate parent body) + [% CASE 'earlier' %][% t('(Earlier heading)') %] + [% CASE 'later' %][% t('(Later heading)') %] + [% CASE 'acronym' %][% t('(Acronym)') %] + [% CASE 'musical' %][% t('(Musical composition)') %] + [% CASE 'broader' %][% t('(Broader heading)') %] + [% CASE 'narrower' %][% t('(Narrower heading)') %] + [% CASE 'parent' %][% t('(Immediate parent body)') %] [% CASE %] [% IF type %]([% type | html %])[% END %] [% END %] @@ -89,7 +90,7 @@ [% END %] [% ELSE %] [% IF ( summary.seefrom.size >= 1 ) %] - used for/see from: + [% t('used for/see from:') %] [% FOREACH seefro IN summary.seefrom %]
[%# Following on one line for translatability %] @@ -98,7 +99,7 @@ [% END %] [% END %] [% IF ( summary.seealso.size >= 1 ) %] - see also: + [% t('see also:') %] [% FOREACH seeals IN summary.seealso %]
[%# Following on one line for translatability %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc index 917406b9a3..b6999b5235 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc @@ -10,7 +10,7 @@ [% DEFAULT class = '' size = 20 %] [% IF avs %] - [% FOR av IN avs %] [% IF av.authorised_value == default %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc index f651b74eb0..7de1055a49 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/date-format.inc @@ -1 +1,2 @@ -[% IF ( dateformat == "us" ) %](MM/DD/YYYY)[% ELSIF ( dateformat == "metric" ) %](DD/MM/YYYY)[% ELSE %](YYYY-MM-DD)[% END %] +[% PROCESS 'i18n.inc' %] +[% IF ( dateformat == "us" ) %][% t('(MM/DD/YYYY)') %][% ELSIF ( dateformat == "metric" ) %][% t('(DD/MM/YYYY)') %][% ELSE %][% t('(YYYY-MM-DD)') %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index 740d19770d..0eb29866a7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [%- USE KohaPlugins -%] [% USE Asset %] @@ -43,7 +44,7 @@ [% END %] [% END %] - + [% PROCESS cssinclude %]
-

Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.

+

[% t('Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.') %]

[% ELSE %] -

Shibboleth login

-

If you have a Shibboleth account, please click here to login.

-

Local Login

+

[% t('Shibboleth login') %]

+

[% t('If you have a Shibboleth account, please') %] [% t('click here to login') %].

+

[% t('Local Login') %]

[% END %] [% END %]
- - + + [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
[% Koha.Preference( 'OpacLoginInstructions' ) %] @@ -325,19 +326,19 @@ [% END %] [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %] [% END %] [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
-

Don't have an account? Register here.

+

[% t('Don\'t have an account?') %] [% t('Register here.') %]

[% END %]
- +
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc index aed68e500a..fc64594a90 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [% BLOCK showhierarchy %] [% FOREACH tree IN trees %] [% PROCESS showtree tree = tree %] @@ -11,7 +12,7 @@ [% IF ( node.current_value ) %] [% node.value | html %] [% ELSE %] - [% node.value | html %] + [% node.value | html %] [% END %] [% IF ( node.children && node.children.size > 0 ) %] [% PROCESS showtree tree = node.children %] @@ -24,12 +25,12 @@ [% BLOCK authtypelabel %] [% UNLESS ( type=='seefrom' || type=='seealso' || type=='' ) %] [% FILTER trim %][% SWITCH type %] - [% CASE 'earlier' %]Earlier heading - [% CASE 'later' %]Later heading - [% CASE 'acronym' %]Acronym - [% CASE 'musical' %]Musical composition - [% CASE 'broader' %]Broader heading - [% CASE 'narrower' %]Narrower heading + [% CASE 'earlier' %][% t('Earlier heading') %] + [% CASE 'later' %][% t('Later heading') %] + [% CASE 'acronym' %][% t('Acronym') %] + [% CASE 'musical' %][% t('Musical composition') %] + [% CASE 'broader' %][% t('Broader heading') %] + [% CASE 'narrower' %][% t('Narrower heading') %] [% CASE %][% type %] [% END %][% END %] [% END %] @@ -53,18 +54,18 @@ [% BLOCK authheadingdisplay %] [% IF authid %][% heading %] - [% ELSIF search %][% heading %] + [% ELSIF search %][% heading %] [% ELSE %][% heading %] [% END %] [% END %] [% BLOCK language %] [% SWITCH lang %] - [% CASE ['en', 'eng'] %]English - [% CASE ['fr', 'fre'] %]French - [% CASE ['it', 'ita'] %]Italian - [% CASE ['de', 'ger', 'deu'] %]German - [% CASE ['es', 'spa'] %]Spanish + [% CASE ['en', 'eng'] %][% t('English') %] + [% CASE ['fr', 'fre'] %][% t('French') %] + [% CASE ['it', 'ita'] %][% t('Italian') %] + [% CASE ['de', 'ger', 'deu'] %][% t('German') %] + [% CASE ['es', 'spa'] %][% t('Spanish') %] [% CASE %][% lang %] [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 763d090dad..9d5f6bb1d7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -1,3 +1,4 @@ +[% PROCESS 'i18n.inc' %] [%- USE KohaPlugins -%] [% USE Asset %] [% UNLESS ( is_popup ) %] @@ -19,11 +20,11 @@
-

Powered by +

[% t('Powered by') %] [% IF template.name.match('opac-main.tt') %] - Koha + [% t('Koha') %] [% ELSE %] - Koha + [% t('Koha') %] [% END %]

@@ -39,7 +40,7 @@