diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index 3f0ad6cf8..5a358628e 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -29,8 +29,8 @@
- 高校课程实践社区 |
- <%= l(:label_user_location) %> : |
+ 高校课程实践社区 |
+ <%= l(:label_user_location) %> : |
@@ -155,7 +155,7 @@
-
+
<%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%> |
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d5964c011..03530a97a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -600,7 +600,7 @@ zh:
label_my_page_block: 我的工作台模块
label_administration: 管理
label_login: 登录
- label_login_prompt: 邮箱/账号
+ label_login_prompt: 邮箱/昵称
lable_user_name: 登录名
label_logout: 退出
label_help: 帮助