From 8e4735013bcfc69ca9652aa395cdcf9432c9e836 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 10 Apr 2015 13:24:40 -0400 Subject: [PATCH] Bug 4041: (QA followup) Change addressformat to AddressFormat Signed-off-by: Kyle M Hall ---- Amended to resolve conflict in sysprefs.sql / mveron Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/sysprefs.sql | 4 ++-- installer/data/mysql/updatedatabase.pl | 2 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/circ-menu.tt | 4 ++-- .../prog/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, 16 insertions(+), 16 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index c026f42ba3..56af5f8830 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -6,6 +6,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'), ('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'), +('AddressFormat','us','','Choose format to display postal addresses', 'Choice'), ('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'), ('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'), @@ -475,6 +476,5 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('XSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on intranet','Free'), ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), -('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), -('addressformat','us','','Choose format to display postal addresses', 'Choice') +('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') ; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8a24c8217f..348e6a85fd 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9983,7 +9983,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 fdd8da51e5..1bf87463f9 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 @@
  • [% firstname %] [% surname %] ([% cardnumber %])
    • [% 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 4106933ec4..3a8c4a2730 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 67ebdcac24..f45f670f02 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: - "
    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 edc90af9bc..330058f632 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 9aa87a56ff..b502d7d971 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -197,8 +197,8 @@ function validate1(date) { [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% 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 %] -- 2.20.1