From 3317ca4a975c80afbf5b2f59e7f04f59f67cf943 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 21 Nov 2014 16:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug:=20<=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E7=99=BB=E5=BD=95=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=BC=96=E8=BE=91>=20<=E6=B3=A8=E5=86=8C=E6=97=B6?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E8=A2=AB=E6=A0=87=E8=AF=86=E4=B8=BA?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=98=AF=E8=8B=B1=E6=96=87=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E5=8F=AF=E4=BB=A5=E4=B8=BA=E6=95=B0=E5=AD=97=E7=9A=84?= =?UTF-8?q?>=20<=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=9C=80=E7=9F=AD10=E4=B8=AA=E5=AD=97=E7=AC=A6=EF=BC=8C?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E8=BE=93=E5=85=A5=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=B0=91=E4=BA=8E10=E4=B8=AA=E5=AD=97=E7=AC=A6=E4=B9=9F?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E2=80=9C?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=AE=BE=E7=BD=AE=E6=88=90=E5=8A=9F=E2=80=9D?= =?UTF-8?q?>=20<=E9=82=AE=E7=AE=B1=E6=BF=80=E6=B4=BB=E2=80=9D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=8B=A5=E5=B9=B2=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?>=20Signed-off-by:=20alan=20<547533434@qq.com>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/account/email_valid.html.erb | 16 ++++++---------- app/views/account/register.html.erb | 21 +++++++++++++++++++-- app/views/my/account.html.erb | 2 +- config/locales/zh.yml | 5 +++-- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb index 6f4de1197..c77c0294e 100644 --- a/app/views/account/email_valid.html.erb +++ b/app/views/account/email_valid.html.erb @@ -11,7 +11,7 @@ <% email = @user.mail.split("@")[1] %> -
+

邮箱激活

@@ -19,9 +19,10 @@
-

请在24小时内点击邮件中的链接继续完成注册

-
- 邮件已发送到邮箱 +

请在24小时内点击邮件中的链接继续完成注册

+
+
+ 邮件已发送到邮箱 <%= @user.mail %>

@@ -33,12 +34,7 @@ padding: 10px 16px; line-height: 1.33;" target="_blank">立即查收邮件

- - 没收到邮件？ - -
- - 请先检查是否在垃圾邮件中 +
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 21bdd8fa7..0bebfdf5f 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -19,7 +19,7 @@

<%= f.text_field :login, :size => 25, :required => true %> <%= l(:label_max_number) %>

-

<%= f.password_field :password, :size => 25, :required => true %> +

<%= f.password_field :password, :size => 25, :required => true %> <%= l(:text_caracters_minimum, :count => Setting.password_min_length) %>

<%= f.password_field :password_confirmation, :size => 25, :required => true %>

@@ -56,10 +56,12 @@

<%= custom_field_tag_with_label :user, value %>

<% end %>
+<% password_min_length = Setting.password_min_length %>