@@ -, +, @@
---
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
--- a/installer/data/mysql/sysprefs.sql
+++ a/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'),
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
@@ -0,0 +1,148 @@
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc
@@ -0,0 +1,112 @@
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
+++ a/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 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc
+++ a/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 %]
+