diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 0750ce4a..704597c2 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -63,7 +63,7 @@ <%= @project.attachments.count %> <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %> - <%= link_to(l(:label_project_defect), project_issues_path(@project), :class => 'project_infor_tag') %> + <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %> diff --git a/app/views/users/info.html.erb b/app/views/users/info.html.erb index 7966221c..af72f8f2 100644 --- a/app/views/users/info.html.erb +++ b/app/views/users/info.html.erb @@ -12,16 +12,16 @@ <%= link_to(h(e.user), user_path(e.user)) %> <% if e.instance_of?(JournalsForMessage)%> <% if e.reply_id == User.current.id%> - 对我的话进行了引用<%if e.jour_type == 'Bid'%><%= link_to('link', respond_path(e.jour))%><% else %><%= link_to('link', feedback_path(e.jour))%><% end %> + <%= l(:label_quote_my_words) %><%if e.jour_type == 'Bid'%><%= link_to('link', respond_path(e.jour))%><% else %><%= link_to('link', feedback_path(e.jour))%><% end %> <% else %> - 对需求：<%= link_to(e.jour.name, respond_path(e.jour_id))%>进行了反馈 + <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %> <% end %> <% else %> <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> - 对问题：<%= link_to(e.issue.subject, issue_path(e.journalized_id))%>进行了反馈 + <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id))%><%= l(:label_have_respond) %> <% else %> - 对我的话进行了引用<%= link_to('link', issue_path(e.issue))%> + <%= l(:label_quote_my_words) %><%= link_to('link', issue_path(e.issue))%> <% end %> <% end %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 5901725b..93535537 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -158,11 +158,11 @@ <% unless User.current.logged? %> - + - + <% if Setting.openid? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 9c58d5b3..0a7b9e3a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -510,7 +510,7 @@ en: label_role_and_permissions: Roles and permissions label_role_anonymous: Anonymous label_role_non_member: Non member - label_member: Member + label_member: Members label_member_new: New member label_member_plural: Members label_tracker: Tracker @@ -573,7 +573,7 @@ en: label_no_data: No data to display label_change_status: Change status label_history: History - label_attachment: File + label_attachment: Files label_attachment_new: New file label_attachment_delete: Delete file label_attachment_plural: Files @@ -1119,9 +1119,9 @@ en: label_user_activities: "You have no activities,come and join us!" label_project_overview: "Overview" label_project_tool: "Tool" - label_project_defect: "Defect" + label_project_defects: "Defects" label_project_newother: "See other comments" - label_project_newshare: "share" + label_project_newshare: "has shared" label_project_newadd: "added" label_project_unadd: "No project,go to creat it!" label_project_un: "You haven't joined any project!" @@ -1187,7 +1187,7 @@ en: label_wrong_budget: The error format of money label_wrong_date: wrong date format, input right date yyyy-mm-dd button_upload_photo: Upload photo - label_leave_me_message: leave message to me + label_leave_me_message: left a message to me label_leave_others_message: leave message to him/her label_leave_a_message: Leave him/her a message： label_new_activity: has new activity @@ -1210,4 +1210,10 @@ en: label_i: I label_join_bidding: joined the bidding label_bidding_user: Bidding user： - label_bidding_reason: Bidding reason： \ No newline at end of file + label_bidding_reason: Bidding reason： + label_username: username： + label_password: password： + 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 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 9451e84c..24fcb3c1 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -261,7 +261,7 @@ zh: field_last_login_on: 最后登录 field_language: 语言 field_effective_date: 日期 - field_password: 密码 + field_password: 密码： field_new_password: 新密码 field_password_confirmation: 确认 field_version: 版本 @@ -773,7 +773,7 @@ zh: label_user_activities: "您当前还没有活动，快来加入我们吧！" label_project_overview: "概述" label_project_tool: "工具" - label_project_defect: "缺陷" + label_project_defects: "缺陷" label_project_newother: "查看其他评论" label_project_newshare: "分享了" label_project_newadd: "添加了" @@ -1219,4 +1219,10 @@ zh: label_i: 我 label_join_bidding: 参与了应标 label_bidding_user: 应标人： - label_bidding_reason: 应标宣言： \ No newline at end of file + label_bidding_reason: 应标宣言： + label_username: 用户名： + label_password: 密码： + label_about_requirement: 对需求： + label_about_issue: 对问题： + label_quote_my_words: 对我的话进行了引用 + label_have_respond: 进行了反馈 \ No newline at end of file
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>