From c8969dca3581cb82c5787f37bb4022f7af74cd15 Mon Sep 17 00:00:00 2001 From: Mingye Wang Date: Sat, 16 Sep 2017 12:48:38 -0400 Subject: Minor Chinese check & jsx addition (#4973) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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/views/user_mailer/reset_password_instructions.zh-cn.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/views/user_mailer/reset_password_instructions.zh-cn.html.erb') diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb index 245382b2c..51e3073f1 100644 --- a/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb +++ b/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb @@ -1,6 +1,6 @@

<%= @resource.email %> ，嗨呀!!

-

有人（但愿是你）请求更改你Mastodon账户的密码。如果是你的话，请点击下面的链接：

+

有人（但愿是你）请求更改你Mastodon帐户的密码。如果是你的话，请点击下面的链接：

<%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %>

-- cgit