about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-07 15:17:13 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-07 15:17:13 +0000
commitc2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (patch)
treeeb2c9fd328b985d7d388e4a6f9543e0a1180a9e8 /app
parent5083311d64f427771609e444b87c0c39cb6f8ac2 (diff)
parent1d92b90be9f494d90a6f79f53be9cca68562867e (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb2
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json6
-rw-r--r--app/views/user_mailer/email_changed.zh-cn.html.erb13
-rw-r--r--app/views/user_mailer/email_changed.zh-cn.text.erb11
-rw-r--r--app/views/user_mailer/reconfirmation_instructions.zh-cn.html.erb13
-rw-r--r--app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb10
6 files changed, 51 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f3d8f6966..175c25cd6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -31,7 +31,7 @@ class ApplicationController < ActionController::Base
   private
 
   def https_enabled?
-    Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'
+    Rails.env.production?
   end
 
   def store_current_location
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index ce16dcd8e..ef850256c 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -50,7 +50,7 @@
   "column_header.unpin": "取消固定",
   "column_subheading.navigation": "导航",
   "column_subheading.settings": "设置",
-  "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
+  "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”,因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
   "compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
   "compose_form.lock_disclaimer.lock": "开启保护",
   "compose_form.placeholder": "在想啥?",
@@ -214,7 +214,7 @@
   "search_popout.tips.user": "用户",
   "search_results.total": "共 {count, number} 个结果",
   "standalone.public_title": "大家都在干啥?",
-  "status.block": "Block @{name}",
+  "status.block": "屏蔽 @{name}",
   "status.cannot_reblog": "无法转嘟这条嘟文",
   "status.delete": "删除",
   "status.embed": "嵌入",
@@ -223,7 +223,7 @@
   "status.media_hidden": "隐藏媒体内容",
   "status.mention": "提及 @{name}",
   "status.more": "更多",
-  "status.mute": "Mute @{name}",
+  "status.mute": "隐藏 @{name}",
   "status.mute_conversation": "隐藏此对话",
   "status.open": "展开嘟文",
   "status.pin": "在个人资料页面置顶",
diff --git a/app/views/user_mailer/email_changed.zh-cn.html.erb b/app/views/user_mailer/email_changed.zh-cn.html.erb
new file mode 100644
index 000000000..74b1b6150
--- /dev/null
+++ b/app/views/user_mailer/email_changed.zh-cn.html.erb
@@ -0,0 +1,13 @@
+<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>
diff --git a/app/views/user_mailer/email_changed.zh-cn.text.erb b/app/views/user_mailer/email_changed.zh-cn.text.erb
new file mode 100644
index 000000000..d59ac58c4
--- /dev/null
+++ b/app/views/user_mailer/email_changed.zh-cn.text.erb
@@ -0,0 +1,11 @@
+<%= @resource.email %>,你好呀!
+
+<% if @resource&.unconfirmed_email? %>
+我们发送这封邮件是为了提醒你,你在 <%= @instance %> 上使用的电子邮件地址即将变更为 <%= @resource.unconfirmed_email %>。
+<% else %>
+我们发送这封邮件是为了提醒你,你在 <%= @instance %> 上使用的电子邮件地址已经变更为 <%= @resource.unconfirmed_email %>。
+<% end %>
+
+如果你并没有请求更改你的电子邮件地址,则他人很有可能已经入侵你的帐户。请立即更改你的密码;如果你已经无法访问你的帐户,请联系实例的管理员请求协助。
+
+来自 <%= @instance %> 管理团队
diff --git a/app/views/user_mailer/reconfirmation_instructions.zh-cn.html.erb b/app/views/user_mailer/reconfirmation_instructions.zh-cn.html.erb
new file mode 100644
index 000000000..7b79a490e
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.zh-cn.html.erb
@@ -0,0 +1,13 @@
+<p><%= @resource.email %>,你好呀!</p>
+
+<p>你正在更改你在 <%= @instance %> 使用的电子邮件地址。</p>
+
+<p>点击下面的链接以确认操作:<br>
+<%= link_to '确认我的电子邮件地址', confirmation_url(@resource, confirmation_token: @token) %></p>
+
+<p>上面的链接按不动?把下面的链接复制到地址栏再试试:<br>
+<span><%= confirmation_url(@resource, confirmation_token: @token) %></span>
+
+<p>记得读一读我们的<%= link_to '使用条款', terms_url %>哦。</p>
+
+<p>来自 <%= @instance %> 管理团队</p>
diff --git a/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
new file mode 100644
index 000000000..977d78137
--- /dev/null
+++ b/app/views/user_mailer/reconfirmation_instructions.zh-cn.text.erb
@@ -0,0 +1,10 @@
+<%= @resource.email %>,你好呀!
+
+你正在更改你在 <%= @instance %> 使用的电子邮件地址。
+
+点击下面的链接以确认操作:
+<%= confirmation_url(@resource, confirmation_token: @token) %>
+
+记得读一读我们的使用条款哦:<%= terms_url %>
+
+来自 <%= @instance %> 管理团队