autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor Chinese check & jsx addition (#4973)

Browse Source 
* 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
This commit is contained in:
Mingye Wang
2017-09-16 12:48:38 -04:00
committed by Eugen Rochko
parent 1e3b1d7211
commit c8969dca35
10 changed files with 179 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
View File

@ -3,7 +3,7 @@
<p>你刚刚在 <%= @instance %> 创建了帐号。</p>
<p>点击下面的链接来完成注册啦 : <br>
<%= link_to '确认账户', confirmation_url(@resource, confirmation_token: @token) %>
<%= link_to '确认帐户', confirmation_url(@resource, confirmation_token: @token) %>
<p>别忘了看看 <%= link_to '使用条款', terms_url %>。</p>

2
app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
View File

@ -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 %>。

2
app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
View File

@ -1,6 +1,6 @@
<p><%= @resource.email %> ，嗨呀!!</p>
<p>有人（但愿是你）请求更改你Mastodon账户的密码。如果是你的话，请点击下面的链接：</p>
<p>有人（但愿是你）请求更改你Mastodon帐户的密码。如果是你的话，请点击下面的链接：</p>
<p><%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %></p>

2
app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
View File

@ -1,6 +1,6 @@
<%= @resource.email %> ，嗨呀!!
有人（但愿是你）请求更改你Mastodon账户的密码。如果是你的话，请点击下面的链接：
有人（但愿是你）请求更改你Mastodon帐户的密码。如果是你的话，请点击下面的链接：
<%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %>