diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b129db12a..3539f98ef 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -193,7 +193,7 @@
- + @@ -238,11 +238,11 @@ --> - + - + - +
欢迎 <%=User.current.name%> 加入trustie!
<%= l(:label_welcome) %> <%=User.current.name%> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %>
<%= l(:label_user_watcher) %> (<%= User.watched_by(User.current).count %>) <%= render :partial => "watchers/fans_num",:locals => {:fans_num => get_fans_num(User.current) }%>

<%= l(:label_create_course) %>

创建新项目,让我们开启一次神奇的开源之旅!<%= l(:label_create_new_projects_description) %>  为你所想,发布需求,体验答案找上门的兴奋感觉!<%= l(:label_call_for_bids_description) %>  课程小社区,创建新课程,让我们共同分享多到想不到的公共资源!<%= l(:label_create_course_description) %>
@@ -262,11 +262,11 @@ <%= image_tag("/images/welcome/boards.png", weight:"30px", height: "26px") %><%= l(:label_milestone) %> - 七嘴八舌,汇聚众人智慧,为您排忧解难! + <%= l(:label_board_description) %>   - 实时了解项目的最新动态,掌握最新项目咨询! + <%= l(:label_news_description) %>   - 在这里您可以可以看见任何一个版本的工程! + <%= l(:label_milestone_description) %> diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index ceaba1ed5..1f9b3a76b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -489,7 +489,7 @@ en-GB: label_information: Information label_information_plural: Information label_please_login: Please log in - label_register: Register + label_register: Sign up label_login_with_open_id_option: or login with OpenID label_password_lost: Lost password label_home: Home @@ -498,7 +498,7 @@ en-GB: label_my_projects: My projects label_my_page_block: My page block label_administration: Administration - label_login: Sign in + label_login: Login label_logout: Sign out label_help: Help label_reported_issues: Reported issues diff --git a/config/locales/en.yml b/config/locales/en.yml index 0a7b9e3a5..30f22e5df 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -531,7 +531,7 @@ en: label_information: Information label_information_plural: Information label_please_login: Please log in - label_register: Register + label_register: Sign up label_login_with_open_id_option: or login with OpenID label_password_lost: Lost password label_home: Home @@ -540,7 +540,7 @@ en: label_my_projects: My projects label_my_page_block: My page block label_administration: Administration - label_login: Sign in + label_login: Login label_logout: Sign out label_help: Help label_reported_issues: Reported issues @@ -766,7 +766,8 @@ en: label_disabled: disabled label_show_completed_versions: Show completed versions label_me: me - label_board: Forum + label_board: Forums + label_board_description: Rushes,brought together all wisdom,solve problems for you! label_board_new: New forum label_board_plural: Forums label_board_locked: Locked @@ -1196,11 +1197,13 @@ en: label_cancel_praise: cancel praise label_bid_reason: Please show your reason default_tracker_task: Task - label_create_new_projects: Create projects - label_call_for_bids: Call for bids - label_create_course: Create courses + label_create_new_projects_description: Create a new project,let us open a magical journey of collaborative creation and development! + label_call_for_bids_description: As you might expect,show your requirement,experience the feeling of excitement that find the answer! + label_create_course_description: Curriculum small communities,create new courses,let us share more to think of public resources! label_news: News + label_news_description: Real getting the project's latest developments,obtain the latest project information! label_milestone: Milestone + label_milestone_description: Here you can see any version of the project! label_features: Features label_has_praisers: praisers(%{count}) label_has_watchers: watchers(%{count}) @@ -1216,4 +1219,6 @@ en: label_about_requirement: about requirement: label_about_issue: about issue: label_quote_my_words: quoted my words - label_have_respond: had a respond \ No newline at end of file + label_have_respond: had a respond + label_welcome: Welcome + label_join: join Trustie! \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b90867e20..9d4d1b812 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1229,4 +1229,13 @@ zh: label_in_issues: 在问题: label_in_bids: 在需求: label_in_users: 在用户: - label_have_respond: 进行了反馈 \ No newline at end of file + label_have_respond: 进行了反馈 + label_create_new_projects_description: 创建项目,让我们开启一次神奇的协同创作和开发之旅! + label_call_for_bids_description: 为你所想,发布需求,体验答案找上门的兴奋感觉! + label_news_description: 实时了解项目的最新动态,掌握最新项目咨询! + label_milestone_description: 在这里您可以看见任何一个版本的工程! + label_have_respond: 进行了反馈 + label_welcome: 欢迎 + label_join: 加入Trustie! + label_board_description: 七嘴八舌,汇聚众人智慧,为您排忧解难! + label_create_course_description: 课程小社区,创建新课程,让我们共同分享多到想不到的公共资源! \ No newline at end of file