diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 3f603368a..651067475 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -173,7 +173,7 @@ @@ -215,7 +215,7 @@ <%= l(:label_new_activity) %>   - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index f16e6d397..aa7a3155e 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -30,6 +30,7 @@

<% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> + <%= "：" unless user_courses.empty? %> <% for course in user_courses %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> <% end %> diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 724fb66cd..db2aa7801 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -94,8 +94,8 @@ en: # label_followers: Followers label_contribute_to: - one: "Participates %{count} project—" - other: "Participates %{count} projects—" + one: "Participates %{count} project" + other: "Participates %{count} projects" # diff --git a/config/locales/users/en.yml b/config/locales/users/en.yml index c68087efa..c96ff45b2 100644 --- a/config/locales/users/en.yml +++ b/config/locales/users/en.yml @@ -24,23 +24,23 @@ en: # # 左边栏 # - label_user_edit: Edit information - label_user_grade: Individual score + label_user_edit: Edit + label_user_grade: Score - label_user_score: Individual synthetic score - label_user_score_of_influence: Influence score - label_user_score_of_collaboration: Collaborative score - label_user_score_of_skill: Skill score - label_user_score_of_active: Project score + label_user_score: Total + label_user_score_of_influence: Influence + label_user_score_of_collaboration: Collaboration + label_user_score_of_skill: Skill + label_user_score_of_active: Workload userscore: collaboration: - memos: The number of Posts - message_for_issues: The number of messages to issues - issue_status: Times of change the issue state - reply_for_messages: The number of replies to messages - reply_for_memos: The number of replies to posts + memos: Posts + message_for_issues: Comments to issues + issue_status: Changes to issues + reply_for_messages: Replies to messages + reply_for_memos: Replies to posts influence: - followers: Followers + followers: Fans skill: tramples: 踩别人的帖子数量 like: @@ -53,26 +53,26 @@ en: level3: 帖子被三级会员踩的次数 active: commit: - codes: 提交代码次数 - documents: 提交文档次数 - attachments: 提交附件次数 - update_issues: 更新缺陷完成度次数 - release_issues: 发布缺陷数量 + codes: Commits + documents: Documents + attachments: Attachments + update_issues: Updates of issue states + release_issues: Issues label_score_less_than_zero: Score less than 0, revised to 0 - label_user_info: User information - label_user_watcher: Followers - label_user_fans: Followed by + label_user_info: Information + label_user_watcher: Following + label_user_fans: Followed label_x_user_fans: zero: Fan one: Fan other: Fans - label_brief_introduction: Personality words - label_my_brief_introduction: "How are feeling today? Leave your footprints ~" + label_brief_introduction: Feeling words + label_my_brief_introduction: "How are feeling today? Leave some words ~~" - label_user_joinin: Join date + label_user_join: Join label_user_login: Last login label_technical_title: Title @@ -113,7 +113,7 @@ en: label_goto: "Go to»" - label_activity_project: "Project：" + label_activity_project: "Project" label_active_call: call label_active_homework: homework # 评论、评论数在commons模块下 @@ -136,11 +136,11 @@ en: label_about_issue: "about the issue—" label_about_requirement: "about requirement—" - label_have_respond: had a respond + label_have_respond: " had a respond" label_in_issues: "in the issue—" - label_no_user_respond_you: "There is no respond for you！" + label_no_user_respond_you: "No responses for you now:)" # end @@ -149,12 +149,12 @@ en: # # 项目栏 # - label_project_unadd: "No project, go to creat it!" + label_project_unadd: "No project, creat one!" label_project_un: "You haven't joined any project yet!" - label_has_watched_project: "The projects of attention" - label_project_take: "The projects of participation" + label_has_watched_project: "Followed projects" + label_project_take: "Joined projects" label_project_take_in: "joined the project—" @@ -163,9 +163,9 @@ en: # # 课程栏 # - label_project_course_un: "The user is not enrolled in any course yet. " - label_project_course_unadd: "You have no course,creat one now!" - label_project_cousre_studentun: "You have not joined any course, come and join now!" + label_project_course_un: "Not joined any course yet." + label_project_course_unadd: "You have no course,creat one now:)" + label_project_cousre_studentun: "No courses, come and join now!" user: courses: doing: Strating @@ -178,13 +178,13 @@ en: # 留言栏 # label_responses: Messages - label_user_response: Feedback + label_user_response: Comment label_leave_a_message: "Leave him/her a message" button_leave_meassge: Submit button_clear_meassge: Reset label_user_login_new: Login - label_user_login_tips: "You haven't logged in, please login first to leave a message!" + label_user_login_tips: "Log in before leave a message:)" label_bid_respond_delete: Delete label_bid_respond_quote: Respond @@ -205,12 +205,13 @@ en: # # Followers & Fans # + label_user_joinin: Join at label_x_contribute_to: zero: "participates %{count} project" - one: "participates %{count} project—" - other: "participates %{count} projects—" + one: "participates %{count} project" + other: "participates %{count} projects" label_x_course_contribute_to: zero: "participates %{count} course" - one: "participates %{count} course—" - other: "participates %{count} courses—" + one: "participates %{count} course" + other: "participates %{count} courses"

- <%= l(:label_user_joinin) %>： + <%= l(:label_user_join) %>： <%= format_time(@user.created_on) %> diff --git a/app/views/open_source_projects/master_apply.html.erb b/app/views/open_source_projects/master_apply.html.erb index f99701932..48e8d275d 100644 --- a/app/views/open_source_projects/master_apply.html.erb +++ b/app/views/open_source_projects/master_apply.html.erb @@ -64,6 +64,7 @@ <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> <% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_course_contribute_to, :count => memberships.count) %> + <%= "：" unless user_courses.empty? %> <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index f38595302..4b899ac5c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -93,7 +93,7 @@ <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index ede20fd78..947366eeb 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -17,7 +17,7 @@

<%= l(:label_tags_search_result) %>

- <%= l(:label_tags_numbers) %> + <%= l(:label_tags_numbers) %>： <%= l(:label_issue_plural) %>(<%= @issues_tags_num %>) | <%= l(:label_project_plural) %>(<%= @projects_tags_num %>) | <%= l(:label_user_plural) %>(<%= @users_tags_num %>) | diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb index d0c9e204b..4a503f651 100644 --- a/app/views/users/_user_show.html.erb +++ b/app/views/users/_user_show.html.erb @@ -42,6 +42,7 @@ <%# memberships = user.memberships.all(:conditions => cond) %> <% user_courses = user_courses_list(user) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %> + <%= "：" unless user_courses.empty? %> <% for course in user_courses %> <%# if course.name != nil %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b16c017a7..673e01d72 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -201,7 +201,7 @@ <%= l(:label_i_new_activity) %>   - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> + <%= link_to(l(:label_activity_project)+"："+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %>