From ff67826a797994dd2acb5b36493f4968584e6211 Mon Sep 17 00:00:00 2001 From: kaizheng <18763216000@163.com> Date: Fri, 9 Aug 2013 16:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=B8=AA=E9=9C=80=E6=B1=82=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_history.html.erb | 2 +- app/views/layouts/base_bids.html.erb | 14 +++++++------- config/locales/en.yml | 21 ++++++++++++++++----- config/locales/zh.yml | 12 +++++++++++- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 4a4002df..fb96bf13 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -40,7 +40,7 @@ <%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %> - + diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index f442e672..46b1f69c 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -45,23 +45,23 @@
<%=link_to journal.user, user_path(journal.user)%> 对需求进行了反馈<%= link_to "##{journal.indice}", {}, :class => "journal-link" %> <%=link_to journal.user, user_path(journal.user)%> <%= l(:label_respond_requirement) %><%= link_to "##{journal.indice}", {}, :class => "journal-link" %>

<%= textilizable journal.notes%>

- + - + - +
投资人：<%= link_to(@user, user_path(@user))%><%= l(:label_investor) %><%= link_to(@user, user_path(@user))%>
投资预算：<%= @bid.budget %><%= l(:label_investment_budget) %><%= @bid.budget %>
投资时限：<%= @bid.deadline%><%= l(:label_investment_time_limit) %><%= @bid.deadline%>
- 关注 (<%= link_to @bid.watcher_users.count, home_path %>)  应标项目 (<%= link_to @bid.biding_projects.count, project_for_bid_path(@bid) %>) 反馈(<%= link_to @bid.commit, respond_path(@bid)%>) + <%= l(:label_followers) %> (<%= link_to @bid.watcher_users.count, home_path %>)  <%= l(:label_bidding_project) %>(<%= link_to @bid.biding_projects.count, project_for_bid_path(@bid) %>) <%=l(:label_responses)%>(<%= link_to @bid.commit, respond_path(@bid)%>)
- 标签 + <%= l(:label_tag) %>
@@ -74,7 +74,7 @@
- 关注 + <%= l(:label_followers) %>
@@ -92,7 +92,7 @@
- 应标项目 + <%= l(:label_bidding_project) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index bdbb3783..5844b8ba 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1088,7 +1088,7 @@ en: label_requirement: Requirement label_requirement_focus: Requirement focus label_developer: Developer - label_investor: Investor + label_investor: Investor： label_theme: Theme label_logged_as_new: Current user button_register: Register @@ -1134,14 +1134,14 @@ en: label_more_tags: More #fq - button_leave_meassge: Leave message + button_leave_meassge: Submit label_leave_message_to: leave %{name} a message label_leave_message: Message content label_message: message board field_add: Add before %{time} button_more: More - label_user_response: User response - label_bidding_project: Bidding project + label_user_response: User responses + label_bidding_project: bid projects button_bidding: I want to be the bid button_new_bid: New bid label_user_information: "My information" @@ -1168,4 +1168,15 @@ en: label_post_on: Post on label_find_all_comments: view all comments label_updated_time_on: " Updated on %{value} " - label_bid_plural: Requirement \ No newline at end of file + label_bid_plural: Requirement + + label_requirement_list: Requirement list + label_competitive_bidding: biddings + label_responses: responses + label_followers: followers + label_price: price： + label_RMB_sign: ￥ + label_investment_budget: Investment budget： + label_investment_time_limit: Investment time limit： + label_my_respond: My respond： + label_respond_requirement: has respond to the requirement \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 0868f2a9..f74c6d1c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -177,7 +177,7 @@ zh: notice_unable_delete_version: 无法删除版本 notice_unable_delete_time_entry: 无法删除工时 notice_issue_done_ratios_updated: 问题完成度已更新。 - notice_gantt_chart_truncated: "The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})" + notice_gantt_chart_truncated: "这个表是截断的因为它超过了可以显示的最大数量(%{max})" error_can_t_load_default_data: "无法载入默认设置：%{value}" error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。" @@ -1182,3 +1182,13 @@ zh: label_bidding_succeed: 应标成功 label_bidding_fail: 应标失败，该项目已经应标 + label_requirement_list: 需求列表 + label_competitive_bidding: 应标 + label_responses: 反馈 + label_followers: 关注 + label_price: 悬赏： + label_RMB_sign: ￥ + label_investment_budget: 投资预算： + label_investment_time_limit: 投资时限： + label_my_respond: 我要反馈： + label_respond_requirement: 对需求进行了反馈