From 5df49b04ef69ad6b33b3f7744acb379c0dd83b0f Mon Sep 17 00:00:00 2001 From: Aleisha 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 Signed-off-by: Mark Tompsett NOTE: Tested together with first patch. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- 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 ++-- .../prog/en/modules/reports/borrowers_stats.tt | 2 +- .../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 73891766b1..c80975a3bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/columns.def +++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def @@ -14,7 +14,7 @@ Address 2 City State -Zip/postal code +ZIP/Postal code Country Primary phone Secondary phone @@ -28,7 +28,7 @@ Alternate address: Address 2 Alternate address: City Alternate address: State -Alternate address: Zip/postal code +Alternate address: ZIP/Postal code Alternate address: Country Alternate address: Phone Alternate address: Email @@ -42,7 +42,7 @@ Alternate contact: First name Alternate contact: Title Alternate contact: State -Alternate contact: Zip/postal code +Alternate contact: ZIP/Postal code Alternate contact: Country Alternate contact: Phone Card number 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 0b106d3369..29b54b90b1 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({
    • -
    • +
    • 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 9e4553b2d0..7143661618 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 @@
  • - + Required
  • @@ -117,7 +117,7 @@ State [% city.city_state %] - Zip/Postal code + ZIP/Postal code [% city.city_zipcode %] Country @@ -152,7 +152,7 @@ City ID City State - Zip/Postal code + ZIP/Postal code Country     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 89e4436e73..6f7e60a0b7 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 200ce242d2..3c5397ce38 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 @@ - Zip code + ZIP/Postal code