about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-05 22:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-05 22:17:12 +0000
commitf6adb409fd8f4bf42c1da54cc1e7e42886612c14 (patch)
tree01ab66d37a57fbe59546f6376e16c8398b5198d8 /app/views
parentf41b33eb0177b23bd72fede7df94af43da0c7c6b (diff)
parent10f6793fd0af3690a37c868b7bb4418418dc3a7a (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/user_mailer/confirmation_instructions.oc.html.erb2
-rw-r--r--app/views/user_mailer/confirmation_instructions.oc.text.erb2
-rw-r--r--app/views/user_mailer/email_changed.oc.html.erb15
-rw-r--r--app/views/user_mailer/email_changed.oc.text.erb13
-rw-r--r--app/views/user_mailer/reconfirmation_instructions.oc.html.erb15
-rw-r--r--app/views/user_mailer/reconfirmation_instructions.oc.text.erb12
6 files changed, 57 insertions, 2 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb
index 7a16db67a..5657e40d4 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 @@
 
 <p>Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.</p>
 
-<p>Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.</p>
+<p>Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>.</p>
 
 <p>Amistosament,</p>
 
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb
index bf2acfec1..fe04fe3d0 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 000000000..0f4c891dc
--- /dev/null
+++ b/app/views/user_mailer/email_changed.oc.html.erb
@@ -0,0 +1,15 @@
+<p>Bonjorn <%= @resource.email %> !</p>
+
+<% if @resource&.unconfirmed_email? %>
+  <p>Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>.</p>
+<% else %>
+  <p>Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>.</p>
+<% end %>
+
+<p>
+  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.
+</p>
+
+<p>Amistosament,<p>
+
+<p>La còla <%= @instance %></p>
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 000000000..2305ef834
--- /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 000000000..d5404e49c
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.oc.html.erb
@@ -0,0 +1,15 @@
+<p>Bonjorn <%= @resource.unconfirmed_email %> !</p>
+
+<p>Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>.</p>
+
+<p>Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent :<br>
+<%= link_to 'Confirmar mon adreça', confirmation_url(@resource, confirmation_token: @token) %></p>
+
+<p>Se lo ligam al dessús fonciona pas, copiatz e pegatz aquesta URL a la barra d’adreça :<br>
+<span><%= confirmation_url(@resource, confirmation_token: @token) %></span>
+
+<p>Mercés de gaitar tanben nòstres <%= link_to 'terms and conditions', terms_url %>.</p>
+
+<p>Amistosament,<p>
+
+<p>La còla <%= @instance %></p>
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 000000000..6f174bb3e
--- /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 %>