From 06636c6eca636d7cacc3d743487b2a9618585c34 Mon Sep 17 00:00:00 2001 From: Quenty31 <33203663+Quenty31@users.noreply.github.com> Date: Fri, 5 Jan 2018 10:59:43 +0100 Subject: [PATCH] l10n Occitan language: mailer update (#6193) * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb --- .../confirmation_instructions.oc.html.erb | 2 +- .../confirmation_instructions.oc.text.erb | 2 +- app/views/user_mailer/email_changed.oc.html.erb | 15 +++++++++++++++ app/views/user_mailer/email_changed.oc.text.erb | 13 +++++++++++++ .../reconfirmation_instructions.oc.html.erb | 15 +++++++++++++++ .../reconfirmation_instructions.oc.text.erb | 12 ++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 app/views/user_mailer/email_changed.oc.html.erb create mode 100644 app/views/user_mailer/email_changed.oc.text.erb create mode 100644 app/views/user_mailer/reconfirmation_instructions.oc.html.erb create mode 100644 app/views/user_mailer/reconfirmation_instructions.oc.text.erb diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb index 7a16db67a1..5657e40d44 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.html.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.html.erb @@ -7,7 +7,7 @@

Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.

-

Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.

+

Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>.

Amistosament,

diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb index bf2acfec16..fe04fe3d05 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.text.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb @@ -7,7 +7,7 @@ er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent :  Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina. -Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. +Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>. Amistosament, diff --git a/app/views/user_mailer/email_changed.oc.html.erb b/app/views/user_mailer/email_changed.oc.html.erb new file mode 100644 index 0000000000..0f4c891dcd --- /dev/null +++ b/app/views/user_mailer/email_changed.oc.html.erb @@ -0,0 +1,15 @@ +

Bonjorn <%= @resource.email %> !

+ +<% if @resource&.unconfirmed_email? %> +

Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>.

+<% else %> +

Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>.

+<% end %> + +

+ S’avètz pas demandat aqueste cambiament d’adreça, poiriá arribar que qualqu’un mai aguèsse agut accès a vòstre compte. Mercés de cambiar sulpic vòstre senhal o de contactar vòstre administrator d’instància se l’accès a vòstre compte vos es barrat. +

+ +

Amistosament,

+ +

La còla <%= @instance %>

diff --git a/app/views/user_mailer/email_changed.oc.text.erb b/app/views/user_mailer/email_changed.oc.text.erb new file mode 100644 index 0000000000..2305ef8345 --- /dev/null +++ b/app/views/user_mailer/email_changed.oc.text.erb @@ -0,0 +1,13 @@ +Bonjorn <%= @resource.email %> ! + +<% if @resource&.unconfirmed_email? %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>. +<% else %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>. +<% end %> + +S’avètz pas demandat aqueste cambiament d’adreça, poiriá arribar que qualqu’un mai aguèsse agut accès a vòstre compte. Mercés de cambiar sulpic vòstre senhal o de contactar vòstre administrator d’instància se l’accès a vòstre compte vos es barrat. + +Amistosament, + +La còla <%= @instance %> diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.html.erb b/app/views/user_mailer/reconfirmation_instructions.oc.html.erb new file mode 100644 index 0000000000..d5404e49c6 --- /dev/null +++ b/app/views/user_mailer/reconfirmation_instructions.oc.html.erb @@ -0,0 +1,15 @@ +

Bonjorn <%= @resource.unconfirmed_email %> !

+ +

Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>.

+ +

Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent :
+<%= link_to 'Confirmar mon adreça', confirmation_url(@resource, confirmation_token: @token) %>

+ +

Se lo ligam al dessús fonciona pas, copiatz e pegatz aquesta URL a la barra d’adreça :
+<%= confirmation_url(@resource, confirmation_token: @token) %> + +

Mercés de gaitar tanben nòstres <%= link_to 'terms and conditions', terms_url %>.

+ +

Amistosament,

+ +

La còla <%= @instance %>

diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb new file mode 100644 index 0000000000..6f174bb3e1 --- /dev/null +++ b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb @@ -0,0 +1,12 @@ +Bonjorn <%= @resource.unconfirmed_email %> ! + +Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>. + +Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent : +<%= confirmation_url(@resource, confirmation_token: @token) %> + +Mercés tanben de gaitar nòstres <%= link_to 'terms and conditions', terms_url %>. + +Amistosament, + +La còla <%= @instance %>