diff --git a/app/models/user_extensions.rb b/app/models/user_extensions.rb
index d9a0f520a..726918729 100644
--- a/app/models/user_extensions.rb
+++ b/app/models/user_extensions.rb
@@ -12,6 +12,8 @@ class UserExtensions < ActiveRecord::Base
belongs_to :user
belongs_to :school, :class_name => 'School', :foreign_key => :school_id
attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
+ validates_length_of :description, :maximum => 255
+ validates_length_of :brief_introduction, :maximum => 255
TEACHER = 0
STUDENT = 1
ENTERPRISE = 2
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index f17f0306f..580ddf773 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -17,7 +17,7 @@
<% if( @act.nil? || @act != 'password') %>
<%= render_flash_messages %>
- <%= error_messages_for 'user' %>
+ <%= error_messages_for 'user',@user.user_extensions %>
<% end %>
- 登录名 :
@@ -141,8 +141,8 @@
<%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
-
-
+
+
- <%= f.select :language, :Chinese => :zh, :English => :en %>
-
确认
diff --git a/config/locales/my/zh.yml b/config/locales/my/zh.yml
index 35fd4e48a..4220aceca 100644
--- a/config/locales/my/zh.yml
+++ b/config/locales/my/zh.yml
@@ -31,9 +31,11 @@ zh:
label_account_identity_developer: 开发者
label_account_identity_enterprise: 组织
label_account_identity_studentID: 请输入学号
-
+
+ field_brief_introduction_my: 个人签名
+ field_description: 个人简介
field_is_required: 必填
- field_firstname: 名字
+ field_firstname: 名字或组织名
firstname_empty: 名字不能为空
field_firstname_eg: '(例:张三丰,请填写[三丰])'
field_lastname: 姓氏