Bugzilla – Attachment 45872 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: More changes of Zip to ZIP on intranet
Bug-15373-More-changes-of-Zip-to-ZIP-on-intranet.patch (text/plain), 10.05 KB, created by
Aleisha Amohia
on 2015-12-20 20:07:41 UTC
(
hide
)
Description:
Bug 15373: More changes of Zip to ZIP on intranet
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2015-12-20 20:07:41 UTC
Size:
10.05 KB
patch
obsolete
>From df40d8492684f677ca8d5da81fa493c3c2c95b8d Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Sun, 20 Dec 2015 19:57:54 +0000 >Subject: [PATCH] Bug 15373: More changes of Zip to ZIP on intranet > >To test: > >- Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form. >- Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form >- Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]' >- Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title >- Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit >--- > koha-tmpl/intranet-tmpl/prog/en/columns.def | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +++--- > .../prog/en/modules/admin/preferences/i18n_l10n.pref | 4 ++-- > .../intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt | 4 ++-- > reports/borrowers_stats.pl | 2 +- > 7 files changed, 13 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def >index 7389176..c80975a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def >+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def >@@ -14,7 +14,7 @@ > <field name="borrowers.address2">Address 2</field> > <field name="borrowers.city">City</field> > <field name="borrowers.state">State</field> >-<field name="borrowers.zipcode">Zip/postal code</field> >+<field name="borrowers.zipcode">ZIP/Postal code</field> > <field name="borrowers.country">Country</field> > <field name="borrowers.phone">Primary phone</field> > <field name="borrowers.phonepro">Secondary phone</field> >@@ -28,7 +28,7 @@ > <field name="borrowers.B_address2">Alternate address: Address 2</field> > <field name="borrowers.B_city">Alternate address: City</field> > <field name="borrowers.B_state">Alternate address: State</field> >-<field name="borrowers.B_zipcode">Alternate address: Zip/postal code</field> >+<field name="borrowers.B_zipcode">Alternate address: ZIP/Postal code</field> > <field name="borrowers.B_country">Alternate address: Country</field> > <field name="borrowers.B_phone">Alternate address: Phone</field> > <field name="borrowers.B_email">Alternate address: Email</field> >@@ -42,7 +42,7 @@ > <field name="borrowers.contactfirstname">Alternate contact: First name</field> > <field name="borrowers.contacttitle">Alternate contact: Title</field> > <field name="borrowers.altcontactstate">Alternate contact: State</field> >-<field name="borrowers.altcontactzipcode">Alternate contact: Zip/postal code</field> >+<field name="borrowers.altcontactzipcode">Alternate contact: ZIP/Postal code</field> > <field name="borrowers.altcontactcountry">Alternate contact: Country</field> > <field name="borrowers.altcontactphone">Alternate contact: Phone</field> > <field name="borrowers.cardnumber">Card number</field> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 0b106d3..29b54b9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -133,7 +133,7 @@ tinyMCE.init({ > <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% branchaddress3 |html %]" /></li> > <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% branchcity |html %]" /></li> > <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% branchstate |html %]" /></li> >- <li><label for="branchzip">Zip/Postal code: </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% branchzip |html %]" /></li> >+ <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% branchzip |html %]" /></li> > <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% branchcountry |html %]" /></li> > <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li> > <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >index 9e4553b..7143661 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -87,7 +87,7 @@ > <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" /> > </li> > <li> >- <label for="city_zipcode" class="required">Zip/Postal code: </label> >+ <label for="city_zipcode" class="required">ZIP/Postal code: </label> > <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">Required</span> > </li> > <li> >@@ -117,7 +117,7 @@ > <tr><th>State</th> > <td>[% city.city_state %]</td> > </tr> >- <tr><th>Zip/Postal code</th> >+ <tr><th>ZIP/Postal code</th> > <td>[% city.city_zipcode %]</td> > </tr> > <tr><th>Country</th> >@@ -152,7 +152,7 @@ > <th>City ID</th> > <th>City</th> > <th>State</th> >- <th>Zip/Postal code</th> >+ <th>ZIP/Postal code</th> > <th>Country</th> > <th> </th> > <th> </th> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >index 89e4436..6f7e60a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >@@ -56,5 +56,5 @@ I18N/L10N: > - pref: AddressFormat > default: us > choices: >- us: US style ([Street number], [Address] - [City], [Zip/Postal Code], [Country]) >- de: German style ([Address] [Street number] - [Zip/Postal Code] [City] - [Country]) >+ us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country]) >+ de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country]) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >index 200ce24..3c5397c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt >@@ -104,7 +104,7 @@ > </tr> > > <tr> >- <td rowspan="2">Zip code</td> >+ <td rowspan="2">ZIP/Postal code</td> > <td><input type="radio" name="Line" value="zipcode" /></td> > <td><input type="radio" name="Column" value="zipcode" /></td> > <td><select name="Filter" size="1" id="zipcode"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >index 65ce440..3bd2bf5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -235,7 +235,7 @@ > <th>Category</th> > <th>City</th> > <th>State</th> >- <th>Zip/Postal code</th> >+ <th>ZIP/Postal code</th> > <th>Country</th> > <th class="title-string">Registration date</th> > <th class="title-string">Expiry date</th> >@@ -302,7 +302,7 @@ > [% CASE 'state' %] > State > [% CASE 'zipcode' %] >- Zip/Postal code >+ ZIP/Postal code > [% CASE 'country' %] > Country > [% CASE 'sort1' %] >diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl >index b34934e..83ef452 100755 >--- a/reports/borrowers_stats.pl >+++ b/reports/borrowers_stats.pl >@@ -227,7 +227,7 @@ sub calculate { > } > > if ( $i == 0) { $cell{crit} = "Cat code"; } >- elsif ( $i == 1 ) { $cell{crit} = "Zip code"; } >+ elsif ( $i == 1 ) { $cell{crit} = "ZIP/Postal code"; } > elsif ( $i == 2 ) { $cell{crit} = "Branch code"; } > elsif ( $i == 3 || > $i == 4 ) { $cell{crit} = "Date of birth"; } >-- >1.7.10.4
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