From 628d8391d29a59f7d6a0ecfb52081684cee81403 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Thu, 18 May 2017 20:02:33 +0200
Subject: [PATCH] Bug 18630: Translatability (Clubs): 'Cancel' is ambiguous and
 leads to mistakes

The button to cancel a club enrollement is labelled with 'Cancel'. That is ambiguous and translates e.g. in German to 'Abbrechen' which can lead to
mistakes.

To test:
- Apply patch
- Enroll a patron to a club
- Enable public enrollment in OPAC
- Verify that the button to cancel enrollment in both OPAC and staff client
  reads 'Cancel enrollement' (instead of 'Cancel' without patch)
  (The button appears on the patron's detail pages in OPAC and staff client)

Amended for comment #4 / mv

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt     | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 af078b4d36..586242299c 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
@@ -22,7 +22,7 @@
                     [% IF CAN_user_clubs_enroll %]
                         <td>
                             <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id %] )">
-                                <i class="fa fa-remove"></i> Cancel
+                                <i class="fa fa-remove"></i> Cancel enrollment
                             </button>
                         </td>
                     [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
index 1c5580a153..df0e29738f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
@@ -23,7 +23,7 @@
                     [% IF e.club.club_template.is_enrollable_from_opac %]
                         <td>
                             <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id %] )">
-                                <i class="icon-remove"></i> Cancel
+                                <i class="icon-remove"></i> Cancel enrollment
                             </button>
                         </td>
                     [% END %]
-- 
2.39.5