From f25df533f936a0d667e84476f0011408072bea09 Mon Sep 17 00:00:00 2001 From: Jonathan Guerne Date: Mon, 2 Aug 2021 15:26:34 +0200 Subject: [PATCH 01/15] CO-3711 new donors onboarding process --- mass_mailing_switzerland/data/smart_tags.xml | 4 + .../__manifest__.py | 2 + .../data/onboarding_new_donors_process.xml | 179 ++++++++++++++++++ partner_communication_switzerland/i18n/de.po | 106 +++++++++++ .../i18n/fr_CH.po | 179 ++++++++++++++++++ .../models/account_invoice_line.py | 8 +- .../models/res_partner.py | 79 ++++++-- .../views/onboarding_settings_view.xml | 25 +++ .../views/partner_compassion_view.xml | 13 ++ .../wizards/__init__.py | 1 + .../wizards/onboarding_settings.py | 39 ++++ 11 files changed, 618 insertions(+), 17 deletions(-) create mode 100644 partner_communication_switzerland/data/onboarding_new_donors_process.xml create mode 100644 partner_communication_switzerland/views/onboarding_settings_view.xml create mode 100644 partner_communication_switzerland/wizards/onboarding_settings.py diff --git a/mass_mailing_switzerland/data/smart_tags.xml b/mass_mailing_switzerland/data/smart_tags.xml index feb87a845..54f677774 100644 --- a/mass_mailing_switzerland/data/smart_tags.xml +++ b/mass_mailing_switzerland/data/smart_tags.xml @@ -7,6 +7,10 @@ FROM recurring_contract c JOIN res_partner p ON c.correspondent_id = p.id WHERE (now()::date - start_date::date) <= 60 and is_first_sponsorship = true AND child_id IS NOT NULL + UNION + SELECT id + FROM res_partner + WHERE (now()::date - onboarding_new_donor_start_date::date) <= 60 diff --git a/partner_communication_switzerland/__manifest__.py b/partner_communication_switzerland/__manifest__.py index b8ec842e2..1193f6aed 100644 --- a/partner_communication_switzerland/__manifest__.py +++ b/partner_communication_switzerland/__manifest__.py @@ -75,6 +75,7 @@ "report/onboarding_photo_by_post.xml", "data/onboarding_process.xml", "data/onboarding_survey.xml", + "data/onboarding_new_donors_process.xml", "report/child_picture.xml", "views/communication_job_view.xml", "views/download_child_pictures_view.xml", @@ -90,6 +91,7 @@ "views/field_office_view.xml", "views/communication_test_case_view.xml", "views/notification_settings_view.xml", + "views/onboarding_settings_view.xml", "wizards/res_partner_create_portal_wizard.xml", "templates/zoom_registration_form.xml", ], diff --git a/partner_communication_switzerland/data/onboarding_new_donors_process.xml b/partner_communication_switzerland/data/onboarding_new_donors_process.xml new file mode 100644 index 000000000..58b8a523e --- /dev/null +++ b/partner_communication_switzerland/data/onboarding_new_donors_process.xml @@ -0,0 +1,179 @@ + + + + + New Donors Onboarding - Postcard & Magazine + + "${object.user_id.company_id.with_context(lang=object.partner_id.lang).address_name}" <compassion@compassion.ch> + info@compassion.ch + + +

+ % set partner = object.partner_id + % set is_plural = partner.title.plural or partner.title.id == 29 + % set dir = 'euch' if is_plural else 'dir' + % set du = 'ihr' if is_plural else 'du' + % set dich = 'euch' if is_plural else 'dich' + % set hast = 'habt' if is_plural else 'hast' + % set kennst = 'kennt' if is_plural else 'kennst' + % set Melde = 'Meldet' if is_plural else 'Melde' + ${partner.salutation} +

+

+ Danke! +

+

+ Wir freuen uns, ${dir} das aktuelle Compassion-Magazin zu senden. Einmal pro Jahr berichten wir in diesem Format über den Impact, den wir gemeinsam erreicht haben, was unsere Herausforderungen und Ziele sind und was Menschen im globalen Süden und in der Schweiz bewegt. Viel Freude beim Schmökern und Entdecken! +

+

+ Wenn ${du} Compassion noch nicht ${kennst}, ${hast} ${du} vielleicht noch viele Fragen. ${Melde} ${dich} gerne jederzeit bei uns. +

+

+ Herzliche Grüsse +

+

+ Debora Alder-Gasser und das Team von Compassion +

+ + + + + New Donors Onboarding - 1st Blog Post + + "${object.user_id.company_id.with_context(lang=object.partner_id.lang).address_name}" <compassion@compassion.ch> + info@compassion.ch + + Neu bei Compassion? + +

+ % set partner = object.partner_id + % set is_plural = partner.title.plural or partner.title.id == 29 + % set dir = 'euch' if is_plural else 'dir' + % set du = 'ihr' if is_plural else 'du' + % set du_upper = 'Ihr' if is_plural else 'Du' + % set dich = 'euch' if is_plural else 'dich' + % set deine = 'eure' if is_plural else 'deine' + % set hast = 'habt' if is_plural else 'hast' + % set fragst = 'fragt' if is_plural else 'fragst' + ${partner.salutation} +

+

+ Wir freuen uns, ${dich} kennenzulernen und ${dir} mehr davon zu erzählen, wie wir Kinder und Familien unterstützen, extreme Armut zu überwinden. ${du_upper} ${fragst} ${dich} vielleicht, was Kinderpatenschaften bringen, vielleicht sogar, ob sie sinnvoll sind oder ob nur christliche Kinder unterstützt werden? Gerne nehmen wir ${dich} mit und beantworten ${deine} Fragen. +

+

+ + Weiterlesen +

+

+ Nochmals vielen Dank: mit ${dir} zusammen befreien wir zurzeit mit rund 8'000 Partnerkirchen in 25 Ländern 2,2 Millionen Kinder aus extremer Armut. Gemeinsam ermöglichen wir den Kindern ein Leben mit Hoffnung und Zukunft. +

+

+ Herzliche Grüsse +

+

+ Debora Alder-Gasser und das Team von Compassion +

+ + + + + New Donors Onboarding - 2nd Blog Post + + "${object.user_id.company_id.with_context(lang=object.partner_id.lang).address_name}" <compassion@compassion.ch> + info@compassion.ch + + Warum sind Kinderpatenschaften nachhaltig und relevant? + +

+ % set partner = object.partner_id + % set is_plural = partner.title.plural or partner.title.id == 29 + % set dir = 'euch' if is_plural else 'dir' + % set du = 'ihr' if is_plural else 'du' + % set du_upper = 'Ihr' if is_plural else 'Du' + % set dich = 'euch' if is_plural else 'dich' + % set deine = 'eure' if is_plural else 'deine' + % set findest = 'findet' if is_plural else 'findest' + % set fragst = 'fragt' if is_plural else 'fragst' + ${partner.salutation} +

+

+ ${du_upper} ${fragst} ${dich} vielleicht: "Kinderpatenschaften kommen mir ein bisschen altmodisch vor. Sind sie wirklich noch relevant?" +

+

+ Es wird ${dich} wahrscheinlich nicht überraschen, dass wir hier bei Compassion sagen, dass Kinderpatenschaften relevanter sind als je zuvor. Mit fast 70 Jahren Erfahrung glauben wir immer noch, dass eine Kinderpatenschaft eine lohnenswerte Investition ist, die effektiv, nachhaltig und engagiert ist - sogar in Krisenzeiten wie einer globalen Pandemie. Aber warum? Lass es uns gemeinsam auspacken. +

+

+ + Weiterlesen +

+

+ Hier ${findest} ${du} Kinder, für die wir gerade dringend einen Paten oder eine Patin suchen. +

+

+ Ja, ich möchte ein Kind mit einer Patenschaft unterstützen +

+

+ Nochmals vielen Dank, denn gemeinsam verändern wir das Leben von Kindern - eins nach dem anderen. +

+

+ Herzliche Grüsse +

+

+ Debora Alder-Gasser und das Team von Compassion +

+ + + + + + New Donors Onboarding - Postcard & Magazine + physical + + + + + + + New Donors Onboarding - 1st Blog Post + auto_digital_only + + + + + + + New Donors Onboarding - 2nd Blog Post + auto_digital_only + + + + + + + + New Donors Onboarding: 1st blog post + + on_time + + + 1 + month + communication + + self + + + + New Donors Onboarding: 2nd blog post + + on_time + + + 2 + month + communication + + self + + + \ No newline at end of file diff --git a/partner_communication_switzerland/i18n/de.po b/partner_communication_switzerland/i18n/de.po index 836fc3b88..413e0b230 100644 --- a/partner_communication_switzerland/i18n/de.po +++ b/partner_communication_switzerland/i18n/de.po @@ -7598,3 +7598,109 @@ msgstr "Willkommen in der Familie von Compassion!" #: model_terms:ir.ui.view,arch_db:partner_communication_switzerland.zoom_registration_template msgid "um" msgstr "" + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_postcard_and_magazine +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set hast = 'habt' if is_plural else 'hast'\n" +" % set kennst = 'kennt' if is_plural else 'kennst'\n" +" % set Melde = 'Meldet' if is_plural else 'Melde'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Danke!\n" +"

\n" +"

\n" +" Wir freuen uns, ${dir} das aktuelle Compassion-Magazin zu senden. Einmal pro Jahr berichten wir in diesem Format über den Impact, den wir gemeinsam erreicht haben, was unsere Herausforderungen und Ziele sind und was Menschen im globalen Süden und in der Schweiz bewegt. Viel Freude beim Schmökern und Entdecken!\n" +"

\n" +"

\n" +" Wenn ${du} Compassion noch nicht ${kennst}, ${hast} ${du} vielleicht noch viele Fragen. ${Melde} ${dich} gerne jederzeit bei uns.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "" + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_2nd_blog_post +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set du_upper = 'Ihr' if is_plural else 'Du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set deine = 'eure' if is_plural else 'deine'\n" +" % set findest = 'findet' if is_plural else 'findest'\n" +" % set fragst = 'fragt' if is_plural else 'fragst'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" ${du_upper} ${fragst} ${dich} vielleicht: \"Kinderpatenschaften kommen mir ein bisschen altmodisch vor. Sind sie wirklich noch relevant?\"\n" +"

\n" +"

\n" +" Es wird ${dich} wahrscheinlich nicht überraschen, dass wir hier bei Compassion sagen, dass Kinderpatenschaften relevanter sind als je zuvor. Mit fast 70 Jahren Erfahrung glauben wir immer noch, dass eine Kinderpatenschaft eine lohnenswerte Investition ist, die effektiv, nachhaltig und engagiert ist - sogar in Krisenzeiten wie einer globalen Pandemie. Aber warum? Lass es uns gemeinsam auspacken.\n" +"

\n" +"

\n" +" \n" +" Weiterlesen\n" +"

\n" +"

\n" +" Hier ${findest} ${du} Kinder, für die wir gerade dringend einen Paten oder eine Patin suchen.\n" +"

\n" +"

\n" +" Ja, ich möchte ein Kind mit einer Patenschaft unterstützen\n" +"

\n" +"

\n" +" Nochmals vielen Dank, denn gemeinsam verändern wir das Leben von Kindern - eins nach dem anderen.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "" + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_1st_blog_post +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set du_upper = 'Ihr' if is_plural else 'Du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set deine = 'eure' if is_plural else 'deine'\n" +" % set hast = 'habt' if is_plural else 'hast'\n" +" % set fragst = 'fragt' if is_plural else 'fragst'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Wir freuen uns, ${dich} kennenzulernen und ${dir} mehr davon zu erzählen, wie wir Kinder und Familien unterstützen, extreme Armut zu überwinden. ${du_upper} ${fragst} ${dich} vielleicht, was Kinderpatenschaften bringen, vielleicht sogar, ob sie sinnvoll sind oder ob nur christliche Kinder unterstützt werden? Gerne nehmen wir ${dich} mit und beantworten ${deine} Fragen.\n" +"

\n" +"

\n" +" \n" +" Weiterlesen\n" +"

\n" +"

\n" +" Nochmals vielen Dank: mit ${dir} zusammen befreien wir zurzeit mit rund 8'000 Partnerkirchen in 25 Ländern 2,2 Millionen Kinder aus extremer Armut. Gemeinsam ermöglichen wir den Kindern ein Leben mit Hoffnung und Zukunft.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "" \ No newline at end of file diff --git a/partner_communication_switzerland/i18n/fr_CH.po b/partner_communication_switzerland/i18n/fr_CH.po index 82bc90814..5d40389d6 100644 --- a/partner_communication_switzerland/i18n/fr_CH.po +++ b/partner_communication_switzerland/i18n/fr_CH.po @@ -8474,3 +8474,182 @@ msgstr "Bienvenue dans la famille de Compassion" #: model_terms:ir.ui.view,arch_db:partner_communication_switzerland.zoom_registration_template msgid "um" msgstr "" + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_postcard_and_magazine +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set hast = 'habt' if is_plural else 'hast'\n" +" % set kennst = 'kennt' if is_plural else 'kennst'\n" +" % set Melde = 'Meldet' if is_plural else 'Melde'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Danke!\n" +"

\n" +"

\n" +" Wir freuen uns, ${dir} das aktuelle Compassion-Magazin zu senden. Einmal pro Jahr berichten wir in diesem Format über den Impact, den wir gemeinsam erreicht haben, was unsere Herausforderungen und Ziele sind und was Menschen im globalen Süden und in der Schweiz bewegt. Viel Freude beim Schmökern und Entdecken!\n" +"

\n" +"

\n" +" Wenn ${du} Compassion noch nicht ${kennst}, ${hast} ${du} vielleicht noch viele Fragen. ${Melde} ${dich} gerne jederzeit bei uns.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Merci!\n" +"

\n" +"

\n" +" C’est une grande joie pour nous de vous adresser le dernier Magazine Compassion. Vous y découvrirez un aperçu de l'impact que nous avons obtenu ensemble, des défis de Compassion et de ce qui fait bouger les gens dans le Sud et en Suisse. Bonne lecture!\n" +"Vous ne connaissez pas encore bien Compassion? Vous avez peut-être des questions sur notre engagement, notre action. N'hésitez pas à prendre contact avec nous.\n" +"

\n" +"

\n" +" Christian Willi et l'équipe de Compassion vous saluent chaleureusement.\n" +"

\n" +" " + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_2nd_blog_post +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set du_upper = 'Ihr' if is_plural else 'Du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set deine = 'eure' if is_plural else 'deine'\n" +" % set findest = 'findet' if is_plural else 'findest'\n" +" % set fragst = 'fragt' if is_plural else 'fragst'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" ${du_upper} ${fragst} ${dich} vielleicht: \"Kinderpatenschaften kommen mir ein bisschen altmodisch vor. Sind sie wirklich noch relevant?\"\n" +"

\n" +"

\n" +" Es wird ${dich} wahrscheinlich nicht überraschen, dass wir hier bei Compassion sagen, dass Kinderpatenschaften relevanter sind als je zuvor. Mit fast 70 Jahren Erfahrung glauben wir immer noch, dass eine Kinderpatenschaft eine lohnenswerte Investition ist, die effektiv, nachhaltig und engagiert ist - sogar in Krisenzeiten wie einer globalen Pandemie. Aber warum? Lass es uns gemeinsam auspacken.\n" +"

\n" +"

\n" +" \n" +" Weiterlesen\n" +"

\n" +"

\n" +" Hier ${findest} ${du} Kinder, für die wir gerade dringend einen Paten oder eine Patin suchen.\n" +"

\n" +"

\n" +" Ja, ich möchte ein Kind mit einer Patenschaft unterstützen\n" +"

\n" +"

\n" +" Nochmals vielen Dank, denn gemeinsam verändern wir das Leben von Kindern - eins nach dem anderen.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +"Vous vous demandez peut-être si le parrainage d'enfants est encore vraiment pertinent à notre époque.\n" +"

\n" +"

\n" +" Vous ne serez probablement pas surpris d'apprendre qu'ici, à Compassion, nous affirmons que le parrainage d'enfants est une forme d’aide au développement plus pertinente que jamais. \n" +"

\n" +"

\n" +"Avec près de 70 ans d'expérience, nous observons que le parrainage d'enfants est un investissement utile, efficace et durable et ce, même en temps de crise comme une pandémie mondiale. Mais pourquoi? Découvrons-le de plus près.\n" +"

\n" +"

\n" +" \n" +" Lire la suite\n" +"

\n" +"

\n" +"Vous trouverez ici les enfants pour lesquels nous recherchons urgemment un parrain ou une marraine.\n" +"

\n" +"

\n" +" Oui, je souhaite soutenir un enfant par un parrainage.\n" +"

\n" +"

\n" +"Encore une fois merci. En effet, ensemble, nous changeons la vie des enfants - un après l’autre. \n" +"

\n" +"

\n" +"Chaleureuses salutations et à bientôt!\n" +"

\n" +"

\n" +"Christian Willi et l'équipe de Compassion\n" +"

\n" +" " + +#. module: partner_communication_switzerland +#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_1st_blog_post +msgid "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" % set dir = 'euch' if is_plural else 'dir'\n" +" % set du = 'ihr' if is_plural else 'du'\n" +" % set du_upper = 'Ihr' if is_plural else 'Du'\n" +" % set dich = 'euch' if is_plural else 'dich'\n" +" % set deine = 'eure' if is_plural else 'deine'\n" +" % set hast = 'habt' if is_plural else 'hast'\n" +" % set fragst = 'fragt' if is_plural else 'fragst'\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Wir freuen uns, ${dich} kennenzulernen und ${dir} mehr davon zu erzählen, wie wir Kinder und Familien unterstützen, extreme Armut zu überwinden. ${du_upper} ${fragst} ${dich} vielleicht, was Kinderpatenschaften bringen, vielleicht sogar, ob sie sinnvoll sind oder ob nur christliche Kinder unterstützt werden? Gerne nehmen wir ${dich} mit und beantworten ${deine} Fragen.\n" +"

\n" +"

\n" +" \n" +" Weiterlesen\n" +"

\n" +"

\n" +" Nochmals vielen Dank: mit ${dir} zusammen befreien wir zurzeit mit rund 8'000 Partnerkirchen in 25 Ländern 2,2 Millionen Kinder aus extremer Armut. Gemeinsam ermöglichen wir den Kindern ein Leben mit Hoffnung und Zukunft.\n" +"

\n" +"

\n" +" Herzliche Grüsse\n" +"

\n" +"

\n" +" Debora Alder-Gasser und das Team von Compassion\n" +"

\n" +" " +msgstr "

\n" +" % set partner = object.partner_id\n" +" % set is_plural = partner.title.plural or partner.title.id == 29\n" +" ${partner.salutation}\n" +"

\n" +"

\n" +" Nous nous réjouissons de faire votre connaissance et de vous en dire plus sur la manière dont nous aidons les enfants et les familles à surmonter l'extrême pauvreté. \n" +"Vous vous demandez peut-être ce qu'est le parrainage d'enfants, peut-être même s'il fait sens ou encore si seuls les enfants chrétiens sont soutenus? C’est un plaisir pour nous d’accompagner votre découverte de Compassion et de répondre à vos questions.\n" +"

\n" +"

\n" +" \n" +" Lire la suite\n" +"

\n" +"

\n" +" Encore une fois, merci: avec vous, nous sommes actuellement en train de soutenir 2,2 millions d'enfants, afin de les libérer de l'extrême pauvreté. Cet engagement, nous le menons en partenariat avec 8000 Eglises partenaires dans 25 pays.\n" +"

\n" +"

\n" +"Ensemble, nous pouvons donner à ces enfants une vie digne, pleine d'espoir pour un avenir meilleur. \n" +"

\n" +"

\n" +"Chaleureuses salutations et à bientôt.\n" +"

\n" +"

\n" +"Sarah et l'équipe de Compassion\n" +"

\n" +" " \ No newline at end of file diff --git a/partner_communication_switzerland/models/account_invoice_line.py b/partner_communication_switzerland/models/account_invoice_line.py index 573504d8c..44333c70d 100644 --- a/partner_communication_switzerland/models/account_invoice_line.py +++ b/partner_communication_switzerland/models/account_invoice_line.py @@ -68,7 +68,7 @@ def generate_thank_you(self): default_communication_config = self.env.ref( "partner_communication_switzerland.config_event_standard" ) - return super( + res = super( AccountInvoiceLine, self.with_context( same_job_search=[("event_id", "=", event.id)], @@ -79,6 +79,12 @@ def generate_thank_you(self): ), ).generate_thank_you() + # filter and start new donors onboarding for matching partners + new_donors = self.mapped("partner_id").filter_onboarding_new_donors() + new_donors.start_new_donors_onboarding() + + return res + @api.multi def send_receipt_to_ambassador(self): """ diff --git a/partner_communication_switzerland/models/res_partner.py b/partner_communication_switzerland/models/res_partner.py index d01393abb..a7e63f9ae 100644 --- a/partner_communication_switzerland/models/res_partner.py +++ b/partner_communication_switzerland/models/res_partner.py @@ -47,6 +47,10 @@ class ResPartner(models.Model): informal_salutation = fields.Char(compute="_compute_informal_salutation", help="Informal salutation used in French") + onboarding_new_donor_start_date = fields.Date(help="Indicates when the first email of " + "the new donor onboarding process was sent.", + copy=False) + def _get_salutation_fr_CH(self, informal=False): self.ensure_one() family_title = self.env.ref("partner_compassion.res_partner_title_family") @@ -81,7 +85,7 @@ def _get_salutation_de_DE(self): if title == family_title: return f"Liebe Familie {self.lastname}" elif title == mister_madam_title: - return f"Hallo {self.firstname}" + return f"Hallo {self.firstname}" elif is_company: return "Liebe Freundinnen und Freunde von Compassion" else: @@ -157,19 +161,19 @@ def _compute_new_donor(self): def _compute_no_physical_letter(self): for partner in self: partner.no_physical_letter = ( - "only" in partner.global_communication_delivery_preference - or partner.global_communication_delivery_preference == "none" - ) and ( - "only" in partner.letter_delivery_preference - or partner.letter_delivery_preference == "none" - ) and ( - "only" in partner.photo_delivery_preference - or partner.photo_delivery_preference == "none" - ) and ( - "only" in partner.thankyou_preference - or partner.thankyou_preference == "none" - ) and partner.tax_certificate != "paper" and partner.nbmag in ( - "email", "no_mag") + "only" in partner.global_communication_delivery_preference + or partner.global_communication_delivery_preference == "none" + ) and ( + "only" in partner.letter_delivery_preference + or partner.letter_delivery_preference == "none" + ) and ( + "only" in partner.photo_delivery_preference + or partner.photo_delivery_preference == "none" + ) and ( + "only" in partner.thankyou_preference + or partner.thankyou_preference == "none" + ) and partner.tax_certificate != "paper" and partner.nbmag in ( + "email", "no_mag") def _inverse_no_physical_letter(self): for partner in self: @@ -177,7 +181,7 @@ def _inverse_no_physical_letter(self): vals = { "nbmag": "no_mag" if partner.nbmag == "no_mag" else "email", "tax_certificate": "no" - if partner.tax_certificate == "no"else "only_email", + if partner.tax_certificate == "no" else "only_email", "calendar": False, "christmas_card": False } @@ -218,10 +222,33 @@ def _compute_last_completed_tax_receipt(self): ("state", "=", "done") ], limit=1) if last_tax_receipt.date: - partner.last_completed_tax_receipt = last_tax_receipt.date.year-1 + partner.last_completed_tax_receipt = last_tax_receipt.date.year - 1 else: partner.last_completed_tax_receipt = 1979 + @api.multi + def write(self, vals): + + is_optout = 'onboarding_new_donor_start_date' in vals and not vals['onboarding_new_donor_start_date'] + new_donors_user = self.env['res.config.settings'].get_values()['new_donors_user'] + optout_partners = self.filtered( + lambda p: p.onboarding_new_donor_start_date != False) if is_optout and new_donors_user else self.env[ + self._name] + + res = super(ResPartner, self).write(vals) + + for partner in optout_partners: + partner.activity_schedule( + "mail.mail_activity_data_email", + summary=_("Someone opt out of the new donor onboarding process"), + note=_("{} just opt out of the onboarding process for new donors.". + format(partner.name) + ), + user_id=new_donors_user + ) + + return res + @api.model def generate_tax_receipts(self): """ @@ -359,3 +386,23 @@ def action_reset_password(self): "res_id": comm.id, "target": "current", } + + @api.multi + def filter_onboarding_new_donors(self): + return self.filtered(lambda p: p.is_new_donor and not p.is_church) + + def start_new_donors_onboarding(self): + + config = self.env.ref( + "partner_communication_switzerland.config_new_donors_onboarding_postcard_and_magazine" + ) + + for partner in self: + self.env["partner.communication.job"].create( + { + "partner_id": partner.id, + "config_id": config.id, + "auto_send": False, + }) + + partner.onboarding_new_donor_start_date = fields.Date.today() diff --git a/partner_communication_switzerland/views/onboarding_settings_view.xml b/partner_communication_switzerland/views/onboarding_settings_view.xml new file mode 100644 index 000000000..bdd9c5825 --- /dev/null +++ b/partner_communication_switzerland/views/onboarding_settings_view.xml @@ -0,0 +1,25 @@ + + + + onboarding.settings.form + res.config.settings + + + + +

New Donors Onboarding Process

+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/partner_communication_switzerland/views/partner_compassion_view.xml b/partner_communication_switzerland/views/partner_compassion_view.xml index 5dc4ff527..0bcc88380 100644 --- a/partner_communication_switzerland/views/partner_compassion_view.xml +++ b/partner_communication_switzerland/views/partner_compassion_view.xml @@ -32,4 +32,17 @@ action + + + new donors partners view + res.partner + + + + + + + + + diff --git a/partner_communication_switzerland/wizards/__init__.py b/partner_communication_switzerland/wizards/__init__.py index 413e4c1c5..a1c6c61fe 100644 --- a/partner_communication_switzerland/wizards/__init__.py +++ b/partner_communication_switzerland/wizards/__init__.py @@ -18,3 +18,4 @@ from . import res_partner_create_portal_wizard from . import communication_test_cases_wizard from . import staff_notification_settings +from . import onboarding_settings \ No newline at end of file diff --git a/partner_communication_switzerland/wizards/onboarding_settings.py b/partner_communication_switzerland/wizards/onboarding_settings.py new file mode 100644 index 000000000..951ae846b --- /dev/null +++ b/partner_communication_switzerland/wizards/onboarding_settings.py @@ -0,0 +1,39 @@ +############################################################################## +# +# Copyright (C) 2021 Compassion CH (http://www.compassion.ch) +# Releasing children from poverty in Jesus' name +# @author: Jonathan Guerne +# +# The licence is in the file __manifest__.py +# +############################################################################## + +from odoo import api, models, fields + + +class DemandPlanningSettings(models.TransientModel): + _inherit = "res.config.settings" + + new_donors_user = fields.Many2one( + "res.users", "User to notify on new donors onboarding opt out", readonly=False + ) + + @api.multi + def set_values(self): + super().set_values() + self.env["ir.config_parameter"].set_param( + "partner_communication_switzerland.new_donors_user", + str(self.new_donors_user.id or 0), + ) + + @api.model + def get_values(self): + res = super().get_values() + param_obj = self.env["ir.config_parameter"].sudo() + new_donors_user_id = int( + param_obj.get_param("partner_communication_switzerland.new_donors_user", "0") + ) + res.update( + {"new_donors_user": new_donors_user_id, } + ) + return res From 3dfbad21f9ea8607236c24e865bb4e57dd270fd9 Mon Sep 17 00:00:00 2001 From: Jonathan Guerne Date: Tue, 3 Aug 2021 12:21:04 +0200 Subject: [PATCH 02/15] CO-3711 remove notif on write and check if partner has already been a sponsor --- .../models/res_partner.py | 51 +++++-------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/partner_communication_switzerland/models/res_partner.py b/partner_communication_switzerland/models/res_partner.py index a7e63f9ae..55961c152 100644 --- a/partner_communication_switzerland/models/res_partner.py +++ b/partner_communication_switzerland/models/res_partner.py @@ -161,19 +161,19 @@ def _compute_new_donor(self): def _compute_no_physical_letter(self): for partner in self: partner.no_physical_letter = ( - "only" in partner.global_communication_delivery_preference - or partner.global_communication_delivery_preference == "none" - ) and ( - "only" in partner.letter_delivery_preference - or partner.letter_delivery_preference == "none" - ) and ( - "only" in partner.photo_delivery_preference - or partner.photo_delivery_preference == "none" - ) and ( - "only" in partner.thankyou_preference - or partner.thankyou_preference == "none" - ) and partner.tax_certificate != "paper" and partner.nbmag in ( - "email", "no_mag") + "only" in partner.global_communication_delivery_preference + or partner.global_communication_delivery_preference == "none" + ) and ( + "only" in partner.letter_delivery_preference + or partner.letter_delivery_preference == "none" + ) and ( + "only" in partner.photo_delivery_preference + or partner.photo_delivery_preference == "none" + ) and ( + "only" in partner.thankyou_preference + or partner.thankyou_preference == "none" + ) and partner.tax_certificate != "paper" and partner.nbmag in ( + "email", "no_mag") def _inverse_no_physical_letter(self): for partner in self: @@ -226,29 +226,6 @@ def _compute_last_completed_tax_receipt(self): else: partner.last_completed_tax_receipt = 1979 - @api.multi - def write(self, vals): - - is_optout = 'onboarding_new_donor_start_date' in vals and not vals['onboarding_new_donor_start_date'] - new_donors_user = self.env['res.config.settings'].get_values()['new_donors_user'] - optout_partners = self.filtered( - lambda p: p.onboarding_new_donor_start_date != False) if is_optout and new_donors_user else self.env[ - self._name] - - res = super(ResPartner, self).write(vals) - - for partner in optout_partners: - partner.activity_schedule( - "mail.mail_activity_data_email", - summary=_("Someone opt out of the new donor onboarding process"), - note=_("{} just opt out of the onboarding process for new donors.". - format(partner.name) - ), - user_id=new_donors_user - ) - - return res - @api.model def generate_tax_receipts(self): """ @@ -389,7 +366,7 @@ def action_reset_password(self): @api.multi def filter_onboarding_new_donors(self): - return self.filtered(lambda p: p.is_new_donor and not p.is_church) + return self.filtered(lambda p: p.is_new_donor and not p.is_church and not p.sponsorship_ids) def start_new_donors_onboarding(self): From c0ddb9be9a7f7c3173d66113a49b9938795d20bf Mon Sep 17 00:00:00 2001 From: Jonathan Guerne Date: Wed, 4 Aug 2021 08:55:49 +0200 Subject: [PATCH 03/15] CO-3725 add an unsubscribe route for new donors onboarding process --- .../__manifest__.py | 1 + .../controllers/__init__.py | 1 + .../controllers/onboarding.py | 51 +++++ .../data/onboarding_new_donors_process.xml | 12 +- partner_communication_switzerland/i18n/de.po | 106 ---------- .../i18n/fr_CH.po | 181 +----------------- .../models/res_partner.py | 3 + .../templates/onboarding_unsubscribe.xml | 41 ++++ 8 files changed, 108 insertions(+), 288 deletions(-) create mode 100644 partner_communication_switzerland/controllers/onboarding.py create mode 100644 partner_communication_switzerland/templates/onboarding_unsubscribe.xml diff --git a/partner_communication_switzerland/__manifest__.py b/partner_communication_switzerland/__manifest__.py index 1193f6aed..f482d1773 100644 --- a/partner_communication_switzerland/__manifest__.py +++ b/partner_communication_switzerland/__manifest__.py @@ -94,6 +94,7 @@ "views/onboarding_settings_view.xml", "wizards/res_partner_create_portal_wizard.xml", "templates/zoom_registration_form.xml", + "templates/onboarding_unsubscribe.xml" ], "demo": [], "installable": True, diff --git a/partner_communication_switzerland/controllers/__init__.py b/partner_communication_switzerland/controllers/__init__.py index 9a0e2b41d..2fbac350e 100644 --- a/partner_communication_switzerland/controllers/__init__.py +++ b/partner_communication_switzerland/controllers/__init__.py @@ -9,3 +9,4 @@ ############################################################################## from . import b2s_image from . import zoom_registration +from . import onboarding diff --git a/partner_communication_switzerland/controllers/onboarding.py b/partner_communication_switzerland/controllers/onboarding.py new file mode 100644 index 000000000..621da798b --- /dev/null +++ b/partner_communication_switzerland/controllers/onboarding.py @@ -0,0 +1,51 @@ +############################################################################## +# +# Copyright (C) 2021 Compassion CH (http://www.compassion.ch) +# Releasing children from poverty in Jesus' name +# @author: Jonathan Guerne +# +# The licence is in the file __manifest__.py +# +############################################################################## +import logging + +from odoo import http, _ +from odoo.http import request, Controller + +from odoo.addons.cms_form.controllers.main import FormControllerMixin + +_logger = logging.getLogger(__name__) + + +class OnboardingController(Controller, FormControllerMixin): + + @http.route( + [ + "/onboarding//unsubscribe/" + ], + type="http", auth="public", methods=["GET", "POST"], website=True, + sitemap=False) + def onboarding_unsubscribe(self, onboarding_type, onboarding_hash, confirm_opt_out=False, **kwargs): + + if onboarding_type == "new_donors": + return self._new_donors_onboarding_unsubscribe(onboarding_hash, confirm_opt_out) + else: + return http.request.render("website.404") + + def _new_donors_onboarding_unsubscribe(self, onboarding_hash, confirm_opt_out): + partner = request.env["res.partner"].sudo().search( + [("onboarding_new_donor_hash", "=", onboarding_hash)] + ) + + if not partner: + return http.request.render("website.404") + + if not confirm_opt_out: + return request.render( + "partner_communication_switzerland.new_donors_onboarding_unsubscribe_template" + ) + + partner.opt_out = True + + return request.render( + "partner_communication_switzerland.confirmation_onboarding_unsubscribe_template") diff --git a/partner_communication_switzerland/data/onboarding_new_donors_process.xml b/partner_communication_switzerland/data/onboarding_new_donors_process.xml index 58b8a523e..966c33b8d 100644 --- a/partner_communication_switzerland/data/onboarding_new_donors_process.xml +++ b/partner_communication_switzerland/data/onboarding_new_donors_process.xml @@ -55,6 +55,7 @@ % set deine = 'eure' if is_plural else 'deine' % set hast = 'habt' if is_plural else 'hast' % set fragst = 'fragt' if is_plural else 'fragst' + % set base_url = object.env['ir.config_parameter'].sudo().get_param('web.external.url') ${partner.salutation}

@@ -73,6 +74,9 @@

Debora Alder-Gasser und das Team von Compassion

+

+ Unsubscribe from further mailing +

@@ -94,6 +98,7 @@ % set deine = 'eure' if is_plural else 'deine' % set findest = 'findet' if is_plural else 'findest' % set fragst = 'fragt' if is_plural else 'fragst' + % set base_url = object.env['ir.config_parameter'].sudo().get_param('web.external.url') ${partner.salutation}

@@ -121,6 +126,9 @@

Debora Alder-Gasser und das Team von Compassion

+

+ Unsubscribe from further mailing +

@@ -155,7 +163,7 @@ on_time - + 1 month communication @@ -168,7 +176,7 @@ on_time - + 2 month communication diff --git a/partner_communication_switzerland/i18n/de.po b/partner_communication_switzerland/i18n/de.po index 413e0b230..7057024b7 100644 --- a/partner_communication_switzerland/i18n/de.po +++ b/partner_communication_switzerland/i18n/de.po @@ -7597,110 +7597,4 @@ msgstr "Willkommen in der Familie von Compassion!" #. module: partner_communication_switzerland #: model_terms:ir.ui.view,arch_db:partner_communication_switzerland.zoom_registration_template msgid "um" -msgstr "" - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_postcard_and_magazine -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set hast = 'habt' if is_plural else 'hast'\n" -" % set kennst = 'kennt' if is_plural else 'kennst'\n" -" % set Melde = 'Meldet' if is_plural else 'Melde'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Danke!\n" -"

\n" -"

\n" -" Wir freuen uns, ${dir} das aktuelle Compassion-Magazin zu senden. Einmal pro Jahr berichten wir in diesem Format über den Impact, den wir gemeinsam erreicht haben, was unsere Herausforderungen und Ziele sind und was Menschen im globalen Süden und in der Schweiz bewegt. Viel Freude beim Schmökern und Entdecken!\n" -"

\n" -"

\n" -" Wenn ${du} Compassion noch nicht ${kennst}, ${hast} ${du} vielleicht noch viele Fragen. ${Melde} ${dich} gerne jederzeit bei uns.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " -msgstr "" - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_2nd_blog_post -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set du_upper = 'Ihr' if is_plural else 'Du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set deine = 'eure' if is_plural else 'deine'\n" -" % set findest = 'findet' if is_plural else 'findest'\n" -" % set fragst = 'fragt' if is_plural else 'fragst'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" ${du_upper} ${fragst} ${dich} vielleicht: \"Kinderpatenschaften kommen mir ein bisschen altmodisch vor. Sind sie wirklich noch relevant?\"\n" -"

\n" -"

\n" -" Es wird ${dich} wahrscheinlich nicht überraschen, dass wir hier bei Compassion sagen, dass Kinderpatenschaften relevanter sind als je zuvor. Mit fast 70 Jahren Erfahrung glauben wir immer noch, dass eine Kinderpatenschaft eine lohnenswerte Investition ist, die effektiv, nachhaltig und engagiert ist - sogar in Krisenzeiten wie einer globalen Pandemie. Aber warum? Lass es uns gemeinsam auspacken.\n" -"

\n" -"

\n" -" \n" -" Weiterlesen\n" -"

\n" -"

\n" -" Hier ${findest} ${du} Kinder, für die wir gerade dringend einen Paten oder eine Patin suchen.\n" -"

\n" -"

\n" -" Ja, ich möchte ein Kind mit einer Patenschaft unterstützen\n" -"

\n" -"

\n" -" Nochmals vielen Dank, denn gemeinsam verändern wir das Leben von Kindern - eins nach dem anderen.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " -msgstr "" - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_1st_blog_post -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set du_upper = 'Ihr' if is_plural else 'Du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set deine = 'eure' if is_plural else 'deine'\n" -" % set hast = 'habt' if is_plural else 'hast'\n" -" % set fragst = 'fragt' if is_plural else 'fragst'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Wir freuen uns, ${dich} kennenzulernen und ${dir} mehr davon zu erzählen, wie wir Kinder und Familien unterstützen, extreme Armut zu überwinden. ${du_upper} ${fragst} ${dich} vielleicht, was Kinderpatenschaften bringen, vielleicht sogar, ob sie sinnvoll sind oder ob nur christliche Kinder unterstützt werden? Gerne nehmen wir ${dich} mit und beantworten ${deine} Fragen.\n" -"

\n" -"

\n" -" \n" -" Weiterlesen\n" -"

\n" -"

\n" -" Nochmals vielen Dank: mit ${dir} zusammen befreien wir zurzeit mit rund 8'000 Partnerkirchen in 25 Ländern 2,2 Millionen Kinder aus extremer Armut. Gemeinsam ermöglichen wir den Kindern ein Leben mit Hoffnung und Zukunft.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " msgstr "" \ No newline at end of file diff --git a/partner_communication_switzerland/i18n/fr_CH.po b/partner_communication_switzerland/i18n/fr_CH.po index 5d40389d6..83333c34e 100644 --- a/partner_communication_switzerland/i18n/fr_CH.po +++ b/partner_communication_switzerland/i18n/fr_CH.po @@ -8473,183 +8473,4 @@ msgstr "Bienvenue dans la famille de Compassion" #. module: partner_communication_switzerland #: model_terms:ir.ui.view,arch_db:partner_communication_switzerland.zoom_registration_template msgid "um" -msgstr "" - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_postcard_and_magazine -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set hast = 'habt' if is_plural else 'hast'\n" -" % set kennst = 'kennt' if is_plural else 'kennst'\n" -" % set Melde = 'Meldet' if is_plural else 'Melde'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Danke!\n" -"

\n" -"

\n" -" Wir freuen uns, ${dir} das aktuelle Compassion-Magazin zu senden. Einmal pro Jahr berichten wir in diesem Format über den Impact, den wir gemeinsam erreicht haben, was unsere Herausforderungen und Ziele sind und was Menschen im globalen Süden und in der Schweiz bewegt. Viel Freude beim Schmökern und Entdecken!\n" -"

\n" -"

\n" -" Wenn ${du} Compassion noch nicht ${kennst}, ${hast} ${du} vielleicht noch viele Fragen. ${Melde} ${dich} gerne jederzeit bei uns.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " -msgstr "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Merci!\n" -"

\n" -"

\n" -" C’est une grande joie pour nous de vous adresser le dernier Magazine Compassion. Vous y découvrirez un aperçu de l'impact que nous avons obtenu ensemble, des défis de Compassion et de ce qui fait bouger les gens dans le Sud et en Suisse. Bonne lecture!\n" -"Vous ne connaissez pas encore bien Compassion? Vous avez peut-être des questions sur notre engagement, notre action. N'hésitez pas à prendre contact avec nous.\n" -"

\n" -"

\n" -" Christian Willi et l'équipe de Compassion vous saluent chaleureusement.\n" -"

\n" -" " - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_2nd_blog_post -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set du_upper = 'Ihr' if is_plural else 'Du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set deine = 'eure' if is_plural else 'deine'\n" -" % set findest = 'findet' if is_plural else 'findest'\n" -" % set fragst = 'fragt' if is_plural else 'fragst'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" ${du_upper} ${fragst} ${dich} vielleicht: \"Kinderpatenschaften kommen mir ein bisschen altmodisch vor. Sind sie wirklich noch relevant?\"\n" -"

\n" -"

\n" -" Es wird ${dich} wahrscheinlich nicht überraschen, dass wir hier bei Compassion sagen, dass Kinderpatenschaften relevanter sind als je zuvor. Mit fast 70 Jahren Erfahrung glauben wir immer noch, dass eine Kinderpatenschaft eine lohnenswerte Investition ist, die effektiv, nachhaltig und engagiert ist - sogar in Krisenzeiten wie einer globalen Pandemie. Aber warum? Lass es uns gemeinsam auspacken.\n" -"

\n" -"

\n" -" \n" -" Weiterlesen\n" -"

\n" -"

\n" -" Hier ${findest} ${du} Kinder, für die wir gerade dringend einen Paten oder eine Patin suchen.\n" -"

\n" -"

\n" -" Ja, ich möchte ein Kind mit einer Patenschaft unterstützen\n" -"

\n" -"

\n" -" Nochmals vielen Dank, denn gemeinsam verändern wir das Leben von Kindern - eins nach dem anderen.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " -msgstr "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -"Vous vous demandez peut-être si le parrainage d'enfants est encore vraiment pertinent à notre époque.\n" -"

\n" -"

\n" -" Vous ne serez probablement pas surpris d'apprendre qu'ici, à Compassion, nous affirmons que le parrainage d'enfants est une forme d’aide au développement plus pertinente que jamais. \n" -"

\n" -"

\n" -"Avec près de 70 ans d'expérience, nous observons que le parrainage d'enfants est un investissement utile, efficace et durable et ce, même en temps de crise comme une pandémie mondiale. Mais pourquoi? Découvrons-le de plus près.\n" -"

\n" -"

\n" -" \n" -" Lire la suite\n" -"

\n" -"

\n" -"Vous trouverez ici les enfants pour lesquels nous recherchons urgemment un parrain ou une marraine.\n" -"

\n" -"

\n" -" Oui, je souhaite soutenir un enfant par un parrainage.\n" -"

\n" -"

\n" -"Encore une fois merci. En effet, ensemble, nous changeons la vie des enfants - un après l’autre. \n" -"

\n" -"

\n" -"Chaleureuses salutations et à bientôt!\n" -"

\n" -"

\n" -"Christian Willi et l'équipe de Compassion\n" -"

\n" -" " - -#. module: partner_communication_switzerland -#: model:mail.template,body_html:partner_communication_switzerland.mail_new_donors_onboarding_1st_blog_post -msgid "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" % set dir = 'euch' if is_plural else 'dir'\n" -" % set du = 'ihr' if is_plural else 'du'\n" -" % set du_upper = 'Ihr' if is_plural else 'Du'\n" -" % set dich = 'euch' if is_plural else 'dich'\n" -" % set deine = 'eure' if is_plural else 'deine'\n" -" % set hast = 'habt' if is_plural else 'hast'\n" -" % set fragst = 'fragt' if is_plural else 'fragst'\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Wir freuen uns, ${dich} kennenzulernen und ${dir} mehr davon zu erzählen, wie wir Kinder und Familien unterstützen, extreme Armut zu überwinden. ${du_upper} ${fragst} ${dich} vielleicht, was Kinderpatenschaften bringen, vielleicht sogar, ob sie sinnvoll sind oder ob nur christliche Kinder unterstützt werden? Gerne nehmen wir ${dich} mit und beantworten ${deine} Fragen.\n" -"

\n" -"

\n" -" \n" -" Weiterlesen\n" -"

\n" -"

\n" -" Nochmals vielen Dank: mit ${dir} zusammen befreien wir zurzeit mit rund 8'000 Partnerkirchen in 25 Ländern 2,2 Millionen Kinder aus extremer Armut. Gemeinsam ermöglichen wir den Kindern ein Leben mit Hoffnung und Zukunft.\n" -"

\n" -"

\n" -" Herzliche Grüsse\n" -"

\n" -"

\n" -" Debora Alder-Gasser und das Team von Compassion\n" -"

\n" -" " -msgstr "

\n" -" % set partner = object.partner_id\n" -" % set is_plural = partner.title.plural or partner.title.id == 29\n" -" ${partner.salutation}\n" -"

\n" -"

\n" -" Nous nous réjouissons de faire votre connaissance et de vous en dire plus sur la manière dont nous aidons les enfants et les familles à surmonter l'extrême pauvreté. \n" -"Vous vous demandez peut-être ce qu'est le parrainage d'enfants, peut-être même s'il fait sens ou encore si seuls les enfants chrétiens sont soutenus? C’est un plaisir pour nous d’accompagner votre découverte de Compassion et de répondre à vos questions.\n" -"

\n" -"

\n" -" \n" -" Lire la suite\n" -"

\n" -"

\n" -" Encore une fois, merci: avec vous, nous sommes actuellement en train de soutenir 2,2 millions d'enfants, afin de les libérer de l'extrême pauvreté. Cet engagement, nous le menons en partenariat avec 8000 Eglises partenaires dans 25 pays.\n" -"

\n" -"

\n" -"Ensemble, nous pouvons donner à ces enfants une vie digne, pleine d'espoir pour un avenir meilleur. \n" -"

\n" -"

\n" -"Chaleureuses salutations et à bientôt.\n" -"

\n" -"

\n" -"Sarah et l'équipe de Compassion\n" -"

\n" -" " \ No newline at end of file +msgstr "" \ No newline at end of file diff --git a/partner_communication_switzerland/models/res_partner.py b/partner_communication_switzerland/models/res_partner.py index 55961c152..29f234680 100644 --- a/partner_communication_switzerland/models/res_partner.py +++ b/partner_communication_switzerland/models/res_partner.py @@ -9,6 +9,7 @@ ############################################################################## import logging from datetime import date +import hashlib from odoo import api, models, fields, _ from odoo.addons.auth_signup.models.res_partner import now @@ -50,6 +51,7 @@ class ResPartner(models.Model): onboarding_new_donor_start_date = fields.Date(help="Indicates when the first email of " "the new donor onboarding process was sent.", copy=False) + onboarding_new_donor_hash = fields.Char() def _get_salutation_fr_CH(self, informal=False): self.ensure_one() @@ -383,3 +385,4 @@ def start_new_donors_onboarding(self): }) partner.onboarding_new_donor_start_date = fields.Date.today() + partner.onboarding_new_donor_hash = hashlib.md5(f"{partner.id}".encode()).hexdigest() diff --git a/partner_communication_switzerland/templates/onboarding_unsubscribe.xml b/partner_communication_switzerland/templates/onboarding_unsubscribe.xml new file mode 100644 index 000000000..e0e11270d --- /dev/null +++ b/partner_communication_switzerland/templates/onboarding_unsubscribe.xml @@ -0,0 +1,41 @@ + + + + + + \ No newline at end of file From ae193331c087212a60fe6065c98e8c2cac34a4e7 Mon Sep 17 00:00:00 2001 From: Jonathan Guerne Date: Thu, 5 Aug 2021 15:56:35 +0200 Subject: [PATCH 04/15] CO-3725 use uuid to generate random hash --- partner_communication_switzerland/models/res_partner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/partner_communication_switzerland/models/res_partner.py b/partner_communication_switzerland/models/res_partner.py index 29f234680..fef5770d6 100644 --- a/partner_communication_switzerland/models/res_partner.py +++ b/partner_communication_switzerland/models/res_partner.py @@ -9,7 +9,7 @@ ############################################################################## import logging from datetime import date -import hashlib +import uuid from odoo import api, models, fields, _ from odoo.addons.auth_signup.models.res_partner import now @@ -385,4 +385,4 @@ def start_new_donors_onboarding(self): }) partner.onboarding_new_donor_start_date = fields.Date.today() - partner.onboarding_new_donor_hash = hashlib.md5(f"{partner.id}".encode()).hexdigest() + partner.onboarding_new_donor_hash = uuid.uuid4() From d0842320b91f4b46033ea3590bf0c42c4a60df2c Mon Sep 17 00:00:00 2001 From: Jonathan Guerne Date: Tue, 10 Aug 2021 10:26:16 +0200 Subject: [PATCH 05/15] CO-3730 change utm.campaign amount and linked view (#1396) * CO-3730 change utm.campaign amount and linked view * CO-3730 changes based on review --- mass_mailing_switzerland/__manifest__.py | 1 + .../models/analytic_account.py | 7 +++++- mass_mailing_switzerland/models/utm.py | 25 +++++++++++++++++++ .../views/account_analytic_line_view.xml | 24 ++++++++++++++++++ mass_mailing_switzerland/views/utm_view.xml | 4 +-- 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 mass_mailing_switzerland/views/account_analytic_line_view.xml diff --git a/mass_mailing_switzerland/__manifest__.py b/mass_mailing_switzerland/__manifest__.py index 9b771a808..8f70ff27a 100644 --- a/mass_mailing_switzerland/__manifest__.py +++ b/mass_mailing_switzerland/__manifest__.py @@ -48,6 +48,7 @@ "views/mass_mailing_contact_view.xml", "views/mass_mailing_settings_view.xml", "views/generate_link_wizard_view.xml", + "views/account_analytic_line_view.xml", ], "depends": [ "mail_tracking", # oca_addons/social diff --git a/mass_mailing_switzerland/models/analytic_account.py b/mass_mailing_switzerland/models/analytic_account.py index 2e4b300b4..f405e498e 100644 --- a/mass_mailing_switzerland/models/analytic_account.py +++ b/mass_mailing_switzerland/models/analytic_account.py @@ -11,7 +11,12 @@ class AnalyticAccount(models.Model): - _inherit = "account.analytic.account" campaign_id = fields.Many2one("utm.campaign", readonly=False) + + +class AnalyticLine(models.Model): + _inherit = "account.analytic.line" + + state = fields.Selection(related='move_id.invoice_id.state', readonly=True) diff --git a/mass_mailing_switzerland/models/utm.py b/mass_mailing_switzerland/models/utm.py index 2d40b766f..93517fbc2 100644 --- a/mass_mailing_switzerland/models/utm.py +++ b/mass_mailing_switzerland/models/utm.py @@ -204,6 +204,31 @@ class UtmCampaign(models.Model): compute="_compute_click_count", store=True, readonly=True ) + def open_analytic_lines(self): + return { + "name": _("Analytic Lines"), + "type": "ir.actions.act_window", + "view_type": "form", + "view_mode": "tree", + "res_model": "account.analytic.line", + "views": [(self.env.ref("mass_mailing_switzerland.view_analytic_line_tree_utm").id, "tree")], + "domain": [("account_id.campaign_id", "=", self.id)], + "target": "current", + } + + def _compute_total_donation(self): + # Put a nice formatting + for utm in self: + lines = self.env["account.analytic.line"].search( + [("account_id.campaign_id", "=", utm.id)] + ) + utm.donation_amount = sum(lines.mapped("amount")) + utm.total_donation = ( + "CHF {:,.2f}".format(utm.donation_amount) + .replace(".00", ".-") + .replace(",", "'") + ) + def _compute_mass_mailing_id(self): for campaign in self: campaign.mailing_campaign_id = self.env[ diff --git a/mass_mailing_switzerland/views/account_analytic_line_view.xml b/mass_mailing_switzerland/views/account_analytic_line_view.xml new file mode 100644 index 000000000..bb1690cae --- /dev/null +++ b/mass_mailing_switzerland/views/account_analytic_line_view.xml @@ -0,0 +1,24 @@ + + + + + + account.analytic.line.utm.tree + account.analytic.line + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mass_mailing_switzerland/views/utm_view.xml b/mass_mailing_switzerland/views/utm_view.xml index b86c04925..344c2f840 100644 --- a/mass_mailing_switzerland/views/utm_view.xml +++ b/mass_mailing_switzerland/views/utm_view.xml @@ -106,8 +106,8 @@ - From b51fea207ce237b2da4896c286fc5f225275d6b2 Mon Sep 17 00:00:00 2001 From: Emanuel Cino Date: Thu, 12 Aug 2021 15:26:00 +0200 Subject: [PATCH 08/15] CS-486 open link in new tab and add translations --- website_compassion/i18n/de.po | 195 ++++++++++-------- website_compassion/i18n/fr_CH.po | 100 +++++---- website_compassion/i18n/it.po | 69 +++++-- .../template/my_account_write_a_letter.xml | 4 +- 4 files changed, 224 insertions(+), 144 deletions(-) diff --git a/website_compassion/i18n/de.po b/website_compassion/i18n/de.po index d10c79e19..a306273a4 100644 --- a/website_compassion/i18n/de.po +++ b/website_compassion/i18n/de.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 08:55+0000\n" -"PO-Revision-Date: 2021-07-13 10:57+0200\n" +"POT-Creation-Date: 2021-08-12 12:27+0000\n" +"PO-Revision-Date: 2021-08-12 15:23+0200\n" "Last-Translator: Emanuel Cino \n" "Language-Team: \n" "Language: de\n" @@ -67,7 +67,7 @@ msgstr "Betrag
" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_gift_history msgid "Child" -msgstr "Kind
" +msgstr "Kind" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.display_letters @@ -141,17 +141,17 @@ msgstr "So geht's" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_page_template msgid "Active sponsorships" -msgstr "Aktive Patenschaften
" +msgstr "Aktive Patenschaften" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "Add image" -msgstr "Bild hochladen
" +msgstr "Bild hochladen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_gift_history msgid "Donations history" -msgstr "Zahlungsverlauf" +msgstr "Spendenverlauf" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_letters @@ -231,7 +231,7 @@ msgstr "Beendete Patenschaften" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options msgid "Total additional amount" -msgstr "Total zusätzlicher Spenden durch Patenschaft Plus" +msgstr "Total zusätzliche Spenden durch Patenschaft Plus" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content @@ -333,12 +333,12 @@ msgstr "Bild hinzufügen" #: model:ir.model.fields,field_description:website_compassion.field_cms_form_payment_options__additional_amount #: model:ir.model.fields,field_description:website_compassion.field_cms_form_payment_options_multiple__additional_amount msgid "Additional Amount" -msgstr "Zusätzlicher Spenden durch Patenschaft Plus" +msgstr "Zusätzliche Spenden durch Patenschaft Plus" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Additional amount" -msgstr "Zusätzlicher Spenden durch Patenschaft Plus" +msgstr "Zusätzliche Spenden durch Patenschaft Plus" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info @@ -390,17 +390,17 @@ msgstr "Ändern" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.children_horizontal_cards msgid "Child image" -msgstr "Child image" +msgstr "Bild für Kinder" #. module: website_compassion #: model:ir.model,name:website_compassion.model_compassion_child_pictures msgid "Child picture" -msgstr "Child picture" +msgstr "Patenkind Bild" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data msgid "Child protection charter" -msgstr "Kinderschutz-Charta" +msgstr "Kinderschutzerklärung" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_templates @@ -410,7 +410,7 @@ msgstr "Wähle ein Briefpapier" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "Choose one topic per letter" -msgstr "Wähle ein Thema pro Brief" +msgstr "Nimm dir nur ein Thema pro Brief vor" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal @@ -420,7 +420,7 @@ msgstr "Stadt" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "Close" -msgstr "Schließen" +msgstr "Schliessen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info @@ -452,7 +452,7 @@ msgstr "Einstellungen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Community" -msgstr "Gemeinschaft" +msgstr "Umfeld" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.contact_us_page_template @@ -476,7 +476,7 @@ msgstr "" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Compassion center" -msgstr "Compassionzentrum" +msgstr "Kinderzentrum" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -487,8 +487,8 @@ msgid "" msgstr "" "Compassion nimmt auch den Schutz deiner Daten sehr ernst. Alle deine Angaben " "werden vertraulich behandelt und nur intern verwendet. Du kannst unsere " -"Datenschutzbestimmungen hier einsehen und die Kinderschutz-Charta hier " -"unterzeichnen.&nbsp;" +"Datenschutzbestimmungen hier einsehen und die Kinderschutzerklärung hier " +"unterzeichnen." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -531,7 +531,7 @@ msgstr "Erledigt!" #. module: website_compassion #: model:ir.model,name:website_compassion.model_correspondence_template msgid "Correspondence template" -msgstr "Correspondence template" +msgstr "Korrespondenzvorlage" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal @@ -621,7 +621,7 @@ msgstr "Schulstufe" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal msgid "Email / login" -msgstr "Email / Login" +msgstr "E-Mail / Login" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content @@ -641,12 +641,12 @@ msgstr "Familie" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Family information" -msgstr "&nbsp;Infos über die Familie" +msgstr "Infos über die Familie" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Father/representative's job" -msgstr "Arbeit des Vaters/Erziehungsberechtigten" +msgstr "Arbeit des Vaters/Betreuers" #. module: website_compassion #: model:ir.model,name:website_compassion.model_cms_form_match_partner @@ -722,9 +722,7 @@ msgstr "" msgid "" "If you are not yet registered, you can create an account by clicking on the " "button below." -msgstr "" -"Wenn du noch nicht registriert bist, kannst du ein Profil kreieren, indem du " -"auf \"Jetzt anmelden\" klickst." +msgstr "Wenn du noch nicht registriert bist, kannst du ein Profil kreieren." #. module: website_compassion #: code:addons/website_compassion/forms/contact_us_form.py:42 @@ -766,7 +764,7 @@ msgstr "Zuletzt verändert am" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Legal representatives" -msgstr "Erziehungsverantwortliche" +msgstr "Betreuer" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_letters @@ -788,6 +786,11 @@ msgstr "Login" msgid "Make a donation" msgstr "Spenden" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Make sure that any image you upload does not exceed 10Mb." +msgstr "Stell dich sicher, dass jedes Bild 10 MB nicht überschreitet." + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Merge groups" @@ -802,12 +805,12 @@ msgstr "Zahlungsarten zusammenführen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal msgid "Mobile" -msgstr "Mobil" +msgstr "Telefonnnummer" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Mother/representative's job" -msgstr "Arbeit der Mutter/Erziehungsberechtigten" +msgstr "Arbeit der Mutter/Betreuerin" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_account_layout @@ -837,17 +840,17 @@ msgstr "Meine Briefe" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options msgid "My payment options" -msgstr "Meine Zahlungs-Einstellungen" +msgstr "Meine Spendeneinstellungen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_account_layout msgid "My personal data" -msgstr "Meine persönliche Daten" +msgstr "Meine persönlichen Daten" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_page_template msgid "My personal data |" -msgstr "Meine Persönliche Informationen |" +msgstr "Meine persönlichen Informationen" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal @@ -884,7 +887,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Number of Write and Pray children" -msgstr "Anzahl write&pray-Patenschaften" +msgstr "Anzahl Write&Pray-Patenschaften" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple @@ -905,7 +908,7 @@ msgstr "Anzahl der Kinder im Zentrum" #: code:addons/website_compassion/forms/contact_us_form.py:111 #, python-format msgid "Original request from %s %s " -msgstr "Original request from %s %s " +msgstr "Anfrage von %s %s " #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_cms_form_claim_contact_us__partner_id @@ -951,13 +954,13 @@ msgstr "Spendenmethode" #: code:addons/website_compassion/forms/my_donations_form.py:67 #, python-format msgid "Payment options" -msgstr "Zahlungs-Einstellungen" +msgstr "Zahlungseinstellungen" #. module: website_compassion #: code:addons/website_compassion/forms/my_donations_form.py:75 #, python-format msgid "Payment options updated." -msgstr "Zahlungs-Einstellungen aktualisiert." +msgstr "Zahlungseinstellungen aktualisiert." #. module: website_compassion #: selection:cms.form.payment.options,payment_mode:0 @@ -1006,12 +1009,12 @@ msgstr "Bitte erwähne nie:" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Population" -msgstr "Bevölkerung:" +msgstr "Bevölkerung" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_communication_pref msgid "Postal mail" -msgstr "Postadresse" +msgstr "Informationen per Post erhalten" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.contact_us_page_template @@ -1091,7 +1094,7 @@ msgstr "Senden" #: code:addons/website_compassion/forms/contact_us_form.py:47 #, python-format msgid "Send message" -msgstr "Absenden" +msgstr "Nachricht senden" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions @@ -1104,18 +1107,17 @@ msgid "" "Send your letter to Compassion Switzerland, Rue Galilée 3, 1400 Yverdon-les-" "Bains." msgstr "" -"Schicke deine Briefe an Compassion Schweiz, Effingerstrasse 10, 3011 " -"Bern&nbsp;" +"Schicke deine Briefe an Compassion Schweiz, Effingerstrasse 10, 3011 Bern." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "Share a bible story that you like" -msgstr "Teile eine Geschichte der Bibel, die du besonders magst" +msgstr "Teile eine Geschichte aus der Bibel, die du besonders magst" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data msgid "Sign Child Protection Charter" -msgstr "Charta unterschreiben" +msgstr "Unterschreiben" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.register_layout @@ -1125,7 +1127,7 @@ msgstr "Registrieren" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.register_layout msgid "Signup now" -msgstr "Jetzt anmelden" +msgstr "Jetzt registrieren" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.event_robots @@ -1147,13 +1149,18 @@ msgid "" "by Compassion." msgstr "" "Die Patenschaft PLUS ermöglicht die Finanzierung dringender Bedürfnisse oder " -"von Bedürfnissen, die durch die Patenschaftsgelder nicht gedeckt sind (z.B." -"Naturkatastrophen, chirurgische Eingriffe,Malariaprävention,usw.)" +"von Bedürfnissen, die durch die Patenschaftsspenden nicht gedeckt sind (z.B." +"Naturkatastrophen, chirurgische Eingriffe, Malariaprävention,usw.)" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal msgid "Street" -msgstr "Straße" +msgstr "Strasse" + +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Technical Recommendation" +msgstr "Technische Empfehlung" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.contact_us_page_template @@ -1172,8 +1179,8 @@ msgid "" "Tell simple stories about your life, your village or town, your hobbies, " "your work and your family" msgstr "" -"Erzähle über einfache Dinge in deinem Leben bspw. von deinem Dorf, deiner " -"Stadt, deinen Hobbies, deiner Arbeit, deiner Familie" +"Erzähle über einfache Dinge in deinem Leben bspw. von deinem zu Hause, " +"deinen Hobbies, deiner Arbeit, deiner Familie" #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_correspondence_template__template_image_url @@ -1202,17 +1209,32 @@ msgid "" "payments may not be included in the tax receipt." msgstr "" "Die Buchhaltung dieses Jahres ist noch nicht abgeschlossen. Deine letzten " -"Zahlungen sind eventuell hier noch nicht erfasst." +"Zahlungen sind hier eventuell noch nicht erfasst." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "The address of Compassion Switzerland" msgstr "Die Adresse von Compassion Schweiz" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +msgid "" +"The image file is too large to be uploaded. You can still send this picture " +"if you first resize it with" +msgstr "Leider ist die Bilddatei zu gross. Bitte komprimiere die Grösse mit" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "The images that are selected multiple times are ignored" -msgstr "The images that are selected multiple times are ignored" +msgstr "" + +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "" +"There are many easy-to-use solution to resize an image.
for example" +msgstr "" +"Es gibt viele benutzerfreundliche Lösungen, um die Grösse eines Bildes zu " +"ändern.
Zum Beispiel" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions @@ -1223,18 +1245,23 @@ msgid "" msgstr "" "Beim Erstellen der Vorschau ist ein Fehler aufgetreten. Achte darauf, dass " "du einen Text eingegeben hast und dass die Anhänge ein gültiges Format " -"haben. Kontaktiere info@compassion.ch, wenn es nicht funktioniert." +"haben. Kontaktiere uns, wenn es nicht funktioniert." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "" -"There was an error while submitting your letter. Please copy your text to " -"make sure you won't lose it and contact us at info@compassion.ch for " -"signaling the issue." +"There was an error while submitting your letter.
\n" +" Please try again later and/or try to reboot your computer." +"
\n" +" If the error still persist, copy your text to make sure you " +"won't lose it and contact us at info@compassion.ch for signaling the issue." msgstr "" -"Bei der Übermittlung des Briefes ist ein Fehler aufgetreten. Bitte kopiere " -"deinen Text in ein externes Dokument, damit er nicht verlorengeht, und " -"kontaktiere info@compassion.ch, damit wir das Problem lösen können." +"Bei der Übermittlung des Briefes ist ein Fehler aufgetreten.
\n" +"Bitte kopiere deinen Text in ein externes Dokument, damit er nicht " +"verlorengeht.
\n" +"Bitte versuch es noch später und/oder restart dein Computer.
\n" +"Wenn der Fehler weiterhin besteht, kontaktiere uns auf info@compassion.ch, " +"damit wir das Problem lösen können." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options @@ -1242,7 +1269,7 @@ msgid "This amount supports children that are not yet sponsored." msgstr "" "Die Patenschaft PLUS ermöglicht die Finanzierung dringender Bedürfnisse oder " "von Bedürfnissen, die durch die Patenschaftsgelder nicht gedeckt sind (z.B." -"Naturkatastrophen, chirurgische Eingriffe,Malariaprävention,usw.)" +"Naturkatastrophen, chirurgische Eingriffe, Malariaprävention,usw.)" #. module: website_compassion #: model:ir.model.fields,help:website_compassion.field_cms_form_partner_delivery__spoken_lang_ids @@ -1250,14 +1277,14 @@ msgid "" "This is useful for checking translation needs on your correspondence with " "your children." msgstr "" -"Das hilft uns, schneller festzustellen, welche Briefe an deine Patenkinder " -"eine Übersetzung brauchen. " +"Das hilft uns, schneller festzustellen, welche Briefe von deinen " +"Patenkindern eine Übersetzung brauchen. " #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_letters #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_pictures msgid "This may take a few minutes... Please wait" -msgstr "das kann einenis may take a few minutes... Pleat" +msgstr "Es kann ein paar Minuten dauern...Bitte warte kurz" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_profile_picture @@ -1267,7 +1294,7 @@ msgid "" msgstr "" "Dieses Bild wird verwendet, wenn du auf unserer Crowdfunding-Plattform " "TOGETHER ein Projekt startest oder dich einem Projekt anschliesst, oder wenn " -"du dich für einen Muskathlon anmeldest.&nbsp;" +"du dich für einen Muskathlon anmeldest." #. module: website_compassion #: model:ir.model.fields,help:website_compassion.field_cms_form_partner_delivery__lang @@ -1287,12 +1314,12 @@ msgstr "Toggle navigation" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Total additional amount" -msgstr "Total zusätzlicher Spenden durch Patenschaft Plus" +msgstr "Total zusätzliche Spenden durch Patenschaft Plus" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info msgid "Typical food" -msgstr "Typisches Essen:" +msgstr "Typisches Essen" #. module: website_compassion #: model:ir.model.fields,help:website_compassion.field_cms_form_partner_delivery__no_physical_letter @@ -1318,7 +1345,7 @@ msgstr "User-agent: *" #. module: website_compassion #: model:ir.model,name:website_compassion.model_res_users msgid "Users" -msgstr "Users" +msgstr "Benutzer" #. module: website_compassion #: code:addons/website_compassion/forms/partner_forms.py:106 @@ -1334,7 +1361,7 @@ msgstr "Ansicht" #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_correspondence_template__website_published msgid "Visible on current website" -msgstr "Visible on current website" +msgstr "Auf der aktuellen Website sichtbar" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -1345,7 +1372,7 @@ msgid "" "our values." msgstr "" "Wir bitten unsere freiwilligen Mitarbeitenden und alle, die ihr Patenkind " -"besuchen wollen, die Kinderschutz-Charta zu unterzeichnen. Wenn du jetzt " +"besuchen wollen, die Kinderschutzerklärung zu unterzeichnen. Wenn du jetzt " "schon einen Schritt weitergehen willst, kannst du die Charta auch " "unterzeichnen und so zeigen, dass du unsere Werte teilst." @@ -1355,8 +1382,8 @@ msgid "" "We serve our sponsors and donors in German, French and Italian. Why not " "change to your preferred language and expand your journey with Compassion?" msgstr "" -"We serve our sponsors and donors in German, French and Italian. Why not " -"change to your preferred language and expand your journey with Compassion?" +"Wir kommunizieren auf Deutsch, Französisch und Italienisch. Möchtest du " +"deine Sprache ändern?" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -1364,7 +1391,7 @@ msgid "" "We thank you that you have signed our child protection charter. You can " "review the document at any time from here." msgstr "" -"Danke, dass du die Kinderschutz-Charta unterschrieben hast. Du kannst das " +"Danke, dass du die Kinderschutzerklärung unterschrieben hast. Du kannst das " "Dokument hier jederzeit wieder ansehen." #. module: website_compassion @@ -1415,7 +1442,7 @@ msgstr "Tipps zum Schreiben" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_tax_receipt msgid "Year:" -msgstr "Jahr:" +msgstr "Jahr" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content @@ -1446,13 +1473,14 @@ msgstr "Deine Postadresse" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "Your social media contact (Facebook or other platforms)" -msgstr "Deine Kontaktdaten von Facebook oder anderen sozialen Medien" +msgstr "Deinen Facebook-Kontakt oder andere soziale Medien" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content msgid "and stick them on any piece of paper, card, attachment." msgstr "" -"und klebe auf jeden Brief (jede Karte, alle Aufkleber und Zeichnungen etc.)" +"und klebe sie auf jeden Brief (jede Karte, alle Aufkleber und Zeichnungen " +"etc.)" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_horizontal_pictures @@ -1506,7 +1534,6 @@ msgstr "https://compassion.ch/de/die-reise-eines-briefes/" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data -#| msgid "https://compassion.ch/le-voyage-de-vos-lettres" msgid "https://compassion.ch/protection-des-donnees/" msgstr "https://compassion.ch/de/datenschutz/" @@ -1536,6 +1563,12 @@ msgstr "mycompassion@compassion.ch" msgid "open map" msgstr "Routen-planer" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "punchi.me" +msgstr "punchi.me" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_horizontal_pictures msgid "selectElement" @@ -1549,21 +1582,9 @@ msgstr "sitemap.xml" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.sponsor_a_child msgid "this link" -msgstr "Klicke hier, um eine Patenschaft zu beginnen." +msgstr "Klicke hier, um eine Patenschaft zu beginnen" #. module: website_compassion #: model:ir.model,name:website_compassion.model_website_compassion_form_widget_textarea msgid "website_compassion.form.widget.textarea" msgstr "website_compassion.form.widget.textarea" - -#~ msgid "Your child reference:" -#~ msgstr "Die Referenznummer deines Patenkindes:" - -#~ msgid "Your sponsor reference:" -#~ msgstr "Deine Referenznummer:" - -#~ msgid "Communication name" -#~ msgstr "Persönliche Anrede" - -#~ msgid "Project name" -#~ msgstr "Name des Kinderzentrums:" diff --git a/website_compassion/i18n/fr_CH.po b/website_compassion/i18n/fr_CH.po index b625e8085..5fa574d35 100644 --- a/website_compassion/i18n/fr_CH.po +++ b/website_compassion/i18n/fr_CH.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 08:55+0000\n" -"PO-Revision-Date: 2021-07-13 10:56+0200\n" +"POT-Creation-Date: 2021-08-12 12:27+0000\n" +"PO-Revision-Date: 2021-08-12 14:34+0200\n" "Last-Translator: Emanuel Cino \n" "Language-Team: \n" "Language: fr_CH\n" @@ -391,12 +391,12 @@ msgstr "Modifier" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.children_horizontal_cards msgid "Child image" -msgstr "Child image" +msgstr "Image enfant" #. module: website_compassion #: model:ir.model,name:website_compassion.model_compassion_child_pictures msgid "Child picture" -msgstr "Child picture" +msgstr "Photo enfant" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -532,7 +532,7 @@ msgstr "Coordonnées mises à jour." #. module: website_compassion #: model:ir.model,name:website_compassion.model_correspondence_template msgid "Correspondence template" -msgstr "Correspondence template" +msgstr "Modèle de correspondance" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_personal @@ -789,6 +789,12 @@ msgstr "Connexion" msgid "Make a donation" msgstr "Faire un don" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Make sure that any image you upload does not exceed 10Mb." +msgstr "" +"Assurez-vous que toute image que vous téléchargez ne dépasse pas 10 Mo." + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Merge groups" @@ -813,12 +819,12 @@ msgstr "Travail de la mère / représentante légale" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_account_layout msgid "My children" -msgstr "Mes enfants" +msgstr "Mes parrainages" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_page_template msgid "My children |" -msgstr "Mes enfants | " +msgstr "Mes parrainages | " #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_account_layout @@ -906,12 +912,12 @@ msgstr "Nombre d'enfants parrainés" #: code:addons/website_compassion/forms/contact_us_form.py:111 #, python-format msgid "Original request from %s %s " -msgstr "Original request from %s %s " +msgstr "Demande initiale de %s %s " #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_cms_form_claim_contact_us__partner_id msgid "Partner" -msgstr "Partner" +msgstr "Partenaire" #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_cms_form_payment_options__payment_frequency @@ -1053,7 +1059,7 @@ msgstr "Image de profil" #. module: website_compassion #: model:ir.model,name:website_compassion.model_compassion_project msgid "Project Geolocation Point" -msgstr "Project Geolocation Point" +msgstr "Point de géolocalisation du projet" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_children_info @@ -1157,6 +1163,11 @@ msgstr "" msgid "Street" msgstr "Rue" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Technical Recommendation" +msgstr "Recommandation technique" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.contact_us_page_template msgid "" @@ -1180,12 +1191,12 @@ msgstr "" #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_correspondence_template__template_image_url msgid "Template Image Url" -msgstr "Template Image Url" +msgstr "Url de l’image du modèle" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_templates msgid "Template image" -msgstr "Template image" +msgstr "Image de modèle" #. module: website_compassion #: code:addons/website_compassion/forms/contact_us_form.py:51 @@ -1211,10 +1222,27 @@ msgstr "" msgid "The address of Compassion Switzerland" msgstr "L'adresse de Compassion Suisse" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +msgid "" +"The image file is too large to be uploaded. You can still send this picture " +"if you first resize it with" +msgstr "" +"Le fichier image est trop volumineux pour être téléchargé. Vous pouvez " +"toujours envoyer cette image si vous la redimensionnez d’abord avec" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "The images that are selected multiple times are ignored" -msgstr "The images that are selected multiple times are ignored" +msgstr "Les images sélectionnées plusieurs fois sont ignorées" + +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "" +"There are many easy-to-use solution to resize an image.
for example" +msgstr "" +"Il existe de nombreuses solutions faciles à utiliser pour redimensionner une " +"image.
par exemple" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions @@ -1225,19 +1253,24 @@ msgid "" msgstr "" "Une erreur s'est produite au moment d'afficher l'aperçu. Veuillez vérifier " "d'avoir introduit du texte et que vos pièces jointes sont au bon format. " -"Merci de nous contacter à info@compassion.ch si le problème persiste." +"Merci de nous contacter si le problème persiste." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "" -"There was an error while submitting your letter. Please copy your text to " -"make sure you won't lose it and contact us at info@compassion.ch for " -"signaling the issue." +"There was an error while submitting your letter.
\n" +" Please try again later and/or try to reboot your computer." +"
\n" +" If the error still persist, copy your text to make sure you " +"won't lose it and contact us at info@compassion.ch for signaling the issue." msgstr "" -"Une erreur s'est produite au moment de l'envoi de votre lettre. Veuillez " -"copier votre texte et le sauvegarder ailleurs afin de ne pas le perdre. " -"Merci de nous contacter à info@compassion.ch ensuite pour nous signaler le " -"problème." +"Une erreur s'est produite au moment de l'envoi de votre lettre.
\n" +"Veuillez copier votre texte et le sauvegarder ailleurs afin de ne pas le " +"perdre.
\n" +"Veuillez réessayer ultérieurement et/ou essayez de redémarrer votre " +"ordinateur.
\n" +"Si l'erreur persiste, Merci de nous contacter à info@compassion.ch pour nous " +"signaler le problème." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options @@ -1286,7 +1319,7 @@ msgstr "Titre" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_account_layout msgid "Toggle navigation" -msgstr "Toggle navigation" +msgstr "Activer la navigation" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple @@ -1321,7 +1354,7 @@ msgstr "User-agent: *" #. module: website_compassion #: model:ir.model,name:website_compassion.model_res_users msgid "Users" -msgstr "" +msgstr "Utilisateurs" #. module: website_compassion #: code:addons/website_compassion/forms/partner_forms.py:106 @@ -1337,7 +1370,7 @@ msgstr "Voir" #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_correspondence_template__website_published msgid "Visible on current website" -msgstr "Visible on current website" +msgstr "Visible sur le site web actuel" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data @@ -1509,7 +1542,6 @@ msgstr "https://compassion.ch/le-voyage-de-vos-lettres" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_information_privacy_data -#| msgid "https://compassion.ch/le-voyage-de-vos-lettres" msgid "https://compassion.ch/protection-des-donnees/" msgstr "https://compassion.ch/protection-des-donnees/" @@ -1539,6 +1571,12 @@ msgstr "mycompassion@compassion.ch" msgid "open map" msgstr "itinéraire" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "punchi.me" +msgstr "punchi.me" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_horizontal_pictures msgid "selectElement" @@ -1558,15 +1596,3 @@ msgstr "en cliquant ici" #: model:ir.model,name:website_compassion.model_website_compassion_form_widget_textarea msgid "website_compassion.form.widget.textarea" msgstr "website_compassion.form.widget.textarea" - -#~ msgid "Your child reference:" -#~ msgstr "La référence de votre enfant :" - -#~ msgid "Your sponsor reference:" -#~ msgstr "Votre référence :" - -#~ msgid "Communication name" -#~ msgstr "Nom de correspondance" - -#~ msgid "Project name" -#~ msgstr "Nom du centre d'accueil" diff --git a/website_compassion/i18n/it.po b/website_compassion/i18n/it.po index e0ce0b74b..3ea6714ea 100644 --- a/website_compassion/i18n/it.po +++ b/website_compassion/i18n/it.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-13 08:55+0000\n" -"PO-Revision-Date: 2021-07-13 11:02+0200\n" +"POT-Creation-Date: 2021-08-12 12:27+0000\n" +"PO-Revision-Date: 2021-08-12 14:51+0200\n" "Last-Translator: Emanuel Cino \n" "Language-Team: \n" "Language: it\n" @@ -789,6 +789,11 @@ msgstr "Accedi" msgid "Make a donation" msgstr "Fare una donazione" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Make sure that any image you upload does not exceed 10Mb." +msgstr "Assicurati che qualsiasi immagine caricata non superi i 10 Mb." + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options_multiple msgid "Merge groups" @@ -906,7 +911,7 @@ msgstr "Numero di bambini registrati" #: code:addons/website_compassion/forms/contact_us_form.py:111 #, python-format msgid "Original request from %s %s " -msgstr "Original request from %s %s " +msgstr "Richiesta originale da parte %s %s " #. module: website_compassion #: model:ir.model.fields,field_description:website_compassion.field_cms_form_claim_contact_us__partner_id @@ -1157,6 +1162,11 @@ msgstr "" msgid "Street" msgstr "Indirizzo" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "Technical Recommendation" +msgstr "Raccomandazione tecnica" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.contact_us_page_template msgid "" @@ -1211,10 +1221,28 @@ msgstr "" msgid "The address of Compassion Switzerland" msgstr "Indirizzo di Compassion Svizzera." +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +msgid "" +"The image file is too large to be uploaded. You can still send this picture " +"if you first resize it with" +msgstr "" +"Il file di immagine è troppo grande per essere caricato. È comunque " +"possibile inviare questa immagine se la si ridimensiona per la prima volta " +"con" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "The images that are selected multiple times are ignored" -msgstr "The images that are selected multiple times are ignored" +msgstr "Le immagini selezionate più volte vengono ignorate" + +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "" +"There are many easy-to-use solution to resize an image.
for example" +msgstr "" +"Esistono molte soluzioni facili da usare per ridimensionare un'immagine.
Per esempio" #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions @@ -1225,18 +1253,23 @@ msgid "" msgstr "" "Si è verificato un errore durante la visualizzazione dell'anteprima. " "Controlla di aver inserito il testo e che i tuoi allegati siano nel formato " -"corretto. Contattaci (info@compassion.ch) se il problema persiste. " +"corretto. Contattaci se il problema persiste. " #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions msgid "" -"There was an error while submitting your letter. Please copy your text to " -"make sure you won't lose it and contact us at info@compassion.ch for " -"signaling the issue." +"There was an error while submitting your letter.
\n" +" Please try again later and/or try to reboot your computer." +"
\n" +" If the error still persist, copy your text to make sure you " +"won't lose it and contact us at info@compassion.ch for signaling the issue." msgstr "" -"Si è verificato un errore durante l'invio della tua lettera. Per favore, " -"copia il tuo testo e salvalo altrove, in modo che non vada perso. Contattaci " -"(info@compassion.ch) in seguito per segnalare il problema." +"Si è verificato un errore durante l'invio della tua lettera.
\n" +"Per favore, copia il tuo testo e salvalo altrove, in modo che non vada " +"perso.
\n" +"Riprovare più tardi e/o provare a riavviare il computer.
\n" +"Se l'errore persiste, contattaci a info@compassion.ch per segnalare il " +"problema." #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.my_donations_payment_options @@ -1320,7 +1353,7 @@ msgstr "User-agent: *" #. module: website_compassion #: model:ir.model,name:website_compassion.model_res_users msgid "Users" -msgstr "Users" +msgstr "Utenti" #. module: website_compassion #: code:addons/website_compassion/forms/partner_forms.py:106 @@ -1539,6 +1572,12 @@ msgstr "mycompassion@compassion.ch" msgid "open map" msgstr "Indicazioni stradali" +#. module: website_compassion +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_actions +#: model_terms:ir.ui.view,arch_db:website_compassion.letter_text_content +msgid "punchi.me" +msgstr "punchi.me" + #. module: website_compassion #: model_terms:ir.ui.view,arch_db:website_compassion.letter_horizontal_pictures msgid "selectElement" @@ -1558,9 +1597,3 @@ msgstr "cliccando qui" #: model:ir.model,name:website_compassion.model_website_compassion_form_widget_textarea msgid "website_compassion.form.widget.textarea" msgstr "website_compassion.form.widget.textarea" - -#~ msgid "Your child reference:" -#~ msgstr "Il numero di riferimento del bambino:" - -#~ msgid "Your sponsor reference:" -#~ msgstr "Il tuo numero di riferimento:" diff --git a/website_compassion/template/my_account_write_a_letter.xml b/website_compassion/template/my_account_write_a_letter.xml index 18d2a82f7..e8e831313 100644 --- a/website_compassion/template/my_account_write_a_letter.xml +++ b/website_compassion/template/my_account_write_a_letter.xml @@ -98,7 +98,7 @@
  • Make sure that any image you upload does not exceed 10Mb.
      • -
    • There are many easy-to-use solution to resize an image.
      for example punchi.me
      • +
    • There are many easy-to-use solution to resize an image.
      for example punchi.me
@@ -171,7 +171,7 @@ There was an error while rendering the preview. Make sure you entered some text and that your attachments are valid. Please contact us at info@compassion.ch if you experience unexpected behaviours.