View | Details | Raw Unified | Return to bug 4041
Collapse All | Expand All

(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
Lines 6-13 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
6
('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'),
6
('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'),
7
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
7
('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
8
('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
9
('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
10
('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
9
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
11
('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
10
('addressformat','us','','Choose format to display postal addresses', 'Choice'),
11
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
12
('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
12
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
13
('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'),
13
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
14
('AgeRestrictionMarker','',NULL,'Markers for age restriction indication, e.g. FSK|PEGI|Age|','free'),
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +1 lines)
Lines 9983-9989 if ( CheckVersion($DBversion) ) { Link Here
9983
$DBversion = "XXX";
9983
$DBversion = "XXX";
9984
if ( CheckVersion($DBversion) ) {
9984
if ( CheckVersion($DBversion) ) {
9985
    $dbh->do(q|
9985
    $dbh->do(q|
9986
        INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('addressformat','us','Choose format to display postal addresses',NULL,'Choice')
9986
        INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AddressFormat','us','Choose format to display postal addresses',NULL,'Choice')
9987
    |);
9987
    |);
9988
    print "Upgrade to $DBversion done (Bug 4041: Address Format as a I18N/L10N system preference\n";
9988
    print "Upgrade to $DBversion done (Bug 4041: Address Format as a I18N/L10N system preference\n";
9989
    SetVersion ($DBversion);
9989
    SetVersion ($DBversion);
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-2 / +2 lines)
Lines 12-19 Link Here
12
            <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>
12
            <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>
13
        [% END %]
13
        [% END %]
14
    [% END %]
14
    [% END %]
15
    [% IF Koha.Preference( 'addressformat' ) %]
15
    [% IF Koha.Preference( 'AddressFormat' ) %]
16
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
16
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
17
    [% ELSE %]
17
    [% ELSE %]
18
        [% INCLUDE 'member-display-address-style-us.inc' %]
18
        [% INCLUDE 'member-display-address-style-us.inc' %]
19
    [% END %]
19
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-2 / +2 lines)
Lines 15-22 in the global namespace %] Link Here
15
        [% END %]
15
        [% END %]
16
    [% END %]
16
    [% END %]
17
17
18
    [% IF Koha.Preference( 'addressformat' ) %]
18
    [% IF Koha.Preference( 'AddressFormat' ) %]
19
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
19
        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
20
    [% ELSE %]
20
    [% ELSE %]
21
        [% INCLUDE 'member-display-address-style-us.inc' %]
21
        [% INCLUDE 'member-display-address-style-us.inc' %]
22
    [% END %]
22
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref (-1 / +1 lines)
Lines 47-53 I18N/L10N: Link Here
47
        - "<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"
47
        - "<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"
48
    -
48
    -
49
        - Format postal addresses using
49
        - Format postal addresses using
50
        - pref: addressformat
50
        - pref: AddressFormat
51
          default: us
51
          default: us
52
          choices:
52
          choices:
53
              us: US style
53
              us: US style
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-6 / +6 lines)
Lines 470-477 Link Here
470
470
471
[% END %]
471
[% END %]
472
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
472
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
473
    [% IF Koha.Preference( 'addressformat' ) %]
473
    [% IF Koha.Preference( 'AddressFormat' ) %]
474
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
474
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
475
    [% ELSE %]
475
    [% ELSE %]
476
        [% INCLUDE 'member-main-address-style-us.inc' %]
476
        [% INCLUDE 'member-main-address-style-us.inc' %]
477
    [% END %]
477
    [% END %]
Lines 563-570 Link Here
563
[% IF ( step_6 ) %]
563
[% IF ( step_6 ) %]
564
564
565
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
565
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
566
        [% IF Koha.Preference( 'addressformat' ) %]
566
        [% IF Koha.Preference( 'AddressFormat' ) %]
567
            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
567
            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
568
        [% ELSE %]
568
        [% ELSE %]
569
            [% INCLUDE 'member-alt-address-style-us.inc' %]
569
            [% INCLUDE 'member-alt-address-style-us.inc' %]
570
        [% END %]
570
        [% END %]
Lines 572-579 Link Here
572
[% END %]
572
[% END %]
573
[% IF ( step_2 ) %]
573
[% IF ( step_2 ) %]
574
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
574
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
575
        [% IF Koha.Preference( 'addressformat' ) %]
575
        [% IF Koha.Preference( 'AddressFormat' ) %]
576
            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
576
            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
577
        [% ELSE %]
577
        [% ELSE %]
578
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
578
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
579
        [% END %]
579
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-3 / +2 lines)
Lines 197-204 function validate1(date) { Link Here
197
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
197
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
198
198
199
    <div class = "address">
199
    <div class = "address">
200
        [% IF Koha.Preference( 'addressformat' ) %]
200
        [% IF Koha.Preference( 'AddressFormat' ) %]
201
            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
201
            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
202
        [% ELSE %]
202
        [% ELSE %]
203
            [% INCLUDE 'member-display-address-style-us.inc' %]
203
            [% INCLUDE 'member-display-address-style-us.inc' %]
204
        [% END %]
204
        [% END %]
205
- 

Return to bug 4041