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
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with first patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5df49b04ef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
This commit is contained in:
Aleisha
Julian Maurice
parent
6438df7287
commit
776f738382
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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])
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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' %]
|
||||
|
|
|
|||
|
|
@ -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"; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue