1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
SerCom_KC
fb16c37d2a Update Simplified Chinese translations ()
* i18n: (zh-CN) Update translation for 

* e-mail -> email

* i18n: (zh-CN) Update translations for 

* i18n: (zh-CN) Minor Improvements

* i18n: (zh-CN) Update translations for 

* i18n: (zh-CN) Update translations for 
2018-01-17 16:47:25 +01:00
SerCom_KC
3323b4173e Change disclaimer in email according to () 2018-01-16 06:44:57 +01:00
Eugen Rochko
5276c0a090
HTML e-mails for UserMailer ()
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
2018-01-16 03:29:11 +01:00
Patrick Figel
04ecf44c2f Add confirmation step for email changes ()
* Add confirmation step for email changes

This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.

Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.

Fixes 

* Add review fixes
2018-01-02 16:55:00 +01:00
jeroenpraat
7c1f3f8163 Added a warning to look into the spam folder ()
Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.
2017-05-17 02:55:37 +02:00
Thomas Citharel
d90d23699c Make Reporting admin section translatable ()
* Make Reporting admin section translatable

And translate it into english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make subject of emails translatable and improve french translation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make error pages translatable and translate them in english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Translate site setting section

* Insert instance in registration emails and improve them a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-04-12 17:11:49 +02:00
Jantso Porali
9e3c4fd2d7 Update language files ()
* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* fix for Amazon S3/Minio instance setups

If you were using S3 or Minio for your files, this will fix the Import issue :)

* update translation according to issue 

See issue 

* update translation for issue 

see issue 
2017-04-11 21:41:29 +02:00
Eugen Rochko
546c4718e7 Localizations for most server-side strings 2016-11-16 00:55:33 +01:00
Waldir Pimenta
4f654eb822 use consistent capitalization for subject lines 2016-10-06 11:16:59 +01:00
Yann Vaillant
038a407b9e
Update default devise wording to include reference to Mastodon
Fix 
2016-10-06 07:45:07 +02:00
Eugen Rochko
7e93da3f8d Removing grape and adding devise 2016-03-05 13:12:24 +01:00