From a7da45099f49093cc950a1392d6488543af5ddd3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 12 Nov 2014 14:42:37 -0500
Subject: [PATCH] Bug 13142 - Change "mobile phone" label back to "other phone"

Labeling a phone number field "mobile phone" eliminates the usefulness
of having the labels "primary" and "secondary." Generic labels let the
user populate the fields according to their importance rather than their
type.

To test I recommend editing a patron record so that the values in the
patron record contain a label matching the table column:

borrowers.phone : 555-555-1234 (primary - phone)
borrowers.phonepro : 555-555-5678 (secondary - phonepro)
borrowers.mobile : 555-555-9012 (other - mobile)

View this patron's information in the various affected templates and
verify that the labels correctly match the data:

 - OPAC "your personal details" (opac-memberentry.pl)
 - Submit changes to primary, secondary, and other phone via the OPAC.
   In the staff client, view the confirmation for those changes.
 - Patron details in the staff client (moremember.pl)
 - Patron entry/edit in the staff client (memberentrygen.pl)
 - Patron duplicate confirmation in the staff client
   (you can navigate directly to
   /members/moremember.pl?borrowernumber=XXXX&print=brief)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/columns.def                   | 2 +-
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/members/members-update.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def
index ec0fb56967..636811d603 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def
+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def
@@ -18,7 +18,7 @@
 <field name="borrowers.country">Country</field>
 <field name="borrowers.phone">Primary phone</field>
 <field name="borrowers.phonepro">Secondary phone</field>
-<field name="borrowers.mobile">Mobile phone</field>
+<field name="borrowers.mobile">Other phone</field>
 <field name="borrowers.email">Primary email</field>
 <field name="borrowers.emailpro">Secondary email</field>
 <field name="borrowers.fax">Fax</field>
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 8ce985e322..b10ac47586 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -594,7 +594,7 @@
       [% ELSE %]
       <label for="mobile">
       [% END %]
-      Mobile phone: </label>
+      Other phone: </label>
         <input type="text" id="mobile" name="mobile" value="[% mobile %]" />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
index 9231ef7039..5d966df603 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
@@ -28,8 +28,8 @@
 [% CASE 'zipcode'             %]<span>Zip code</span>
 [% CASE 'country'             %]<span>Country</span>
 [% CASE 'email'               %]<span>Email</span>
-[% CASE 'phone'               %]<span>Primary Phone</span>
-[% CASE 'mobile'              %]<span>Primary Mobile Phone</span>
+[% CASE 'phone'               %]<span>Primary phone</span>
+[% CASE 'mobile'              %]<span>Other phone</span>
 [% CASE 'fax'                 %]<span>Fax</span>
 [% CASE 'emailpro'            %]<span>Secondary email</span>
 [% CASE 'phonepro'            %]<span>Secondary phone</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 57e4d4927d..b46424e71a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -34,12 +34,12 @@
         [% ELSE %]
             [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
             [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]
-            [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
+            [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
         [% END %]
 
     [% IF ( P ) %]
         [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
-        [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
+        [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
     [% END %]
 	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
     [% UNLESS ( I ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 8ebd31f076..3b89653faf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -201,12 +201,12 @@ function validate1(date) {
         [% ELSE %]
             [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
             [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]
-            [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
+            [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
         [% END %]
 
     [% IF ( P ) %]
         [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
-        [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
+        [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile %]</li>[% END %]
     [% END %]   	
 	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
     [% UNLESS ( I ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index bbca649a55..5e2e7475a8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -396,7 +396,7 @@
                                     [% ELSE %]
                                         <label for="borrower_mobile">
                                     [% END %]
-                                    Mobile phone:</label>
+                                    Other phone:</label>
 
                                     <input type="text" id="borrower_mobile" name="borrower_mobile" value="[% borrower.mobile %]" />
                                     [% IF mandatory.defined('mobile') %]<span class="required">Required</span>[% END %]
-- 
2.39.5