From a31aaeef04f82d98ad2059f5d8488e35a5eb029a Mon Sep 17 00:00:00 2001 From: Z Date: Tue, 29 Oct 2019 11:23:33 +0800 Subject: [PATCH] change email info and force to use zh-CN --- app/controllers/concerns/localized.rb | 7 ++++--- app/javascript/images/mailer/logo_full.png | Bin 2371 -> 4396 bytes config/locales/devise.zh-CN.yml | 14 +++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/controllers/concerns/localized.rb b/app/controllers/concerns/localized.rb index b43859d9d..8ba4172e4 100644 --- a/app/controllers/concerns/localized.rb +++ b/app/controllers/concerns/localized.rb @@ -10,9 +10,10 @@ module Localized private def set_locale - locale = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in? - locale ||= session[:locale] ||= default_locale - locale = default_locale unless I18n.available_locales.include?(locale.to_sym) + locale ='zh-CN' + #locale = current_user.locale if respond_to?(:user_signed_in?) && user_signed_in? + #locale ||= session[:locale] ||= default_locale + #locale = default_locale unless I18n.available_locales.include?(locale.to_sym) I18n.with_locale(locale) do yield diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png index 82d981fc66452b7ae7cc0c3b8f5408bbae4ef4ca..c59c90bcb617e7c9a7c3a0689a7f7d56f96a5cf6 100644 GIT binary patch literal 4396 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 ev1Ym2C;tK8X7mm-g+Lns0000本服务器的相关规定和我们的使用条款。 - subject: Mastodon：确认 %{instance} 帐户信息 + subject: 闭社：确认 %{instance} 帐户信息 title: 验证电子邮件地址 email_changed: explanation: 你的帐户的电子邮件地址即将变更为： extra: 如果你并没有请求更改你的电子邮件地址，则他人很有可能已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器管理员请求协助。 - subject: Mastodon：电子邮件地址已被更改 + subject: 闭社：电子邮件地址已被更改 title: 新电子邮件地址 password_change: explanation: 你的帐户的密码已被更改。 extra: 如果你并没有请求更改你的密码，则他人很有可能已经入侵你的帐户。请立即更改你的密码；如果你已经无法访问你的帐户，请联系服务器的管理员请求协助。 - subject: Mastodon：密码已被更改 + subject: 闭社：密码已被更改 title: 密码已被重置 reconfirmation_instructions: explanation: 点击下面的链接来确认你的新电子邮件地址。 - extra: 如果你并没有请求本次变更，请忽略此邮件。Mastodon 帐户的电子邮件地址只有在你点击上面的链接后才会更改。 - subject: Mastodon：确认 %{instance} 电子邮件地址 + extra: 如果你并没有请求本次变更，请忽略此邮件。闭社帐户的电子邮件地址只有在你点击上面的链接后才会更改。 + subject: 闭社：确认 %{instance} 电子邮件地址 title: 验证电子邮件地址 reset_password_instructions: action: 更改密码 explanation: 点击下面的链接来更改帐户的密码。 extra: 如果你并没有请求本次变更，请忽略此邮件。你的密码只有在你点击上面的链接并输入新密码后才会更改。 - subject: Mastodon：重置密码信息 + subject: 闭社：重置密码信息 title: 重置密码 unlock_instructions: - subject: Mastodon：帐户解锁信息 + subject: 闭社：帐户解锁信息 omniauth_callbacks: failure: 由于%{reason}，无法从%{kind}获得授权。 success: 成功地从%{kind}获得授权。