From 6fe68c5fd669cd5459ae0e2000e5bd2d8adace70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Tue, 27 Mar 2018 12:30:11 +0200 Subject: [PATCH] [FIX] emc_taxshelter_report: 't' in mail template This fix weird 't' appearing in the translation of emails. There was a mix of space and tab indentation in xml files. Tabulation indentation generate \t code in fr_BE.po. So this commit removes the tabulation indetation for xml file and fix the translation in i18n/fr_BE.po. --- .../data/mail_template_data.xml | 62 ++++---- easy_my_coop_taxshelter_report/i18n/fr_BE.po | 146 ++++++++---------- 2 files changed, 95 insertions(+), 113 deletions(-) diff --git a/easy_my_coop_taxshelter_report/data/mail_template_data.xml b/easy_my_coop_taxshelter_report/data/mail_template_data.xml index a7de13f..82d01bc 100644 --- a/easy_my_coop_taxshelter_report/data/mail_template_data.xml +++ b/easy_my_coop_taxshelter_report/data/mail_template_data.xml @@ -15,42 +15,42 @@

Hello ${object.partner_id.name},

-

You have subscribed to some shares of ${object.company_id.name} on ${object.declaration_id.fiscal_year}. - You can benefit from the tax shelter, it means a tax reduction of ${object.declaration_id.tax_shelter_percentage} percent on the invested amount. - For this you will find in attachments the documents certifying that you've suscribed to ${object.company_id.name} shares

+

You have subscribed to some shares of ${object.company_id.name} on ${object.declaration_id.fiscal_year}. + You can benefit from the tax shelter, it means a tax reduction of ${object.declaration_id.tax_shelter_percentage} percent on the invested amount. + For this you will find in attachments the documents certifying that you've suscribed to ${object.company_id.name} shares

A dedicated FAQ is coming soon on ${object.company_id.website}.

For any additional questions, please contact ${object.company_id.coop_email_contact}

-

Sustainably your,

-

${object.company_id.name}.

+

Sustainably your,

+

${object.company_id.name}.

- % if object.company_id.street: - ${object.company_id.street} - % endif - % if object.company_id.street2: - ${object.company_id.street2}
- % endif - % if object.company_id.city or object.company_id.zip: - ${object.company_id.zip} ${object.company_id.city}
- % endif - % if object.company_id.country_id: - ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
- % endif - % if object.company_id.phone: - Phone:  ${object.company_id.phone} - % endif + % if object.company_id.street: + ${object.company_id.street} + % endif + % if object.company_id.street2: + ${object.company_id.street2}
+ % endif + % if object.company_id.city or object.company_id.zip: + ${object.company_id.zip} ${object.company_id.city}
+ % endif + % if object.company_id.country_id: + ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
+ % endif + % if object.company_id.phone: + Phone:  ${object.company_id.phone} + % endif - % if object.company_id.website: -
- Web : ${object.company_id.website} -
- %endif + % if object.company_id.website: +
+ Web : ${object.company_id.website} +
+ %endif -
- -
+
+ +
]]> - - - \ No newline at end of file + + + diff --git a/easy_my_coop_taxshelter_report/i18n/fr_BE.po b/easy_my_coop_taxshelter_report/i18n/fr_BE.po index 7436842..72727ac 100644 --- a/easy_my_coop_taxshelter_report/i18n/fr_BE.po +++ b/easy_my_coop_taxshelter_report/i18n/fr_BE.po @@ -19,100 +19,82 @@ msgstr "" #. module: easy_my_coop_taxshelter_report #: model:mail.template,body_html:easy_my_coop_taxshelter_report.email_template_tax_shelter_certificate -msgid "" -"\n" -"
\n" +msgid "\n" +"
\n" "

Hello ${object.partner_id.name},

\n" "\n" -"\t

You have subscribed to some shares of ${object.company_id.name} on " -"${object.declaration_id.fiscal_year}. \n" -"\tYou can benefit from the tax shelter, it means a tax reduction of ${object." -"declaration_id.tax_shelter_percentage} percent on the invested amount.\n" -"\tFor this you will find in attachments the documents certifying that you've " -"suscribed to ${object.company_id.name} shares

\n" +"

You have subscribed to some shares of ${object.company_id.name} on ${object.declaration_id.fiscal_year}.\n" +" You can benefit from the tax shelter, it means a tax reduction of ${object.declaration_id.tax_shelter_percentage} percent on the invested amount.\n" +" For this you will find in attachments the documents certifying that you've suscribed to ${object.company_id.name} shares

\n" "

A dedicated FAQ is coming soon on ${object.company_id.website}.

\n" -"

For any additional questions, please contact ${object.company_id." -"coop_email_contact}

\n" -"\t

Sustainably your,

\n" -"\t

${object.company_id.name}.

\n" +"

For any additional questions, please contact ${object.company_id.coop_email_contact}

\n" +"

Sustainably your,

\n" +"

${object.company_id.name}.

\n" "\n" -"\t\t% if object.company_id.street:\n" -" ${object.company_id.street}\n" -" % endif\n" -" % if object.company_id.street2:\n" -" ${object.company_id.street2}
\n" -" % endif\n" -" % if object.company_id.city or object.company_id.zip:\n" -" ${object.company_id.zip} ${object.company_id.city}
\n" -" % endif\n" -" % if object.company_id.country_id:\n" -" ${object.company_id.state_id and ('%s, ' % object.company_id." -"state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" -" % endif\n" -" % if object.company_id.phone:\n" -" Phone:  ${object.company_id.phone}\n" -" % endif\n" +" % if object.company_id.street:\n" +" ${object.company_id.street}\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" +" % endif\n" +" % if object.company_id.phone:\n" +" Phone:  ${object.company_id.phone}\n" +" % endif\n" "\n" -" % if object.company_id.website:\n" -"
\n" -" Web : ${object." -"company_id.website}\n" -"
\n" -" %endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" "\n" -"
\n" -" \n" -"
\n" +"
\n" +" \n" +"
\n" "
\n" " " -msgstr "" -"\n" -"
\n" -"

Hello ${object.partner_id.name},

\n" +msgstr "\n" +"
\n" +"

Bonjour ${object.partner_id.name},

\n" "\n" -"\t

Vous avez souscrit à des parts de ${object.company_id.name} durant " -"l’année ${object.declaration_id.fiscal_year}. \n" -"\tVous pouvez bénéficier du tax shelter, c’est-à-dire d’une réduction " -"d'impôts de ${object.declaration_id.tax_shelter_percentage} pourcent sur la " -"somme investie.\n" -"\tPour cela, vous trouverez en pièce jointe le certificat attestant que vous " -"avez souscrit à des parts de ${object.company_id.name}

\n" -"

Une Foire aux questions spéciale Tax shelter arrive prochainement sur " -"${object.company_id.website}.

\n" -"

Pour toutes questions supplémentaires, merci de vous adresser à " -"${object.company_id.coop_email_contact}

\n" -"\t

Amicalement,

\n" -"\t

${object.company_id.name}.

\n" +"

Vous avez souscrit à des parts de ${object.company_id.name} durant l’année ${object.declaration_id.fiscal_year}. \n" +" Vous pouvez bénéficier du tax shelter, c’est-à-dire d’une réduction d'impôts de ${object.declaration_id.tax_shelter_percentage} pourcent sur la somme investie.\n" +" Pour cela, vous trouverez en pièce jointe le certificat attestant que vous avez souscrit à des parts de ${object.company_id.name}

\n" +"

Une Foire aux questions spéciale Tax shelter arrive prochainement sur ${object.company_id.website}.

\n" +"

Pour toutes questions supplémentaires, merci de vous adresser à ${object.company_id.coop_email_contact}

\n" +"

Amicalement,

\n" +"

${object.company_id.name}.

\n" "\n" -"\t\t% if object.company_id.street:\n" -" ${object.company_id.street}\n" -" % endif\n" -" % if object.company_id.street2:\n" -" ${object.company_id.street2}
\n" -" % endif\n" -" % if object.company_id.city or object.company_id.zip:\n" -" ${object.company_id.zip} ${object.company_id.city}
\n" -" % endif\n" -" % if object.company_id.country_id:\n" -" ${object.company_id.state_id and ('%s, ' % object.company_id." -"state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" -" % endif\n" -" % if object.company_id.phone:\n" -" Phone:  ${object.company_id.phone}\n" -" % endif\n" +" % if object.company_id.street:\n" +" ${object.company_id.street}\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" +" % endif\n" +" % if object.company_id.phone:\n" +" Phone:  ${object.company_id.phone}\n" +" % endif\n" "\n" -" % if object.company_id.website:\n" -"
\n" -" Web : ${object." -"company_id.website}\n" -"
\n" -" %endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" "\n" -"
\n" -" \n" -"
\n" +"
\n" +" \n" +"
\n" "
\n" " "