From 3719d3383f10a08ee872593f94b18647ca0e5d8f Mon Sep 17 00:00:00 2001 From: Aleisha Date: Mon, 14 Dec 2015 22:43:26 +0000 Subject: [PATCH] Bug 15373: Changing Zip to ZIP on OPAC and Intranet MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Mark Tompsett NOTE: Tested together with second patch. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 3da8abcfeff331d5022ee54bbf27ecfbc4ebe18c) Signed-off-by: Julian Maurice (cherry picked from commit 6438df72872d88c263b4fa331c2d44adb0ac2fa4) Signed-off-by: Frédéric Demians --- .../prog/en/includes/member-alt-address-style-de.inc | 2 +- .../prog/en/includes/member-alt-address-style-us.inc | 2 +- .../prog/en/includes/member-alt-contact-style-de.inc | 2 +- .../prog/en/includes/member-alt-contact-style-us.inc | 2 +- .../prog/en/includes/member-main-address-style-de.inc | 2 +- .../prog/en/includes/member-main-address-style-us.inc | 2 +- .../intranet-tmpl/prog/en/modules/members/members-update.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- .../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 0e3ec32f75..3893497c02 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 %] + ZIP/Postal code: [% IF ( mandatoryB_zipcode ) %]Required[% END %] 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 34e8ccc872..e6b31ff864 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 %] + ZIP/Postal code: [% IF ( mandatoryB_zipcode ) %]Required[% END %] 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 31bc204b85..2b9fb715b9 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 %] + ZIP/Postal code: [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %] 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 ec0d83f1c5..25fd731d1a 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 %] + ZIP/Postal code: [% IF ( mandatoryaltcontactzipcode ) %]Required[% END %] 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 96dbdde9f1..9cfe1ec87f 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 %] + ZIP/Postal code: [% IF ( mandatoryzipcode ) %]Required[% END %] 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 3b9a07955b..ac0a174c30 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 %] + ZIP/Postal code: [% IF ( mandatoryzipcode ) %]Required[% END %] 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 33d3fd9da0..39173142b1 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 @@ -26,7 +26,7 @@ [% CASE 'address2' %]Address 2 [% CASE 'city' %]City [% CASE 'state' %]State -[% CASE 'zipcode' %]Zip code +[% CASE 'zipcode' %]ZIP/Postal code [% CASE 'country' %]Country [% CASE 'email' %]Email [% CASE 'phone' %]Primary phone @@ -40,7 +40,7 @@ [% CASE 'B_address2' %]Alternate address: Address 2 [% CASE 'B_city' %]Alternate address: City [% CASE 'B_state' %]Alternate address: State -[% CASE 'B_zipcode' %]Alternate address: Zip/postal code +[% CASE 'B_zipcode' %]Alternate address: ZIP/Postal code [% CASE 'B_email' %]Alternate address: Email [% CASE 'B_phone' %]Alternate address: Phone [% CASE 'contactnote' %]Alternate address: Contact note @@ -58,7 +58,7 @@ [% CASE 'altcontactaddress2' %]Alternate contact: Address 2 [% CASE 'altcontactaddress3' %]Alternate contact: City [% CASE 'altcontactstate' %]Alternate contact: State -[% CASE 'altcontactzipcode' %]Alternate contact: Zip code +[% CASE 'altcontactzipcode' %]Alternate contact: ZIP/Postal code [% CASE 'altcontactcountry' %]Alternate contact: Country [% CASE 'altcontactphone' %]Alternate contact: Phone [% CASE 'smsalertnumber' %]SMS alert number 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 d3f0fa8453..b60b75084e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -391,7 +391,7 @@ function validate1(date) {
  • Address 2: [% B_address2 %]
  • City: [% B_city %]
    • [% IF ( B_state ) %]
  • State: [% B_state %]
    • [% END %] -
  • Zip/Postal code: [% B_zipcode %]
    • +
  • ZIP/Postal code: [% B_zipcode %]
    • [% IF ( B_country ) %]
  • Country: [% B_country %]
    • [% END %] [% IF ( B_phone ) %]
  • Phone: [% B_phone %]
    • [% END %] [% IF ( B_email ) %]
  • Email: [% B_email %]
    • [% END %] @@ -410,7 +410,7 @@ function validate1(date) {
  • Address 2: [% altcontactaddress2 %]
  • City: [% altcontactaddress3 %]
    • [% IF ( altcontactstate ) %]
  • State: [% altcontactstate %]
    • [% END %] -
  • Zip/Postal code: [% altcontactzipcode %]
    • +
  • ZIP/Postal code: [% altcontactzipcode %]
    • [% IF ( altcontactcountry ) %]
  • Country: [% altcontactcountry %]
    • [% END %] [% IF ( altcontactphone ) %]
  • Phone: [% altcontactphone %]
    • [% END %] 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 de2ea69816..bb53ed4d4f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -337,7 +337,7 @@ [% ELSE %] + ZIP/Postal code: [% IF mandatory.defined('zipcode') %]Required[% END %] @@ -529,7 +529,7 @@ [% ELSE %] + ZIP/Postal code: [% IF mandatory.defined('B_zipcode') %]Required[% END %] @@ -696,7 +696,7 @@ [% ELSE %] + ZIP/Postal code: [% IF mandatory.defined('altcontactzipcode') %]Required[% END %] -- 2.39.5