about summary refs log tree commit diff
path: root/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
diff options
context:
space:
mode:
authorMingye Wang <arthur200126@gmail.com>2017-09-16 12:48:38 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-09-16 18:48:38 +0200
commitc8969dca3581cb82c5787f37bb4022f7af74cd15 (patch)
tree2f4c5d7d3b3709e2720d4a902d016359855f1247 /app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
parent1e3b1d721124b666c6625bedcba3f78e716a85dc (diff)
Minor Chinese check & jsx addition (#4973)
* zh-*: transition from "like" back to "fav"

This commit reverts the translation for the yellow-star "fav" button
back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is
deliberately used in zh-TW/HK by using the existing phrase "最爱"
(favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.),
"collect") in some instances.

Fixes #3511.

* zh-*: apply suggestions for PR #4557

* zh-cn: de-monetize ya account

In Chinese two separate characters, 账 and 帐, can be used to spell the
word for account (账/帐户). However, the one with a 贝 on the left is
evolved from the latter specifically for monetary purposes. Since
people usually can't figure out which one to use, it might be a good
idea to use the original not-so-money one.

* zh-*: complete jsx translation
Diffstat (limited to 'app/views/user_mailer/confirmation_instructions.zh-cn.text.erb')
-rw-r--r--app/views/user_mailer/confirmation_instructions.zh-cn.text.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
index ce237a32d..d7d4b4b23 100644
--- a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
@@ -3,7 +3,7 @@
 你刚刚在 <%= @instance %> 创建了帐号。
 
 点击下面的链接来完成注册啦 : <br>
-<%= link_to '确认账户', confirmation_url(@resource, confirmation_token: @token) %>
+<%= link_to '确认帐户', confirmation_url(@resource, confirmation_token: @token) %>
 
 别忘了看看 <%= link_to 'terms and conditions', terms_url %>。