From 30eacce3af3f66a7a55d90d97b427a52f92a7180 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Mon, 27 Feb 2017 09:32:24 +0000 Subject: [PATCH] BUG 18110 : Correct display and syspref AddFormat Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner 27/02/17 : Fixed the display --- installer/data/mysql/sysprefs.sql | 2 +- .../en/includes/member-alt-address-style-fr.inc | 148 +++++++++++++++++++++ .../en/includes/member-alt-contact-style-fr.inc | 112 ++++++++++++++++ .../includes/member-display-address-style-fr.inc | 21 +++ .../member-display-alt-address-style-fr.inc | 21 +++ .../en/includes/member-main-address-style-fr.inc | 125 +++++++++++++++++ .../en/modules/admin/preferences/i18n_l10n.pref | 1 + 7 files changed, 429 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index c9c86a2..871aa01 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -6,7 +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'), +('AddressFormat','us','us | de | fr','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'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc new file mode 100644 index 0000000..9c000fa --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc @@ -0,0 +1,148 @@ +
+Alternate address
    + +[% UNLESS noB_streetnumber %] +
  1. + [% IF ( mandatoryB_streetnumber ) %] +
    2. +[% END %] + +[% IF roadtypes %] +
  2. + [% IF ( mandatoryB_streettype ) %] +
    3. +[% END %] + +[% UNLESS noB_address %] +
  3. + [% IF ( mandatoryB_address ) %] +
    4. +[% END %] + +[% UNLESS noB_address2 %] +
  4. + [% IF ( mandatoryB_address2 ) %] +
    5. +[% END %] +[% UNLESS noB_zipcode %] +
  5. + [% IF ( mandatoryB_zipcode ) %] +
    6. +[% END %] +[% UNLESS noB_city %] +
  6. + [% IF ( mandatoryB_city ) %] +
    7. +[% END %] +[% UNLESS noB_state %] +
  7. + [% IF ( mandatoryB_state ) %] +
    8. +[% END %] +[% UNLESS noB_country %] +
  8. + [% IF ( mandatoryB_country ) %] +
    9. +[% END %] +[% UNLESS noB_phone %] +
  9. + [% IF ( mandatoryB_phone ) %] +
    10. +[% END %] +[% UNLESS noB_email %] +
  10. + [% IF ( mandatoryB_email ) %] +
    11. +[% END %] +[% UNLESS nocontactnote %] +
  11. + [% IF ( mandatorycontactnote ) %] +
    12. + [% END %] +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc new file mode 100644 index 0000000..ad3d4cd --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc @@ -0,0 +1,112 @@ +
+ Alternate contact
    +[% UNLESS noaltcontactsurname %] +
  1. + [% IF ( mandatoryaltcontactsurname ) %] +
    2. +[% END %] +[% UNLESS noaltcontactfirstname %] +
  2. + [% IF ( mandatoryaltcontactfirstname ) %] +
    3. +[% END %] +[% UNLESS noaltcontactaddress1 %] +
  3. + [% IF ( mandatoryaltcontactaddress1 ) %] +
    4. +[% END %] +[% UNLESS noaltcontactaddress2 %] +
  4. + [% IF ( mandatoryaltcontactaddress2 ) %] +
    5. +[% END %] +[% UNLESS noaltcontactzipcode %] +
  5. + [% IF ( mandatoryaltcontactzipcode ) %] +
    6. +[% END %] +[% UNLESS noaltcontactaddress3 %] +
  6. + [% IF ( mandatoryaltcontactaddress3 ) %] +
    7. +[% END %] +[% UNLESS noaltcontactstate %] +
  7. + [% IF ( mandatoryaltcontactstate ) %] +
    8. +[% END %] +[% UNLESS noaltcontactcountry %] +
  8. + [% IF ( mandatoryaltcontactcountry ) %] +
    9. +[% END %] +[% UNLESS noaltcontactphone %] +
  9. + [% IF ( mandatoryaltcontactphone ) %] +
    10. +[% END %] +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc new file mode 100644 index 0000000..5d4f197 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc @@ -0,0 +1,21 @@ +[% IF ( address or address2 ) %] + [% IF ( address ) %] + [% SET roadtype_desc = '' %] + [% IF streettype %] + [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %] + [% END %] +
  • + [% IF streetnumber %] [% streetnumber %][% END %] + [%IF roadtype_desc %] [% roadtype_desc %][% END %] +
    • +
  • [% address %] +
    • + [% END %] + [% IF ( address2 ) %] +
  • [% address2 %]
    • + [% END %] +[% END %] +[% IF ( city ) %]
  • + [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]
    [% state %][% END %] + [% IF ( country ) %]
    [% country %][% END %]
    • +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc new file mode 100644 index 0000000..fa98ba4 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc @@ -0,0 +1,21 @@ +[% IF ( B_address or B_address2 ) %] + [% IF ( B_address ) %] + [% SET roadtype_desc = '' %] + [% IF B_streetnumber %] [% B_streetnumber %][% END %] + [% IF B_streettype %] + [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %] + [% END %] +
  • [% B_address %] + [%IF roadtype_desc %] [% roadtype_desc %][% END %] +
    • + [% END %] + [% IF ( B_address2 ) %] +
  • [% B_address2 %]
    • + [% END %] +[% END %] +[% IF ( B_city ) %]
  • + [%IF ( B_zipcode ) %][% B_zipcode %] [% END %] + [% B_city %] + [% IF ( B_state ) %]
    [% B_state %][% END %] + [% IF ( B_country ) %]
    [% B_country %][% END %]
    • +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc new file mode 100644 index 0000000..e666ef9 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc @@ -0,0 +1,125 @@ +
    + Main address
      +[% UNLESS nostreetnumber %] +
    1. + [% IF ( mandatorystreetnumber ) %] +
      2. +[% END %] +[% UNLESS nostreettype %] + [% IF roadtypes %] +
    2. + [% IF ( mandatorystreettype ) %] +
      3. + [% END %] +[% END %] +[% UNLESS noaddress %] +
    3. + [% IF ( mandatoryaddress ) %] +
      4. +[% END %] +[% UNLESS noaddress2 %] +
    4. + [% IF ( mandatoryaddress2 ) %] +
      5. +[% END %] +[% UNLESS nozipcode %] +
    5. + [% IF ( mandatoryzipcode ) %] +
      6. +[% END %] +[% UNLESS nocity %] +
    6. + [% IF ( mandatorycity ) %] +
      7. +[% END %] +[% UNLESS nostate %] +
    7. + [% IF ( mandatorystate ) %] +
      8. +[% END %] +[% UNLESS nocountry %] +
    8. + [% IF ( mandatorycountry ) %] +
      9. +[% 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 6f7e60a..0741d3b 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 @@ -58,3 +58,4 @@ I18N/L10N: choices: us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country]) de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country]) + fr: French style ([Street number] [Address] - [ZIP/Postal Code] [City] - [Country]) -- 2.7.4