]> cat aescling's git repositories - mastodon.git/commit
Minor Chinese check & jsx addition (#4973)
authorMingye Wang <arthur200126@gmail.com>
Sat, 16 Sep 2017 16:48:38 +0000 (12:48 -0400)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 16 Sep 2017 16:48:38 +0000 (18:48 +0200)
commitc8969dca3581cb82c5787f37bb4022f7af74cd15
tree2f4c5d7d3b3709e2720d4a902d016359855f1247
parent1e3b1d721124b666c6625bedcba3f78e716a85dc
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
app/javascript/mastodon/locales/zh-CN.json
app/javascript/mastodon/locales/zh-HK.json
app/javascript/mastodon/locales/zh-TW.json
app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
config/locales/zh-CN.yml
config/locales/zh-HK.yml
config/locales/zh-TW.yml