diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /app/views/user_mailer/email_changed.zh-cn.html.erb | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'app/views/user_mailer/email_changed.zh-cn.html.erb')
| -rw-r--r-- | app/views/user_mailer/email_changed.zh-cn.html.erb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/app/views/user_mailer/email_changed.zh-cn.html.erb b/app/views/user_mailer/email_changed.zh-cn.html.erb deleted file mode 100644 index 74b1b6150..000000000 --- a/app/views/user_mailer/email_changed.zh-cn.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<p><%= @resource.email %>，你好呀！</p> - -<% if @resource&.unconfirmed_email? %> - <p>我们发送这封邮件是为了提醒你，你在 <%= @instance %> 上使用的电子邮件地址即将变更为 <%= @resource.unconfirmed_email %>。</p> -<% else %> - <p>我们发送这封邮件是为了提醒你，你在 <%= @instance %> 上使用的电子邮件地址已经变更为 <%= @resource.unconfirmed_email %>。</p> -<% end %> - -<p> - 如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系实例的管理员请求协助。 -</p> - -<p>来自 <%= @instance %> 管理团队</p> |