From 32c9951f36dadade8f324b9c52860eef69f2292b Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 25 Jun 2018 08:47:15 +0200 Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/modules/clubs --- .../prog/en/modules/clubs/club-enrollments.tt | 11 ++- .../prog/en/modules/clubs/clubs-add-modify.tt | 35 +++---- .../prog/en/modules/clubs/clubs.tt | 99 ++++++++++--------- .../prog/en/modules/clubs/patron-clubs-tab.tt | 23 ++--- .../prog/en/modules/clubs/patron-enroll.tt | 7 +- .../en/modules/clubs/templates-add-modify.tt | 93 ++++++++--------- 6 files changed, 137 insertions(+), 131 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index d0d7268e7e..d712b992e4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -1,10 +1,11 @@ +[% PROCESS 'i18n.inc' %] [% USE Asset %] [% USE KohaDates %] [% USE Branches %] [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › Club enrollments +[% t('Koha › Tools › Patron clubs › Club enrollments') %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] @@ -12,19 +13,19 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
-

Club enrollments for [% club.name %]

+

[% t('Club enrollments for') %] [% club.name %]

- - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt index 170a56bd30..fce81a2043 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -1,14 +1,15 @@ +[% PROCESS 'i18n.inc' %] [% USE KohaDates %] [% USE Branches %] [% USE AuthorisedValues %] [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › +<title>[% t('Koha › Tools › Patron clubs ›') %] [% IF club %] - Modify club [% club.name %] + [% t('Modify club') %] [% club.name %] [% ELSE %] - Create a new [% club_template.name %] club + [% t('Create a new') %] [% club_template.name %] [% t('club') %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -17,11 +18,11 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 895ac37746..8b96133b02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -1,10 +1,11 @@ +[% PROCESS 'i18n.inc' %] [% USE Asset %] [% USE KohaDates %] [% USE Branches %] [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs +[% t('Koha › Tools › Patron clubs') %] [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] @@ -13,38 +14,38 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
-

Patron clubs

+

[% t('Patron clubs') %]

[% IF club_template %]
[% IF stored == 'updated' %] -

Club template [% club_template.name %] was updated.

+

[% t('Club template') %] [% club_template.name %] [% t('was updated.') %]

[% ELSE %] -

Club template [% club_template.name %] was saved.

+

[% t('Club template') %] [% club_template.name %] [% t('was saved.') %]

[% END %]
[% ELSIF club %]
[% IF stored == 'updated' %] -

Club [% club.name %] was updated.

+

[% t('Club') %] [% club.name %] [% t('was updated.') %]

[% ELSE %] -

Club [% club.name %] was saved.

+

[% t('Club') %] [% club.name %] [% t('was saved.') %]

[% END %]
[% END %] -

Club templates

+

[% t('Club templates') %]

[% IF CAN_user_clubs_edit_templates %] [% END %] @@ -53,12 +54,12 @@
NameCard number[% t('Name') %][% t('Card number') %]
- - - - - - + + + + + + @@ -68,26 +69,26 @@ @@ -96,18 +97,18 @@
NameDescriptionPublic enrollmentEmail requiredLibraryActions[% t('Name') %][% t('Description') %][% t('Public enrollment') %][% t('Email required') %][% t('Library') %][% t('Actions') %]
[% t.description %] [% IF t.is_enrollable_from_opac %] - Yes + [% t('Yes') %] [% ELSE %] - No + [% t('No') %] [% END %] [% IF t.is_email_required %] - Yes + [% t('Yes') %] [% ELSE %] - No + [% t('No') %] [% END %] [% Branches.GetName( t.branchcode ) %] [% IF CAN_user_clubs_edit_templates %] - - Edit + + [% t('Edit') %] - - Delete + + [% t('Delete') %] [% END %]
[% ELSE %] -
No club templates defined.
+
[% t('No club templates defined.') %]
[% END %] -

Clubs

+

[% t('Clubs') %]

[% IF CAN_user_clubs_edit_clubs %]
[% IF club_templates %] - + [% ELSE %] - + [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt index 586242299c..2d585394a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt @@ -1,15 +1,16 @@ +[% PROCESS 'i18n.inc' %] [% USE KohaDates %] [% IF enrollments %] -

Clubs currently enrolled in

+

[% t('Clubs currently enrolled in') %]

- - - - [% IF CAN_user_clubs_enroll %][% END %] + + + + [% IF CAN_user_clubs_enroll %][% END %] @@ -22,7 +23,7 @@ [% IF CAN_user_clubs_enroll %] [% END %] @@ -34,14 +35,14 @@ [% IF clubs %] -

Clubs not enrolled in

+

[% t('Clubs not enrolled in') %]

NameDescriptionDate enrolled [% t('Name') %][% t('Description') %][% t('Date enrolled') %] 
- - - [% IF CAN_user_clubs_enroll %][% END %] + + + [% IF CAN_user_clubs_enroll %][% END %] @@ -53,7 +54,7 @@ [% IF CAN_user_clubs_enroll %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt index db3d5442e0..d2ed1635aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt @@ -1,8 +1,9 @@ +[% PROCESS 'i18n.inc' %] [% USE AuthorisedValues %] [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]

- Enroll in [% club.name %] + [% t('Enroll in') %] [% club.name %]

@@ -28,8 +29,8 @@ [% END %]
  • - Finish enrollment - Cancel + [% t('Finish enrollment') %] + [% t('Cancel') %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt index efb8ccecd6..5a3a41e6dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt @@ -1,11 +1,12 @@ +[% PROCESS 'i18n.inc' %] [% USE Branches %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › +<title>[% t('Koha › Tools › Patron clubs ›') %] [% IF club_template %] - Modify club template [% club_template.name %] + [% t('Modify club template') %] [% club_template.name %] [% ELSE %] - Create a new club template + [% t('Create a new club template') %] [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -20,11 +21,11 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -
    NameDescription [% t('Name') %][% t('Description') %]