Attachment 54227 Details for Bug 17082 – [SIGNED-OFF] Bug 17082: Translatability: Fix sentence splitting in member.tt

[patch] [SIGNED-OFF] Bug 17082: Translatability: Fix sentence splitting in member.tt

SIGNED-OFF-Bug-17082-Translatability-Fix-sentence-.patch (text/plain), 5.33 KB, created by Owen Leonard on 2016-08-09 16:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-08-09 16:14:49 UTC

Size: 5.33 KB

patch

obsolete

>From 74ee34fd5de5e95decc9e0d3abd128582e626e2e Mon Sep 17 00:00:00 2001
>From: Marc <veron@veron.ch>
>Date: Mon, 8 Aug 2016 17:47:31 +0200
>Subject: [PATCH] [SIGNED-OFF] Bug 17082: Translatability: Fix sentence
> splitting in member.tt
>Content-Type: text/plain; charset="utf-8"
>
>This patch fixes sentences splitting in file
>koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>
>Fix is done with a new .inc file because the code is the same as in
>koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>
>To test:
>- Carefully review code changes
>- Test on a fresh install without example data (or save database
>  and test with empty tables 'branches' and 'categories')
>- Go to Home > Patrons (members-home.pl)
>- Verify that a warnings appears aubout missing libraries and patron
>  categories
>- Try to add a new patron (memberentry.pl)
>- Verify that the same messages are triggered
>- Verify that messages disappear as appropriate as soon as a library and
>  a patron category are defined.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Note: Filed Bug 17093 for JS error on patron entry form.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc | 11 +++++++++++
> koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt   | 13 ++-----------
> .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt |  4 +---
> 3 files changed, 14 insertions(+), 14 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>new file mode 100644
>index 0000000..e0fdc2a
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/noadd-warnings.inc
>@@ -0,0 +1,11 @@
>+[% IF ( no_add ) %]
>+    <div class="dialog alert">
>+        <h3>Cannot add patron</h3>
>+        [% IF ( no_branches ) %]
>+            <p><strong>There are no libraries defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
>+        [% END %]
>+        [% IF ( no_categories ) %]
>+            <p><strong>There are no patron categories defined. </strong>[% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
>+        [% END %]
>+    </div>
>+[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>index 06fbc75..b149654 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
>@@ -334,17 +334,8 @@ function filterByFirstLetterSurname(letter) {
>           [% END %]
> 
>           [% INCLUDE 'patron-toolbar.inc' %]
>-          [% IF ( no_add ) %]
>-            <div class="dialog alert">
>-              <h3>Cannot add patron</h3>
>-              [% IF ( no_branches ) %]
>-                <p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>
>-              [% END %]
>-              [% IF ( no_categories ) %]
>-                <p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categories.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.[% END %]</p>
>-              [% END %]
>-            </div>
>-          [% END %]
>+          [% INCLUDE 'noadd-warnings.inc' %]
>+
>           <div class="browse">
>             Browse by last name:
>             [% FOREACH letter IN alphabet.split(' ') %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>index 20725bd..8e3e6f7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
>@@ -125,9 +125,7 @@ $(document).ready(function() {
>         <div class="dialog message">Email has been sent.</div>
>     [% END %]
> 
>-	[% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3>
>-            [% IF ( no_branches ) %]<p><strong>There are no libraries defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library.</a>[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
>-            [% IF ( no_categories ) %]<p><strong>There are no patron categories defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category.</a>[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
>+    [% INCLUDE 'noadd-warnings.inc' %]
> 
> 	[% UNLESS ( no_add ) %]
>     <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17082: 54174 | 54227 | 54249