diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-12-27 21:35:47 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-12-27 21:35:47 +0000 |
| commit | 797a8429a0deb511e6d6092edad39f856231534e (patch) | |
| tree | 6e44d3c2a5a662dfc4e4087fdc391b8e7bb41dba /app/views/user_mailer/welcome.text.erb | |
| parent | 94894b8a6ad1247306497dc8c0c47d52a8a2f72c (diff) | |
| parent | f349fe2159fb36e598263f2797f041417ef7c2da (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/views/user_mailer/welcome.text.erb')
| -rw-r--r-- | app/views/user_mailer/welcome.text.erb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb index 5bd0cab2a..e310d7ca6 100644 --- a/app/views/user_mailer/welcome.text.erb +++ b/app/views/user_mailer/welcome.text.erb @@ -2,7 +2,7 @@ === -<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.username}@#{@instance}" %>) +<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.local_username_and_domain}" %>) <%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %> --- @@ -24,7 +24,6 @@ <%= t 'user_mailer.welcome.tips' %> * <%= t 'user_mailer.welcome.tip_mobile_webapp' %> -* <%= strip_tags(t('user_mailer.welcome.tip_bridge_html')) %> (https://bridge.joinmastodon.org) * <%= t 'user_mailer.welcome.tip_following' %> * <%= t 'user_mailer.welcome.tip_local_timeline', instance: @instance %> * <%= t 'user_mailer.welcome.tip_federated_timeline' %> |