From 01421999aeee60c1bb24a8509a9d1b9ebe34b4d9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 20 Jan 2018 01:32:05 +0100
Subject: [PATCH] Make text e-mails consistent with HTML ones in UserMailer
(#6291)
* Make text e-mails consistent with HTML ones in UserMailer
* Fix UserMailer specs
---
.../confirmation_instructions.ar.text.erb | 12 ------------
.../confirmation_instructions.ca.text.erb | 12 ------------
.../confirmation_instructions.en.text.erb | 12 ------------
.../confirmation_instructions.es.text.erb | 12 ------------
.../confirmation_instructions.fa.text.erb | 12 ------------
.../confirmation_instructions.fi.text.erb | 5 -----
.../confirmation_instructions.fr.text.erb | 14 --------------
.../confirmation_instructions.he.text.erb | 12 ------------
.../confirmation_instructions.id.text.erb | 12 ------------
.../confirmation_instructions.it.text.erb | 12 ------------
.../confirmation_instructions.ja.text.erb | 11 -----------
.../confirmation_instructions.ko.text.erb | 10 ----------
.../confirmation_instructions.nl.text.erb | 12 ------------
.../confirmation_instructions.no.text.erb | 12 ------------
.../confirmation_instructions.oc.text.erb | 14 --------------
.../confirmation_instructions.pl.text.erb | 12 ------------
.../confirmation_instructions.pt-BR.text.erb | 12 ------------
.../confirmation_instructions.ru.text.erb | 12 ------------
.../confirmation_instructions.sr-Latn.text.erb | 12 ------------
.../confirmation_instructions.sr.text.erb | 12 ------------
.../confirmation_instructions.sv.text.erb | 12 ------------
.../user_mailer/confirmation_instructions.text.erb | 12 ++++++++++++
.../confirmation_instructions.tr.text.erb | 13 -------------
.../confirmation_instructions.zh-cn.text.erb | 10 ----------
app/views/user_mailer/email_changed.en.text.erb | 13 -------------
app/views/user_mailer/email_changed.ja.text.erb | 11 -----------
app/views/user_mailer/email_changed.oc.text.erb | 13 -------------
app/views/user_mailer/email_changed.pl.text.erb | 13 -------------
app/views/user_mailer/email_changed.text.erb | 9 +++++++++
app/views/user_mailer/email_changed.zh-cn.text.erb | 11 -----------
app/views/user_mailer/password_change.ar.text.erb | 3 ---
app/views/user_mailer/password_change.ca.text.erb | 3 ---
app/views/user_mailer/password_change.en.text.erb | 3 ---
app/views/user_mailer/password_change.es.text.erb | 3 ---
app/views/user_mailer/password_change.fa.text.erb | 3 ---
app/views/user_mailer/password_change.fi.text.erb | 3 ---
app/views/user_mailer/password_change.fr.text.erb | 3 ---
app/views/user_mailer/password_change.he.text.erb | 3 ---
app/views/user_mailer/password_change.id.text.erb | 3 ---
app/views/user_mailer/password_change.it.text.erb | 3 ---
app/views/user_mailer/password_change.ja.text.erb | 3 ---
app/views/user_mailer/password_change.nl.text.erb | 3 ---
app/views/user_mailer/password_change.no.text.erb | 3 ---
app/views/user_mailer/password_change.oc.text.erb | 3 ---
app/views/user_mailer/password_change.pl.text.erb | 3 ---
.../user_mailer/password_change.pt-BR.text.erb | 3 ---
app/views/user_mailer/password_change.ru.text.erb | 3 ---
.../user_mailer/password_change.sr-Latn.text.erb | 3 ---
app/views/user_mailer/password_change.sr.text.erb | 3 ---
app/views/user_mailer/password_change.sv.text.erb | 3 ---
app/views/user_mailer/password_change.text.erb | 7 +++++++
app/views/user_mailer/password_change.th.text.erb | 3 ---
app/views/user_mailer/password_change.tr.text.erb | 8 --------
.../user_mailer/password_change.zh-cn.text.erb | 3 ---
.../reconfirmation_instructions.en.text.erb | 12 ------------
.../reconfirmation_instructions.ja.text.erb | 10 ----------
.../reconfirmation_instructions.oc.text.erb | 12 ------------
.../reconfirmation_instructions.pl.text.erb | 12 ------------
.../reconfirmation_instructions.text.erb | 9 +++++++++
.../reconfirmation_instructions.zh-cn.text.erb | 10 ----------
.../reset_password_instructions.ar.text.erb | 8 --------
.../reset_password_instructions.ca.text.erb | 8 --------
.../reset_password_instructions.en.text.erb | 8 --------
.../reset_password_instructions.es.text.erb | 8 --------
.../reset_password_instructions.fa.text.erb | 8 --------
.../reset_password_instructions.fi.text.erb | 8 --------
.../reset_password_instructions.fr.text.erb | 8 --------
.../reset_password_instructions.he.text.erb | 8 --------
.../reset_password_instructions.id.text.erb | 8 --------
.../reset_password_instructions.it.text.erb | 8 --------
.../reset_password_instructions.ja.text.erb | 8 --------
.../reset_password_instructions.nl.text.erb | 9 ---------
.../reset_password_instructions.no.text.erb | 9 ---------
.../reset_password_instructions.oc.text.erb | 8 --------
.../reset_password_instructions.pl.text.erb | 9 ---------
.../reset_password_instructions.pt-BR.text.erb | 8 --------
.../reset_password_instructions.ru.text.erb | 8 --------
.../reset_password_instructions.sr-Latn.text.erb | 8 --------
.../reset_password_instructions.sr.text.erb | 8 --------
.../reset_password_instructions.sv.text.erb | 8 --------
.../reset_password_instructions.text.erb | 9 +++++++++
.../reset_password_instructions.th.text.erb | 8 --------
.../reset_password_instructions.tr.text.erb | 13 -------------
.../reset_password_instructions.zh-cn.text.erb | 8 --------
spec/mailers/user_mailer_spec.rb | 10 +++++-----
85 files changed, 51 insertions(+), 657 deletions(-)
delete mode 100644 app/views/user_mailer/confirmation_instructions.ar.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.ca.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.en.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.es.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.fa.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.fi.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.fr.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.he.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.id.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.it.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.ja.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.ko.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.nl.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.no.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.oc.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.pl.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.pt-BR.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.ru.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.sr.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.sv.text.erb
create mode 100644 app/views/user_mailer/confirmation_instructions.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.tr.text.erb
delete mode 100644 app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
delete mode 100644 app/views/user_mailer/email_changed.en.text.erb
delete mode 100644 app/views/user_mailer/email_changed.ja.text.erb
delete mode 100644 app/views/user_mailer/email_changed.oc.text.erb
delete mode 100644 app/views/user_mailer/email_changed.pl.text.erb
create mode 100644 app/views/user_mailer/email_changed.text.erb
delete mode 100644 app/views/user_mailer/email_changed.zh-cn.text.erb
delete mode 100644 app/views/user_mailer/password_change.ar.text.erb
delete mode 100644 app/views/user_mailer/password_change.ca.text.erb
delete mode 100644 app/views/user_mailer/password_change.en.text.erb
delete mode 100644 app/views/user_mailer/password_change.es.text.erb
delete mode 100644 app/views/user_mailer/password_change.fa.text.erb
delete mode 100644 app/views/user_mailer/password_change.fi.text.erb
delete mode 100644 app/views/user_mailer/password_change.fr.text.erb
delete mode 100644 app/views/user_mailer/password_change.he.text.erb
delete mode 100644 app/views/user_mailer/password_change.id.text.erb
delete mode 100644 app/views/user_mailer/password_change.it.text.erb
delete mode 100644 app/views/user_mailer/password_change.ja.text.erb
delete mode 100644 app/views/user_mailer/password_change.nl.text.erb
delete mode 100644 app/views/user_mailer/password_change.no.text.erb
delete mode 100644 app/views/user_mailer/password_change.oc.text.erb
delete mode 100644 app/views/user_mailer/password_change.pl.text.erb
delete mode 100644 app/views/user_mailer/password_change.pt-BR.text.erb
delete mode 100644 app/views/user_mailer/password_change.ru.text.erb
delete mode 100644 app/views/user_mailer/password_change.sr-Latn.text.erb
delete mode 100644 app/views/user_mailer/password_change.sr.text.erb
delete mode 100644 app/views/user_mailer/password_change.sv.text.erb
create mode 100644 app/views/user_mailer/password_change.text.erb
delete mode 100644 app/views/user_mailer/password_change.th.text.erb
delete mode 100644 app/views/user_mailer/password_change.tr.text.erb
delete mode 100644 app/views/user_mailer/password_change.zh-cn.text.erb
delete mode 100644 app/views/user_mailer/reconfirmation_instructions.en.text.erb
delete mode 100644 app/views/user_mailer/reconfirmation_instructions.ja.text.erb
delete mode 100644 app/views/user_mailer/reconfirmation_instructions.oc.text.erb
delete mode 100644 app/views/user_mailer/reconfirmation_instructions.pl.text.erb
create mode 100644 app/views/user_mailer/reconfirmation_instructions.text.erb
delete mode 100644 app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.ar.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.ca.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.en.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.es.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.fa.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.fi.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.fr.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.he.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.id.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.it.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.ja.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.nl.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.no.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.oc.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.pl.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.pt-BR.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.ru.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.sr.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.sv.text.erb
create mode 100644 app/views/user_mailer/reset_password_instructions.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.th.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.tr.text.erb
delete mode 100644 app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
diff --git a/app/views/user_mailer/confirmation_instructions.ar.text.erb b/app/views/user_mailer/confirmation_instructions.ar.text.erb
deleted file mode 100644
index 087c6a9ae4..0000000000
--- a/app/views/user_mailer/confirmation_instructions.ar.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-مرØبا <%= @resource.email %> !
-
-لقد قمت بإنشاء Øساب على <%= @instance %>.
-
-لتأكيد التسجيل يرجى النقر على الرابط التالي :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-يرجى الإطلاع على شروط الإستخدام <%= terms_url %>
-
-مع أجمل التØيات،
-
-Ùريق <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.ca.text.erb b/app/views/user_mailer/confirmation_instructions.ca.text.erb
deleted file mode 100644
index 77cc589e67..0000000000
--- a/app/views/user_mailer/confirmation_instructions.ca.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Benvingut <%= @resource.email %> !
-
-Acabes de crear un compte a <%= @instance %>.
-
-Per confirmar la subscripció, si us plua fes clic en el següent vincle :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Si us plau també fes un cop d'ull als nostres termes i condicions <%= terms_url %>
-
-Sincerament,
-
-L'equip <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.en.text.erb b/app/views/user_mailer/confirmation_instructions.en.text.erb
deleted file mode 100644
index 0419adef0f..0000000000
--- a/app/views/user_mailer/confirmation_instructions.en.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Welcome <%= @resource.email %> !
-
-You just created an account on <%= @instance %>.
-
-To confirm your inscription, please click on the following link :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Please also check out our terms and conditions <%= terms_url %>
-
-Sincerely,
-
-The <%= @instance %> team
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.es.text.erb b/app/views/user_mailer/confirmation_instructions.es.text.erb
deleted file mode 100644
index e9d83b3f8e..0000000000
--- a/app/views/user_mailer/confirmation_instructions.es.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-¡Bienvenido, <%= @resource.email %>!
-
-Acabas de crear una cuenta en <%= @instance %>.
-
-Para confirmar tu registro, por favor ingresa al siguiente enlace:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Por favor, también revisa nuestros términos y condiciones <%= terms_url %>
-
-Sinceramente,
-
-El equipo de <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.fa.text.erb b/app/views/user_mailer/confirmation_instructions.fa.text.erb
deleted file mode 100644
index 76727b3bef..0000000000
--- a/app/views/user_mailer/confirmation_instructions.fa.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-خوش آمدید <%= @resource.email %> !
-
-شما الان در <%= @instance %> Øساب باز کردید.
-
-برای تأیید عضویت، لطÙاً روی پیوند زیر کلیک کنید:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-لطÙاً همچنین شرایط Ùˆ مقررات استÙادهٔ ما را هم بخوانید <%= terms_url %>
-
-با اØترام،
-
-گردانندگان سرور <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.fi.text.erb b/app/views/user_mailer/confirmation_instructions.fi.text.erb
deleted file mode 100644
index 796913abb9..0000000000
--- a/app/views/user_mailer/confirmation_instructions.fi.text.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-Tervetuloa <%= @resource.email %>!
-
-Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb
deleted file mode 100644
index 7730715f8d..0000000000
--- a/app/views/user_mailer/confirmation_instructions.fr.text.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remercions.
-
-Pour confirmer votre inscription, merci de cliquer sur le lien suivant :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Après votre première connexion, vous pourrez accéder à la documentation de l’outil.
-
-Pour rappel, nos conditions d’utilisation sont indiquées ici <%= terms_url %>
-
-Amicalement,
-
-L’équipe <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.he.text.erb b/app/views/user_mailer/confirmation_instructions.he.text.erb
deleted file mode 100644
index 8e37fc641a..0000000000
--- a/app/views/user_mailer/confirmation_instructions.he.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-×©×œ×•× <%= @resource.email %> !
-
-הרגע יצרת חשבון בקהילה <%= @instance %>.
-
-כדי ×œ×•×•×“× ×ת הרשמתך, יש ללחוץ על הקישורית הב××” :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-יש לעבור ×’× ×¢×œ ×ª× ××™ השימוש <%= terms_url %>
-
-בתודה מר×ש,
-
-צוות × ×™×”×•×œ <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.id.text.erb b/app/views/user_mailer/confirmation_instructions.id.text.erb
deleted file mode 100644
index 0486c3c5cf..0000000000
--- a/app/views/user_mailer/confirmation_instructions.id.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Selamat datang <%= @resource.email %> !
-
-Anda baru saja membuat akun di <%= @instance %>.
-
-Untuk mengkonfirmasi, silakan klik link berikut ini :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Silakan cek <%= terms_url %> kami
-
-Hormat kami,
-
-Tim <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.it.text.erb b/app/views/user_mailer/confirmation_instructions.it.text.erb
deleted file mode 100644
index ce9411173e..0000000000
--- a/app/views/user_mailer/confirmation_instructions.it.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Benvenuto <%= @resource.email %> !
-
-Hai appena creato un account su <%= @instance %>.
-
-er confermare la tua iscrizione, fai clic sul seguente link :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Per piacere leggi anche i nostri termini e condizioni <%= terms_url %>
-
-Sinceramente,
-
-Il team <%= @instance %>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.ja.text.erb b/app/views/user_mailer/confirmation_instructions.ja.text.erb
deleted file mode 100644
index 99868ba8af..0000000000
--- a/app/views/user_mailer/confirmation_instructions.ja.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-よã†ã“ã<%= @resource.email %>ã•ã‚“
-
-<%= @instance %>ã«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒä½œæˆã•ã‚Œã¾ã—ãŸã€‚
-
-以下ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦Mastodonアカウントã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’確èªã—ã¦ãã ã•ã„。
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-ã¾ãŸã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®<%= link_to '利用è¦ç´„', terms_url %>ã«ã¤ã„ã¦ã‚‚ã”確èªãã ã•ã„。
-
-<%= @instance %> ãƒãƒ¼ãƒ
diff --git a/app/views/user_mailer/confirmation_instructions.ko.text.erb b/app/views/user_mailer/confirmation_instructions.ko.text.erb
deleted file mode 100644
index c46400f07c..0000000000
--- a/app/views/user_mailer/confirmation_instructions.ko.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-안녕하세요 <%= @resource.email %> 님!
-
-<%= @instance %>ì— ìƒˆë¡œ ê³„ì •ì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤.
-
-아래 ë§í¬ë¥¼ 눌러 회ì›ê°€ìž…ì„ ì™„ë£Œ 하세요.
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-ì•½ê´€ë„ í™•ì¸ ë°”ëžë‹ˆë‹¤. <%= terms_url %>
-
-<%= @instance %> 드림
diff --git a/app/views/user_mailer/confirmation_instructions.nl.text.erb b/app/views/user_mailer/confirmation_instructions.nl.text.erb
deleted file mode 100644
index 3c14896b3c..0000000000
--- a/app/views/user_mailer/confirmation_instructions.nl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Welkom <%= @resource.email %> !
-
-Je hebt zojuist een account aangemaakt op <%= @instance %>.
-
-Klik op de volgende link om jouw registratie te bevestigen :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Lees ook onze gebruikersvoorwaarden op <%= terms_url %>
-
-Vriendelijke groet,
-
-De beheerder(s) van <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.no.text.erb b/app/views/user_mailer/confirmation_instructions.no.text.erb
deleted file mode 100644
index 3739c99d49..0000000000
--- a/app/views/user_mailer/confirmation_instructions.no.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Velkommen <%= @resource.email %> !
-
-Du har akkurat opprettet en konto på <%= @instance %>.
-
-For å bekrefte innskriving i manntallet vennligst trykk på følgende lenke :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Vennligst også les våre brukervilkår <%= terms_url %>
-
-Med vennlig hilsen,
-
-Gjengen bak <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb
deleted file mode 100644
index fe04fe3d05..0000000000
--- a/app/views/user_mailer/confirmation_instructions.oc.text.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)
-
-er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent : 
-<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>
-
-Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.
-
-Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>.
-
-Amistosament,
-
-La còla <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.pl.text.erb b/app/views/user_mailer/confirmation_instructions.pl.text.erb
deleted file mode 100644
index f20082e166..0000000000
--- a/app/views/user_mailer/confirmation_instructions.pl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Właśnie utworzyłeś konto na instancji <%= @instance %>.
-
-Aby aktywować konto, odwiedź poniższy link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Pamiętaj przeczytać nasz regulamin i zasady użytkowania: <%= terms_url %>
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb b/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb
deleted file mode 100644
index 578f7acb59..0000000000
--- a/app/views/user_mailer/confirmation_instructions.pt-BR.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Boas vindas, <%= @resource.email %>!
-
-Você acabou de criar uma conta na instância <%= @instance %>.
-
-Para confirmar o seu cadastro, por favor clique no link a seguir:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Por favor, leia também os nossos termos e condições de uso <%= terms_url %>
-
-Atenciosamente,
-
-A equipe da instância <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.ru.text.erb b/app/views/user_mailer/confirmation_instructions.ru.text.erb
deleted file mode 100644
index 884f75401b..0000000000
--- a/app/views/user_mailer/confirmation_instructions.ru.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Добро пожаловать, <%= @resource.email %> !
-
-Вы только что завели аккаунт на <%= @instance %>.
-
-Чтобы подтвердить Ñоздание аккаунта, пожалуйÑта, перейдите по Ñтой ÑÑылке:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Также проÑим Ð’Ð°Ñ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ об уÑловиÑÑ… иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° здеÑÑŒ: <%= terms_url %>
-
-ИÑкренне Ваши,
-
-Команда <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb b/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb
deleted file mode 100644
index 60fe9db0d9..0000000000
--- a/app/views/user_mailer/confirmation_instructions.sr-Latn.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Dobrodošao <%= @resource.email %> !
-
-Upravo ste napravili nalog na instanci <%= @instance %>.
-
-Da potvrdite Vašu registraciju, molimo Vas kliknite na sledeći link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Takođe pogledajte i pravila i uslove korišćenja <%= terms_url %>
-
-S poštovanjem,
-
-<%= @instance %> tim
diff --git a/app/views/user_mailer/confirmation_instructions.sr.text.erb b/app/views/user_mailer/confirmation_instructions.sr.text.erb
deleted file mode 100644
index e7cb7e1881..0000000000
--- a/app/views/user_mailer/confirmation_instructions.sr.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Добродошао <%= @resource.email %> !
-
-Управо Ñте направили налог на инÑтанци <%= @instance %>.
-
-Да потврдите Вашу региÑтрацију, молимо Ð’Ð°Ñ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ‚Ðµ на Ñледећи линк:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Такође погледајте и правила и уÑлове коришћења <%= terms_url %>
-
-С поштовањем,
-
-<%= @instance %> тим
diff --git a/app/views/user_mailer/confirmation_instructions.sv.text.erb b/app/views/user_mailer/confirmation_instructions.sv.text.erb
deleted file mode 100644
index 64ffb97996..0000000000
--- a/app/views/user_mailer/confirmation_instructions.sv.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Välkommen <%= @resource.email %> !
-
-Du har precis skapat ett konto på <%= @instance %>.
-
-För att bekräfta din inskrift, vänligen klicka på följande länk :
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Vänligen läs även våra användarvillkor <%= terms_url %>
-
-Vänliga hälsningar,
-
-Teamet på <%= @instance %>
diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb
new file mode 100644
index 0000000000..e01eecb27e
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@@ -0,0 +1,12 @@
+<%= t 'devise.mailer.confirmation_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %>
+
+=> <%= confirmation_url(@resource, confirmation_token: @token) %>
+
+<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url)) %>
+
+=> <%= about_more_url %>
+=> <%= terms_url %>
diff --git a/app/views/user_mailer/confirmation_instructions.tr.text.erb b/app/views/user_mailer/confirmation_instructions.tr.text.erb
deleted file mode 100644
index 01b1c69e29..0000000000
--- a/app/views/user_mailer/confirmation_instructions.tr.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Aramıza hoşgeldin <%= @resource.email %>
-
-Bu sunucumuzda yeni bir hesap oluşturduğunu görüyoruz: <%= @instance %>.
-
-Siz olduğunuzu teyit edebilmemiz için lütfen aşağıdaki linke tıklayınız:
-
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Ayrıca kullanım şartları ve koşulları sayfamızı inceleyebilirsin <%= terms_url %>
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
deleted file mode 100644
index 25d901f163..0000000000
--- a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= @resource.email %>ï¼Œä½ å¥½å‘€ï¼
-
-ä½ åˆšåˆšåœ¨ <%= @instance %> 创建了一个å¸æˆ·å‘¢ã€‚
-
-点击下é¢çš„链接æ¥å®Œæˆæ³¨å†Œå•¦ï¼š
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-记得读一读我们的使用æ¡æ¬¾å“¦ï¼š<%= terms_url %>
-
-æ¥è‡ª <%= @instance %> 管ç†å›¢é˜Ÿ
\ No newline at end of file
diff --git a/app/views/user_mailer/email_changed.en.text.erb b/app/views/user_mailer/email_changed.en.text.erb
deleted file mode 100644
index 9719724611..0000000000
--- a/app/views/user_mailer/email_changed.en.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Hello <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-We're contacting you to notify you that the email you use on <%= @instance %> is being changed to <%= @resource.unconfirmed_email %>.
-<% else %>
-We're contacting you to notify you that the email you use on <%= @instance %> has been changed to <%= @resource.email %>.
-<% end %>
-
-If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account.
-
-Sincerely,
-
-The <%= @instance %> team
diff --git a/app/views/user_mailer/email_changed.ja.text.erb b/app/views/user_mailer/email_changed.ja.text.erb
deleted file mode 100644
index 33ee6d10b6..0000000000
--- a/app/views/user_mailer/email_changed.ja.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-Hello <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-<%= @instance %>ã§ä½¿ã£ã¦ã„るメールアドレスãŒ<%= @resource.unconfirmed_email %>ã«å¤‰æ›´ã•ã‚Œã‚ˆã†ã¨ã—ã¦ã„ã¾ã™ã€‚
-<% else %>
-<%= @instance %>ã§ä½¿ã£ã¦ã„るメールアドレスãŒ<%= @resource.email %>ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸã€‚
-<% end %>
-
-メールアドレスを変更ã—ãŸè¦šãˆãŒãªã„å ´åˆã€èª°ã‹ãŒã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸãŠãã‚ŒãŒã‚ã‚Šã¾ã™ã€‚ã™ãã«ãƒ‘スワードを変更ã™ã‚‹ã‹ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„å ´åˆã¯ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ç®¡ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。
-
-<%= @instance %>ãƒãƒ¼ãƒ より
diff --git a/app/views/user_mailer/email_changed.oc.text.erb b/app/views/user_mailer/email_changed.oc.text.erb
deleted file mode 100644
index 2305ef8345..0000000000
--- a/app/views/user_mailer/email_changed.oc.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-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.pl.text.erb b/app/views/user_mailer/email_changed.pl.text.erb
deleted file mode 100644
index 134a79e955..0000000000
--- a/app/views/user_mailer/email_changed.pl.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-<% if @resource&.unconfirmed_email? %>
-Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.unconfirmed_email %>.
-<% else %>
-Informujemy, że e-mail używany przez Ciebie na <%= @instance %> został zmieniony na <%= @resource.email %>.
-<% end %>
-
-Jeżeli to nie Ty, prawdopodobnie ktoś uzyskał dostęp do Twojego konta. Zalecana jest natychmiastowa zmiana hasła lub skontaktowanie się z administratorem, jeżeli nie masz dostępu do swojego konta.
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb
new file mode 100644
index 0000000000..2b58415f56
--- /dev/null
+++ b/app/views/user_mailer/email_changed.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.email_changed.title' %>
+
+===
+
+<%= t 'devise.mailer.email_changed.explanation' %>
+
+<%= @resource.unconfirmed_email %>
+
+<%= t 'devise.mailer.email_changed.extra' %>
diff --git a/app/views/user_mailer/email_changed.zh-cn.text.erb b/app/views/user_mailer/email_changed.zh-cn.text.erb
deleted file mode 100644
index d59ac58c42..0000000000
--- a/app/views/user_mailer/email_changed.zh-cn.text.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<%= @resource.email %>ï¼Œä½ å¥½å‘€ï¼
-
-<% if @resource&.unconfirmed_email? %>
-我们å‘é€è¿™å°é‚®ä»¶æ˜¯ä¸ºäº†æé†’ä½ ï¼Œä½ åœ¨ <%= @instance %> 上使用的电å邮件地å€å³å°†å˜æ›´ä¸º <%= @resource.unconfirmed_email %>。
-<% else %>
-我们å‘é€è¿™å°é‚®ä»¶æ˜¯ä¸ºäº†æé†’ä½ ï¼Œä½ åœ¨ <%= @instance %> 上使用的电å邮件地å€å·²ç»å˜æ›´ä¸º <%= @resource.unconfirmed_email %>。
-<% end %>
-
-å¦‚æžœä½ å¹¶æ²¡æœ‰è¯·æ±‚æ›´æ”¹ä½ çš„ç”µå邮件地å€ï¼Œåˆ™ä»–人很有å¯èƒ½å·²ç»å…¥ä¾µä½ çš„å¸æˆ·ã€‚请立å³æ›´æ”¹ä½ 的密ç ï¼›å¦‚æžœä½ å·²ç»æ— æ³•è®¿é—®ä½ çš„å¸æˆ·ï¼Œè¯·è”系实例的管ç†å‘˜è¯·æ±‚å助。
-
-æ¥è‡ª <%= @instance %> 管ç†å›¢é˜Ÿ
diff --git a/app/views/user_mailer/password_change.ar.text.erb b/app/views/user_mailer/password_change.ar.text.erb
deleted file mode 100644
index ae0161f317..0000000000
--- a/app/views/user_mailer/password_change.ar.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-ØµØ¨Ø§Ø Ø§Ù„Ø®ÙŠØ± <%= @resource.email %> !
-
-نود أن نخبرك أنه قد تم تعديل كلمة مرور ماستدون الخاصة بك بنجاØ.
diff --git a/app/views/user_mailer/password_change.ca.text.erb b/app/views/user_mailer/password_change.ca.text.erb
deleted file mode 100644
index c2fdfc82c3..0000000000
--- a/app/views/user_mailer/password_change.ca.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hola <%= @resource.email %>!
-
-Aquest correu es per a notificar-te que la teva contrasenya a mastodont.cat ha canviat.
diff --git a/app/views/user_mailer/password_change.en.text.erb b/app/views/user_mailer/password_change.en.text.erb
deleted file mode 100644
index 3ae461c97a..0000000000
--- a/app/views/user_mailer/password_change.en.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We're contacting you to notify you that your password on <%= @instance %> has been changed.
diff --git a/app/views/user_mailer/password_change.es.text.erb b/app/views/user_mailer/password_change.es.text.erb
deleted file mode 100644
index 192faf9ad9..0000000000
--- a/app/views/user_mailer/password_change.es.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-¡Hola, <%= @resource.email %>!
-
-Te contactamos para notificarte que tu contraseña en <%= @instance %> ha sido modificada.
\ No newline at end of file
diff --git a/app/views/user_mailer/password_change.fa.text.erb b/app/views/user_mailer/password_change.fa.text.erb
deleted file mode 100644
index 0c2995958d..0000000000
--- a/app/views/user_mailer/password_change.fa.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-سلام <%= @resource.email %>!
-
-این پیغام برای این است که به شما بگوییم رمز شما در ماستدون تغییر کرده است.
diff --git a/app/views/user_mailer/password_change.fi.text.erb b/app/views/user_mailer/password_change.fi.text.erb
deleted file mode 100644
index d90c3fdebd..0000000000
--- a/app/views/user_mailer/password_change.fi.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hei <%= @resource.email %>!
-
-Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.
diff --git a/app/views/user_mailer/password_change.fr.text.erb b/app/views/user_mailer/password_change.fr.text.erb
deleted file mode 100644
index f068f1cd67..0000000000
--- a/app/views/user_mailer/password_change.fr.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Nous vous contactons pour vous informer que votre mot de passe sur Mastodon a bien été modifié.
diff --git a/app/views/user_mailer/password_change.he.text.erb b/app/views/user_mailer/password_change.he.text.erb
deleted file mode 100644
index 1f601c6b29..0000000000
--- a/app/views/user_mailer/password_change.he.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-×©×œ×•× <%= @resource.email %>!
-
-×¨×¦×™× ×• להודיע לך שסיסמתך במסטודון ××¦×œ× ×• הוחלפה.
diff --git a/app/views/user_mailer/password_change.id.text.erb b/app/views/user_mailer/password_change.id.text.erb
deleted file mode 100644
index 1a67fd4070..0000000000
--- a/app/views/user_mailer/password_change.id.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hai <%= @resource.email %>!
-
-Kami menghubungi anda untuk memberitahu bahwa kata sandi anda di Mastodon telah diubah.
diff --git a/app/views/user_mailer/password_change.it.text.erb b/app/views/user_mailer/password_change.it.text.erb
deleted file mode 100644
index ea187670e3..0000000000
--- a/app/views/user_mailer/password_change.it.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Ciao <%= @resource.email %>!
-
-Ti stiamo contattando per avvisarti che la tua password su Mastodon è stata cambiata.
diff --git a/app/views/user_mailer/password_change.ja.text.erb b/app/views/user_mailer/password_change.ja.text.erb
deleted file mode 100644
index aa29b9b2bd..0000000000
--- a/app/views/user_mailer/password_change.ja.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-ã“ã‚“ã«ã¡ã¯<%= @resource.email %>ã•ã‚“
-
-Mastodonアカウントã®ãƒ‘スワードãŒå¤‰æ›´ã•ã‚Œã¾ã—ãŸã€‚
diff --git a/app/views/user_mailer/password_change.nl.text.erb b/app/views/user_mailer/password_change.nl.text.erb
deleted file mode 100644
index 33accd99c8..0000000000
--- a/app/views/user_mailer/password_change.nl.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hallo <%= @resource.email %>!
-
-Hierbij laten we jou weten dat jouw wachtwoord op Mastodon is veranderd.
diff --git a/app/views/user_mailer/password_change.no.text.erb b/app/views/user_mailer/password_change.no.text.erb
deleted file mode 100644
index 1707976c11..0000000000
--- a/app/views/user_mailer/password_change.no.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hei <%= @resource.email %>!
-
-Ditt Mastodon-passord har blitt endret.
diff --git a/app/views/user_mailer/password_change.oc.text.erb b/app/views/user_mailer/password_change.oc.text.erb
deleted file mode 100644
index 9fe9116d95..0000000000
--- a/app/views/user_mailer/password_change.oc.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.
diff --git a/app/views/user_mailer/password_change.pl.text.erb b/app/views/user_mailer/password_change.pl.text.erb
deleted file mode 100644
index bd2efee0f3..0000000000
--- a/app/views/user_mailer/password_change.pl.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>.
diff --git a/app/views/user_mailer/password_change.pt-BR.text.erb b/app/views/user_mailer/password_change.pt-BR.text.erb
deleted file mode 100644
index eb7368ba92..0000000000
--- a/app/views/user_mailer/password_change.pt-BR.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Olá, <%= @resource.email %>!
-
-Estamos te contatando para te notificar que a sua senha na instância <%= @instance %> foi modificada.
diff --git a/app/views/user_mailer/password_change.ru.text.erb b/app/views/user_mailer/password_change.ru.text.erb
deleted file mode 100644
index 6a3556daec..0000000000
--- a/app/views/user_mailer/password_change.ru.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-ЗдравÑтвуйте, <%= @resource.email %>!
-
-Мы пишем, чтобы оповеÑтить Ð’Ð°Ñ Ð¾ Ñмене Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ð° Вашем аккаунте Mastodon.
diff --git a/app/views/user_mailer/password_change.sr-Latn.text.erb b/app/views/user_mailer/password_change.sr-Latn.text.erb
deleted file mode 100644
index 6e0666d8dd..0000000000
--- a/app/views/user_mailer/password_change.sr-Latn.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Zdravo <%= @resource.email %>!
-
-Želimo samo da Vas obavestimo da je Vaša lozinka na Mastodont instanci <%= @instance %> promenjena.
diff --git a/app/views/user_mailer/password_change.sr.text.erb b/app/views/user_mailer/password_change.sr.text.erb
deleted file mode 100644
index 9082201c0c..0000000000
--- a/app/views/user_mailer/password_change.sr.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Здраво <%= @resource.email %>!
-
-Желимо Ñамо да Ð’Ð°Ñ Ð¾Ð±Ð°Ð²ÐµÑтимо да је Ваша лозинка на МаÑтодонт инÑтанци <%= @instance %> промењена.
diff --git a/app/views/user_mailer/password_change.sv.text.erb b/app/views/user_mailer/password_change.sv.text.erb
deleted file mode 100644
index b6df732269..0000000000
--- a/app/views/user_mailer/password_change.sv.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hej <%= @resource.email %>!
-
-Vi kontaktar dig för att meddela dig att ditt lösenord på <%= @instance %> har blivit ändrat.
diff --git a/app/views/user_mailer/password_change.text.erb b/app/views/user_mailer/password_change.text.erb
new file mode 100644
index 0000000000..77a37894ee
--- /dev/null
+++ b/app/views/user_mailer/password_change.text.erb
@@ -0,0 +1,7 @@
+<%= t 'devise.mailer.password_change.title' %>
+
+===
+
+<%= t 'devise.mailer.password_change.explanation' %>
+
+<%= t 'devise.mailer.password_change.extra' %>
diff --git a/app/views/user_mailer/password_change.th.text.erb b/app/views/user_mailer/password_change.th.text.erb
deleted file mode 100644
index 0d28a207cc..0000000000
--- a/app/views/user_mailer/password_change.th.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-สวัสดี <%= @resource.email %>!
-
-เราติดต่à¸à¸¡à¸²à¹€à¸žà¸·à¹ˆà¸à¹à¸ˆà¹‰à¸‡à¹ƒà¸«à¹‰à¸„ุณทราบว่า พาสเวิร์ดขà¸à¸‡à¸„ุณถูà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸¥à¹‰à¸§
diff --git a/app/views/user_mailer/password_change.tr.text.erb b/app/views/user_mailer/password_change.tr.text.erb
deleted file mode 100644
index 873c5f9624..0000000000
--- a/app/views/user_mailer/password_change.tr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Merhaba <%= @resource.email %>!
-
-<%= @instance %>'deki parolanızın değiştirildiğini hatırlatmak isteriz.
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
-
diff --git a/app/views/user_mailer/password_change.zh-cn.text.erb b/app/views/user_mailer/password_change.zh-cn.text.erb
deleted file mode 100644
index dbc065173e..0000000000
--- a/app/views/user_mailer/password_change.zh-cn.text.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= @resource.email %>ï¼Œä½ å¥½å‘€ï¼
-
-æé†’ä¸€ä¸‹ï¼Œä½ åœ¨ <%= @instance %> 上的密ç 被更改了哦。
diff --git a/app/views/user_mailer/reconfirmation_instructions.en.text.erb b/app/views/user_mailer/reconfirmation_instructions.en.text.erb
deleted file mode 100644
index c1c735b3ac..0000000000
--- a/app/views/user_mailer/reconfirmation_instructions.en.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Hello <%= @resource.unconfirmed_email %>!
-
-You requested a change to the email address you use on <%= @instance %>.
-
-To confirm your new email, please click on the following link:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Please also check out our terms and conditions <%= terms_url %>
-
-Sincerely,
-
-The <%= @instance %> team
diff --git a/app/views/user_mailer/reconfirmation_instructions.ja.text.erb b/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
deleted file mode 100644
index 5326e45126..0000000000
--- a/app/views/user_mailer/reconfirmation_instructions.ja.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-ã“ã‚“ã«ã¡ã¯<%= @resource.unconfirmed_email %>ã•ã‚“
-
-<%= @instance %>ã§ä½¿ã£ã¦ã„るメールアドレスã®å¤‰æ›´ã‚’ã‚ãªãŸãŒãƒªã‚¯ã‚¨ã‚¹ãƒˆã—ã¾ã—ãŸã€‚
-
-æ–°ã—ã„メールアドレスを確èªã™ã‚‹ã«ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦ãã ã•ã„:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-ã¾ãŸåˆ©ç”¨è¦ç´„ã‚‚ã”確èªãã ã•ã„ <%= terms_url %>
-
-<%= @instance %>ãƒãƒ¼ãƒ より
diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb
deleted file mode 100644
index 6f174bb3e1..0000000000
--- a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-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 %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.pl.text.erb b/app/views/user_mailer/reconfirmation_instructions.pl.text.erb
deleted file mode 100644
index 032718f811..0000000000
--- a/app/views/user_mailer/reconfirmation_instructions.pl.text.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-Witaj, <%= @resource.unconfirmed_email %>!
-
-Dokonano próby zmiany adresu e-mail, którego używasz na <%= @instance %>.
-
-Aby potwierdzić posiadanie tego adresu e-mail, kliknij na poniższy odnośnik:
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-Pamiętaj o przeczytaniu naszych zasad użytkowania: <%= terms_url %>
-
-Z pozdrowieniami,
-
-Zespół <%= @instance %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.text.erb b/app/views/user_mailer/reconfirmation_instructions.text.erb
new file mode 100644
index 0000000000..b5e530251d
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.reconfirmation_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.reconfirmation_instructions.explanation' %>
+
+=> <%= confirmation_url(@resource, confirmation_token: @token) %>
+
+<%= t 'devise.mailer.reconfirmation_instructions.extra' %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
deleted file mode 100644
index 977d78137f..0000000000
--- a/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= @resource.email %>ï¼Œä½ å¥½å‘€ï¼
-
-ä½ æ£åœ¨æ›´æ”¹ä½ 在 <%= @instance %> 使用的电å邮件地å€ã€‚
-
-点击下é¢çš„链接以确认æ“作：
-<%= confirmation_url(@resource, confirmation_token: @token) %>
-
-记得读一读我们的使用æ¡æ¬¾å“¦ï¼š<%= terms_url %>
-
-æ¥è‡ª <%= @instance %> 管ç†å›¢é˜Ÿ
diff --git a/app/views/user_mailer/reset_password_instructions.ar.text.erb b/app/views/user_mailer/reset_password_instructions.ar.text.erb
deleted file mode 100644
index 0dfc85a366..0000000000
--- a/app/views/user_mailer/reset_password_instructions.ar.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-ØµØ¨Ø§Ø Ø§Ù„Ø®ÙŠØ± <%= @resource.email %>!
-
-لقد طلب Ø£Øدهم رابط تعديل كلمة مرور ماستدون الخاصة بك. يمكنك المتابعة Ùˆ مواصلة التعديل على الرابط التالي.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-يمكنك تجاهل هذه الرسالة إن لم تكن من طلب ذلك.
-لن يتم تعديل كلمة المرور الخاصة بك Ùˆ ستبقى Ù†Ùسها إلا إذا قمت بالضغط على الرابط أعلاه.
diff --git a/app/views/user_mailer/reset_password_instructions.ca.text.erb b/app/views/user_mailer/reset_password_instructions.ca.text.erb
deleted file mode 100644
index ca4c494c3b..0000000000
--- a/app/views/user_mailer/reset_password_instructions.ca.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hola <%= @resource.email %>!
-
-Algú ha sol·licitat un enllaç per canviar la contrasenya a mastodont.cat. Això es pot fer a través del següent enllaç.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si no has sol·licitat aquest canvi, si us plau, ignora aquest correu.
-La teva contrasenya no canviarà fins que accedeix a l'enllaç de dalt per crear-ne una de nova.
diff --git a/app/views/user_mailer/reset_password_instructions.en.text.erb b/app/views/user_mailer/reset_password_instructions.en.text.erb
deleted file mode 100644
index 7ed22dc2cd..0000000000
--- a/app/views/user_mailer/reset_password_instructions.en.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/user_mailer/reset_password_instructions.es.text.erb b/app/views/user_mailer/reset_password_instructions.es.text.erb
deleted file mode 100644
index 8abafcc99f..0000000000
--- a/app/views/user_mailer/reset_password_instructions.es.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-¡Hola, <%= @resource.email %>!
-
-Alguien pidió un enlace para cambiar tu contraseña en <%= @instance %>. Puedes hacer esto con el siguiente enlace.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si no fuiste tú, por favor ignora este mensaje.
-Tu contraseña no cambiará hasta que ingreses al enlace y crees una nueva.
diff --git a/app/views/user_mailer/reset_password_instructions.fa.text.erb b/app/views/user_mailer/reset_password_instructions.fa.text.erb
deleted file mode 100644
index 0b01ba906c..0000000000
--- a/app/views/user_mailer/reset_password_instructions.fa.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-سلام <%= @resource.email %>!
-
-یک Ù†Ùر درخواست کرده تا رمز شما در ماستدون عوض شود. برای این کار روی پیوند زیر کلیک کنید.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-اگر شما چنین درخواستی نداده‌اید، لطÙاً این ایمیل را نادیده بگیرید.
-تا وقتی که شما پیوند بالا را نبینید و رمز تازه‌ای نسازید، رمز شما عوض نخواهد شد.
diff --git a/app/views/user_mailer/reset_password_instructions.fi.text.erb b/app/views/user_mailer/reset_password_instructions.fi.text.erb
deleted file mode 100644
index c826d5fc88..0000000000
--- a/app/views/user_mailer/reset_password_instructions.fi.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hei <%= @resource.email %>!
-
-Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jos et pyytänyt vaihtoa, poista tämä viesti.
-Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.
diff --git a/app/views/user_mailer/reset_password_instructions.fr.text.erb b/app/views/user_mailer/reset_password_instructions.fr.text.erb
deleted file mode 100644
index 07fa3644a5..0000000000
--- a/app/views/user_mailer/reset_password_instructions.fr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Bonjour <%= @resource.email %> !
-
-Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message.
-Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau.
diff --git a/app/views/user_mailer/reset_password_instructions.he.text.erb b/app/views/user_mailer/reset_password_instructions.he.text.erb
deleted file mode 100644
index 63c96c06b6..0000000000
--- a/app/views/user_mailer/reset_password_instructions.he.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-×©×œ×•× <%= @resource.email %>!
-
-מישהו ביקש ×œ×™× ×§ להחלפת סיסמתך במסטודון. ב×פשרותך לעשות ×–×ת ×¢"×™ בלחיצה על הקישורית שבהמשך.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-×× ×‘×§×©×” זו ×œ× ×”×’×™×¢×” ממך, ×פשר ×œ×”×ª×¢×œ× ×ž×”×”×•×“×¢×”.
-סיסמתך ×œ× ×ª×•×—×œ×£ ×œ×¤× ×™ שהקישורית תיפתח בדפדפן ×•×¡×™×¡×ž× ×—×“×©×” ×ª×•×›× ×¡.
diff --git a/app/views/user_mailer/reset_password_instructions.id.text.erb b/app/views/user_mailer/reset_password_instructions.id.text.erb
deleted file mode 100644
index cd7cfc3732..0000000000
--- a/app/views/user_mailer/reset_password_instructions.id.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hai <%= @resource.email %>!
-
-Seseorang telah melakukan permintaan link untuk merubah kata sandi anda di Mastodon. Anda bisa melakukan ini melalui link dibawah ini.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jika anda tidak memintanya, mohon abaikan email ini.
-Password anda tidak akan diubah kecuali anda mengakses link di atas dan menggantinya.
diff --git a/app/views/user_mailer/reset_password_instructions.it.text.erb b/app/views/user_mailer/reset_password_instructions.it.text.erb
deleted file mode 100644
index 1de485c2e0..0000000000
--- a/app/views/user_mailer/reset_password_instructions.it.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Ciao <%= @resource.email %>!
-
-Qualcuno ha richiesto un link per cambiare la tua password su Mastodon. Lo puoi fare tramite il link qui sotto.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Se non l'hai richiesto tu, ignora questa email.
-La tua password non verrà cambiata finché non accedi al link qui sopra e ne crei una nuova.
diff --git a/app/views/user_mailer/reset_password_instructions.ja.text.erb b/app/views/user_mailer/reset_password_instructions.ja.text.erb
deleted file mode 100644
index 9ed607b581..0000000000
--- a/app/views/user_mailer/reset_password_instructions.ja.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-ã“ã‚“ã«ã¡ã¯<%= @resource.email %>ã•ã‚“
-
-Mastodonアカウントã®ãƒ‘スワードã®å¤‰æ›´ãŒãƒªã‚¯ã‚¨ã‚¹ãƒˆã•ã‚Œã¾ã—ãŸã€‚以下ã®ãƒªãƒ³ã‚¯ã‚’クリックã—ã¦æ“作を完了ã§ãã¾ã™ã€‚
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-ã“ã®ãƒ¡ãƒ¼ãƒ«ã«èº«ã«è¦šãˆã®ãªã„å ´åˆã¯ç„¡è¦–ã—ã¦ãã ã•ã„。
-上記ã®ãƒªãƒ³ã‚¯ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã€å¤‰æ›´ã‚’ã—ãªã„é™ã‚Šãƒ‘スワードã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。
diff --git a/app/views/user_mailer/reset_password_instructions.nl.text.erb b/app/views/user_mailer/reset_password_instructions.nl.text.erb
deleted file mode 100644
index eda133db28..0000000000
--- a/app/views/user_mailer/reset_password_instructions.nl.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-Hallo <%= @resource.email %>!
-
-Er heeft iemand een nieuw wachtwoord aangevraagd voor Mastodon. Je kan op de link hieronder klikken om jouw wachtwo
-ord te veranderen.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Je kan deze e-mail negeren wanneer jij dit niet hebt aangevraagd.
-Jouw wachtwoord blijft onveranderd wanneer je niet op bovenstaande link klikt.
diff --git a/app/views/user_mailer/reset_password_instructions.no.text.erb b/app/views/user_mailer/reset_password_instructions.no.text.erb
deleted file mode 100644
index 387dc7c3e1..0000000000
--- a/app/views/user_mailer/reset_password_instructions.no.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Hei <%= @resource.email %>!
-
-Noen har forespurt en lenke til å bytte passord på din Mastodon-bruker. Du kan gjøre det ved å følge lenken under.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Hvis du ikke vil endre ditt passord kan du ignorere denne epost.
-Passordet ditt blir ikke endret før du følger lenken over og endrer det.
diff --git a/app/views/user_mailer/reset_password_instructions.oc.text.erb b/app/views/user_mailer/reset_password_instructions.oc.text.erb
deleted file mode 100644
index 5a5219589b..0000000000
--- a/app/views/user_mailer/reset_password_instructions.oc.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Bonjorn <%= @resource.email %> !
-
-Qualqu’un a demandat la reïnicializacion de vòstre senhal per Mastodon. Podètz realizar la reïnicializacion en clicant sul ligam çai-jos.</p>
-
-<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>
-
-S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl.
-Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl.
diff --git a/app/views/user_mailer/reset_password_instructions.pl.text.erb b/app/views/user_mailer/reset_password_instructions.pl.text.erb
deleted file mode 100644
index 2b34afc489..0000000000
--- a/app/views/user_mailer/reset_password_instructions.pl.text.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-Witaj, <%= @resource.email %>!
-
-Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w
-poniższy link.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Jeżeli to nie Ty, zignoruj ten e-mail.
-Twoje hasło nie zostanie zmienione, dopóki nie użyjesz linku z podobnej wiadomości.
diff --git a/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb b/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb
deleted file mode 100644
index 2abff0c0d1..0000000000
--- a/app/views/user_mailer/reset_password_instructions.pt-BR.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Olá, <%= @resource.email %>!
-
-Alguém solicitou um link para mudar a sua senha na instância <%= @instance %>. Você pode fazer isso através do link abaixo:
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Se você não solicitou isso, por favor ignore este e-mail.
-A senha não será modificada até que você acesse o link acima e crie uma nova.
diff --git a/app/views/user_mailer/reset_password_instructions.ru.text.erb b/app/views/user_mailer/reset_password_instructions.ru.text.erb
deleted file mode 100644
index 4ede067ab3..0000000000
--- a/app/views/user_mailer/reset_password_instructions.ru.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-ЗдравÑтвуйте, <%= @resource.email %>!
-
-Кто-то отправил Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¾ ÑброÑе Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð´Ð»Ñ Ð’Ð°ÑˆÐµÐ³Ð¾ аккаунта Mastodon. Ð’Ñ‹ можете иÑпользовать Ð´Ð»Ñ Ñтого Ñледующую ÑÑылку:
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-ЕÑли Ð’Ñ‹ не запрашивали ÑÐ±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ, пожалуйÑта, проигнорируйте Ñто Ñообщение.
-Ваш пароль не будет изменен, пока вы не проÑледуете по вышеприведенной ÑÑылке и не Ñоздадите новый.
diff --git a/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb b/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb
deleted file mode 100644
index 31707dee10..0000000000
--- a/app/views/user_mailer/reset_password_instructions.sr-Latn.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Zdravo <%= @resource.email %>!
-
-Neko je zatražio link za promenu lozinke na instanci <%= @instance %>. Ovo možete uraditi preko linka ispod.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Ignorišite ovu poruku, ako niste Vi bili ti koji ste zatražili promenu lozinke.
-Lozinka se neće promeniti sve dok ne kliknete link iznad i ne napravite novu lozinku.
diff --git a/app/views/user_mailer/reset_password_instructions.sr.text.erb b/app/views/user_mailer/reset_password_instructions.sr.text.erb
deleted file mode 100644
index 86ea32b057..0000000000
--- a/app/views/user_mailer/reset_password_instructions.sr.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Здраво <%= @resource.email %>!
-
-Ðеко је затражио линк за промену лозинке на инÑтанци <%= @instance %>. Ово можете урадити преко линка иÑпод.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Игноришите ову поруку, ако ниÑте Ви били ти који Ñте затражили промену лозинке.
-Лозинка Ñе неће променити Ñве док не кликнете линк изнад и не направите нову лозинку.
diff --git a/app/views/user_mailer/reset_password_instructions.sv.text.erb b/app/views/user_mailer/reset_password_instructions.sv.text.erb
deleted file mode 100644
index 946426119f..0000000000
--- a/app/views/user_mailer/reset_password_instructions.sv.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hej <%= @resource.email %>!
-
-Någon har begärt en länk för att ändra ditt lösenord på <%= @instance %>. Du kan göra det genom länken nedan.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Om du inte begärt detta, ignorerar du det här e-postmeddelandet.
-Ditt lösenord ändras inte förrän du öppnar länken ovan och skapar ett nytt.
diff --git a/app/views/user_mailer/reset_password_instructions.text.erb b/app/views/user_mailer/reset_password_instructions.text.erb
new file mode 100644
index 0000000000..4fbef16ee9
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.text.erb
@@ -0,0 +1,9 @@
+<%= t 'devise.mailer.reset_password_instructions.title' %>
+
+===
+
+<%= t 'devise.mailer.reset_password_instructions.explanation' %>
+
+=> <%= edit_password_url(@resource, reset_password_token: @token) %>
+
+<%= t 'devise.mailer.reset_password_instructions.extra' %>
diff --git a/app/views/user_mailer/reset_password_instructions.th.text.erb b/app/views/user_mailer/reset_password_instructions.th.text.erb
deleted file mode 100644
index fe73b0165c..0000000000
--- a/app/views/user_mailer/reset_password_instructions.th.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password on Mastodon. You can do this through the link below.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.
diff --git a/app/views/user_mailer/reset_password_instructions.tr.text.erb b/app/views/user_mailer/reset_password_instructions.tr.text.erb
deleted file mode 100644
index a0b84b9a44..0000000000
--- a/app/views/user_mailer/reset_password_instructions.tr.text.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-Merhaba <%= @resource.email %>
-
-Biri <%= @instance %> üzerinden sizin hesabınız için parola değişim isteği gönderdi. Aşağıdaki linke tıklayarak bunu gerçekleştirebilirsiniz.
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-Eğer bu isteği siz göndermediyseniz, lütfen bu e-postayı görmezden geliniz.
-Siz bu linke tıklayıp yeni bir parola girene kadar parolanız değişmeyecektir.
-
-En içten dileklerimizle,
-
-<%= @instance %> ekibi
-
diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
deleted file mode 100644
index f7cd888471..0000000000
--- a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= @resource.email %>ï¼Œä½ å¥½å‘€ï¼
-
-æœ‰äººæƒ³ä¿®æ”¹ä½ åœ¨ <%= @instance %> 上的密ç å‘¢ã€‚å¦‚æžœä½ ç¡®å®žæƒ³ä¿®æ”¹å¯†ç çš„è¯ï¼Œç‚¹å‡»ä¸‹é¢çš„链接å§ï¼š
-
-<%= edit_password_url(@resource, reset_password_token: @token) %>
-
-å¦‚æžœä½ ä¸æƒ³ä¿®æ”¹å¯†ç çš„è¯ï¼Œè¿˜è¯·å¿½ç•¥è¿™å°é‚®ä»¶å“¦ã€‚
-åœ¨ä½ ç‚¹å‡»ä¸Šé¢çš„链接并修改密ç å‰ï¼Œä½ 的密ç 是ä¸ä¼šæ”¹å˜çš„。
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 9f17993e0e..6b430b5056 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -23,7 +23,7 @@ describe UserMailer, type: :mailer do
it 'renders confirmation instructions' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.confirmation_instructions.title')
expect(mail.body.encoded).to include 'spec'
expect(mail.body.encoded).to include Rails.configuration.x.local_domain
end
@@ -38,7 +38,7 @@ describe UserMailer, type: :mailer do
it 'renders reconfirmation instructions' do
receiver.update!(email: 'new-email@example.com', locale: nil)
- expect(mail.body.encoded).to include 'new-email@example.com'
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.reconfirmation_instructions.title')
expect(mail.body.encoded).to include 'spec'
expect(mail.body.encoded).to include Rails.configuration.x.local_domain
expect(mail.subject).to eq I18n.t('devise.mailer.reconfirmation_instructions.subject',
@@ -52,7 +52,7 @@ describe UserMailer, type: :mailer do
it 'renders reset password instructions' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.reset_password_instructions.title')
expect(mail.body.encoded).to include 'spec'
end
@@ -65,7 +65,7 @@ describe UserMailer, type: :mailer do
it 'renders password change notification' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.password_change.title')
end
include_examples 'localized subject',
@@ -77,7 +77,7 @@ describe UserMailer, type: :mailer do
it 'renders email change notification' do
receiver.update!(locale: nil)
- expect(mail.body.encoded).to include receiver.email
+ expect(mail.body.encoded).to include I18n.t('devise.mailer.email_changed.title')
end
include_examples 'localized subject',
--
GitLab