From 7433abbdda017c115ee99b97a2f0b14c759029a4 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 10 Apr 2015 13:24:40 -0400
Subject: [PATCH] [PASSED QA] Bug 4041 [QA Followup] - Change addressformat to AddressFormat
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 4 ++--
.../intranet-tmpl/prog/en/includes/circ-menu.tt | 4 ++--
.../en/modules/admin/preferences/i18n_l10n.pref | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 12 ++++++------
.../prog/en/modules/members/moremember.tt | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index aae9b3a..0d7c817 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -7,8 +7,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
+('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
-('addressformat','us','','Choose format to display postal addresses', 'Choice'),
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option. Example: eng|fre|ita','Textarea'),
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index ab0b579..0446338 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -9980,7 +9980,7 @@ if ( CheckVersion($DBversion) ) {
$DBversion = "XXX";
if ( CheckVersion($DBversion) ) {
$dbh->do(q|
- INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('addressformat','us','Choose format to display postal addresses',NULL,'Choice')
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AddressFormat','us','Choose format to display postal addresses',NULL,'Choice')
|);
print "Upgrade to $DBversion done (Bug 4041: Address Format as a I18N/L10N system preference\n";
SetVersion ($DBversion);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index fdd8da5..1bf8746 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -12,8 +12,8 @@
<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
[% END %]
[% END %]
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
index 4106933..3a8c4a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
@@ -15,8 +15,8 @@ in the global namespace %]
[% END %]
[% END %]
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
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 67ebdca..f45f670 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
@@ -47,7 +47,7 @@ I18N/L10N:
- "<br/> Hint: Changing collation in the database for the 'surname' column of the 'borrowers' table is helpful to make browsing by last name work in members-home.pl when using an alphabet outside of A-Z"
-
- Format postal addresses using
- - pref: addressformat
+ - pref: AddressFormat
default: us
choices:
us: US style
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index edc90af..330058f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -470,8 +470,8 @@
[% END %]
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-main-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-main-address-style-us.inc' %]
[% END %]
@@ -563,8 +563,8 @@
[% IF ( step_6 ) %]
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-alt-address-style-us.inc' %]
[% END %]
@@ -572,8 +572,8 @@
[% END %]
[% IF ( step_2 ) %]
[% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-alt-contact-style-us.inc' %]
[% END %]
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 1b452bd..95ee2c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -186,8 +186,8 @@ function validate1(date) {
[% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %]
<div class = "address">
- [% IF Koha.Preference( 'addressformat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
--
1.7.2.5