Bugzilla – Attachment 46068 Details for
Bug 15373
Zip should be ZIP
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15373: Changing Zip to ZIP on OPAC and Intranet
Bug-15373-Changing-Zip-to-ZIP-on-OPAC-and-Intranet.patch (text/plain), 11.95 KB, created by
Jonathan Druart
on 2015-12-30 11:18:02 UTC
(
hide
)
Description:
Bug 15373: Changing Zip to ZIP on OPAC and Intranet
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-12-30 11:18:02 UTC
Size:
11.95 KB
patch
obsolete
>From 8540d01b5cead36aad367b46cccee1e6b78d3f0c Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Mon, 14 Dec 2015 22:43:26 +0000 >Subject: [PATCH] Bug 15373: Changing Zip to ZIP on OPAC and Intranet > >To test: > >1) Login to OPAC --> You personal details. >2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact >3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details. >4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact >5) Click Edit >6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact > >Signed-off-by: Barry Cannon <bc@interleaf.ie> >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >NOTE: Tested together with second patch. > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc | 2 +- > .../intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc | 2 +- > .../intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc | 2 +- > .../intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc | 2 +- > .../intranet-tmpl/prog/en/includes/member-main-address-style-de.inc | 2 +- > .../intranet-tmpl/prog/en/includes/member-main-address-style-us.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 6 +++--- > 9 files changed, 14 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc >index 0e3ec32..3893497 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc >@@ -31,7 +31,7 @@ > [% ELSE %] > <label for="B_zipcode"> > [% END %] >- Zip/Postal code: </label> >+ ZIP/Postal code: </label> > <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" /> > [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc >index 34e8ccc..e6b31ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc >@@ -55,7 +55,7 @@ > [% ELSE %] > <label for="B_zipcode"> > [% END %] >- Zip/Postal code: </label> >+ ZIP/Postal code: </label> > <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" /> > [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc >index 31bc204..2b9fb71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc >@@ -55,7 +55,7 @@ > [% ELSE %] > <label for="altcontactzipcode"> > [% END %] >- Zip/Postal code:</label> >+ ZIP/Postal code:</label> > <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" /> > [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc >index ec0d83f..25fd731 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc >@@ -79,7 +79,7 @@ > [% ELSE %] > <label for="altcontactzipcode"> > [% END %] >- Zip/Postal code:</label> >+ ZIP/Postal code:</label> > <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" /> > [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc >index 96dbdde..9cfe1ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc >@@ -66,7 +66,7 @@ > [% ELSE %] > <label for="zipcode"> > [% END %] >- Zip/Postal code: </label> >+ ZIP/Postal code: </label> > <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" /> > [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %] > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc >index 3b9a079..ac0a174 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc >@@ -103,7 +103,7 @@ > [% ELSE %] > <label for="zipcode"> > [% END %] >- Zip/Postal code: </label> >+ ZIP/Postal code: </label> > <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" /> > [% IF ( mandatoryzipcode ) %]<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 1855e21..beef7d0 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 >@@ -27,7 +27,7 @@ > [% CASE 'address2' %]<span>Address 2</span> > [% CASE 'city' %]<span>City</span> > [% CASE 'state' %]<span>State</span> >-[% CASE 'zipcode' %]<span>Zip code</span> >+[% CASE 'zipcode' %]<span>ZIP/Postal code</span> > [% CASE 'country' %]<span>Country</span> > [% CASE 'email' %]<span>Email</span> > [% CASE 'phone' %]<span>Primary phone</span> >@@ -41,7 +41,7 @@ > [% CASE 'B_address2' %]<span>Alternate address: Address 2</span> > [% CASE 'B_city' %]<span>Alternate address: City</span> > [% CASE 'B_state' %]<span>Alternate address: State</span> >-[% CASE 'B_zipcode' %]<span>Alternate address: Zip/postal code</span> >+[% CASE 'B_zipcode' %]<span>Alternate address: ZIP/Postal code</span> > [% CASE 'B_email' %]<span>Alternate address: Email</span> > [% CASE 'B_phone' %]<span>Alternate address: Phone</span> > [% CASE 'contactnote' %]<span>Alternate address: Contact note</span> >@@ -57,7 +57,7 @@ > [% CASE 'altcontactaddress2' %]<span>Alternate contact: Address 2</span> > [% CASE 'altcontactaddress3' %]<span>Alternate contact: City</span> > [% CASE 'altcontactstate' %]<span>Alternate contact: State</span> >-[% CASE 'altcontactzipcode' %]<span>Alternate contact: Zip code</span> >+[% CASE 'altcontactzipcode' %]<span>Alternate contact: ZIP/Postal code</span> > [% CASE 'altcontactcountry' %]<span>Alternate contact: Country</span> > [% CASE 'altcontactphone' %]<span>Alternate contact: Phone</span> > [% CASE 'smsalertnumber' %]<span>SMS alert number</span> >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 802e35e..802eeaf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -388,7 +388,7 @@ function validate1(date) { > <li><span class="label">Address 2: </span>[% B_address2 %]</li> > <li><span class="label">City: </span>[% B_city %]</li> > [% IF ( B_state ) %]<li><span class="label">State: </span>[% B_state %]</li>[% END %] >- <li><span class="label">Zip/Postal code: </span>[% B_zipcode %]</li> >+ <li><span class="label">ZIP/Postal code: </span>[% B_zipcode %]</li> > [% IF ( B_country ) %]<li><span class="label">Country: </span>[% B_country %]</li>[% END %] > [% IF ( B_phone ) %]<li><span class="label">Phone: </span>[% B_phone %]</li>[% END %] > [% IF ( B_email ) %]<li><span class="label">Email: </span><a href="mailto:[% B_email %]">[% B_email %]</a></li>[% END %] >@@ -407,7 +407,7 @@ function validate1(date) { > <li><span class="label">Address 2: </span>[% altcontactaddress2 %]</li> > <li><span class="label">City: </span>[% altcontactaddress3 %]</li> > [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate %]</li>[% END %] >- <li><span class="label">Zip/Postal code: </span>[% altcontactzipcode %]</li> >+ <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode %]</li> > [% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry %]</li>[% END %] > [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span>[% altcontactphone %]</li>[% END %] > </ol></div> >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 ca35988..6a894ab 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -353,7 +353,7 @@ > [% ELSE %] > <label for="borrower_zipcode"> > [% END %] >- Zip/Postal code:</label> >+ ZIP/Postal code:</label> > > <input type="text" id="borrower_zipcode" name="borrower_zipcode" value="[% borrower.zipcode %]" /> > [% IF mandatory.defined('zipcode') %]<span class="required">Required</span>[% END %] >@@ -545,7 +545,7 @@ > [% ELSE %] > <label for="borrower_B_zipcode"> > [% END %] >- Zip/Postal code:</label> >+ ZIP/Postal code:</label> > > <input type="text" id="borrower_B_zipcode" name="borrower_B_zipcode" value="[% borrower.B_zipcode %]" /> > [% IF mandatory.defined('B_zipcode') %]<span class="required">Required</span>[% END %] >@@ -712,7 +712,7 @@ > [% ELSE %] > <label for="borrower_altcontactzipcode"> > [% END %] >- Zip/Postal code:</label> >+ ZIP/Postal code:</label> > > <input type="text" id="borrower_altcontactzipcode" name="borrower_altcontactzipcode" value="[% borrower.altcontactzipcode %]" /> > [% IF mandatory.defined('altcontactzipcode') %]<span class="required">Required</span>[% END %] >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15373
:
45679
|
45727
|
45872
|
46045
|
46046
| 46068 |
46069