ZIP is an acronym (Zone Improvement Plan) so Zip should be replaced to ZIP in OPAC and Staff Interface
Created attachment 45679 [details] [review] 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
CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
Created attachment 45727 [details] [review] Signed-off patch for 15373 Error with the previous comment, there is no conflict. Patch appears to apply and work as described.
I think small mistake here - switching to Signed off
I have found more occurrences in the following files: koha-tmpl/intranet-tmpl/prog/en/columns.def koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt reports/borrowers_stats.pl
Created attachment 45872 [details] [review] 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
This is not an enhancement. It is annoying that enhancement is the default, and we sometimes forget to check for it. This is a string correction. Simple enough to check. I have confirmed that all instances seem to be dealt with. Now to follow test plan. Aleisha, if you are submitting the patch, please remember to take the bug.
Created attachment 46045 [details] [review] 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.
Created attachment 46046 [details] [review] 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.
Created attachment 46068 [details] [review] 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>
Created attachment 46069 [details] [review] 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>
Pushed to master, thanks Aleisha!
Patches pushed to 3.22.x, will be in 3.22.2
This patch has been pushed to 3.20.x, will be in 3.20.8.