diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 6292e35d1..36e8e9dd5 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -15,11 +15,11 @@ <% if bid.reward_type.nil? or bid.reward_type == 1%> - + <% elsif bid.reward_type == 2%> - + <% else %> - + <% end %> @@ -98,4 +98,4 @@ - + diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index c51a66bfd..4313cfb1d 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -8,11 +8,11 @@ <% if @bid.reward_type.nil? or @bid.reward_type == 1%> - + <% elsif @bid.reward_type == 2%> - + <% else %> - + <% end %>
<% if bid.reward_type.nil? or bid.reward_type == 1%> - 奖励方式：奖金 <%= bid.budget%><%= l(:label_RMB_sign) %> + <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= bid.budget%><%= l(:label_RMB_sign) %> <% elsif bid.reward_type == 2%> - 奖励方式：<%= bid.budget%> + <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> - 奖励方式：学分 <%= bid.budget%>分 + <%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %> <%= bid.budget%><%= l(:label_bids_grade_number) %> <% end %> (<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %> (<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %> @@ -64,11 +64,11 @@
奖励方式：奖金 <%= bid.budget%><%= l(:label_RMB_sign) %><%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= bid.budget%><%= l(:label_RMB_sign) %>奖励方式：<%= bid.budget%><%= l(:label_bids_reward_method) %><%= bid.budget%>奖励方式：学分 <%= bid.budget%>分<%= l(:label_bids_reward_method) %>学分 <%= bid.budget%>分
<%= select_tag 'bid_reward_type', "".html_safe, :class => 'noline' %><%= select_tag 'bid_reward_type', "".html_safe, :class => 'noline' %> <%= text_field_tag 'bid_budget', "#{l(:label_requirement_bargain_money)}", :class => 'noline', :required => true, :onfocus => "clearInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')", :onblur => "showInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')" %>
奖励方式：奖金 <%= @bid.budget%><%= l(:label_RMB_sign) %><%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= @bid.budget%><%= l(:label_RMB_sign) %>奖励方式：<%= @bid.budget%><%= l(:label_bids_reward_method) %><%= @bid.budget%>奖励方式：学分 <%= @bid.budget%>分<%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %> <%= @bid.budget%><%= l(:label_bids_grade_number) %>
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 7087b55d9..6c0b7e77f 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -49,11 +49,11 @@ <% if @bid.reward_type.nil? or @bid.reward_type == 1%> - 奖励方式：奖金 <%= @bid.budget%><%= l(:label_RMB_sign) %> + <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= @bid.budget%><%= l(:label_RMB_sign) %> <% elsif @bid.reward_type == 2%> - 奖励方式：<%= @bid.budget%> + <%= l(:label_bids_reward_method) %><%= @bid.budget%> <% else %> - 奖励方式：学分 <%= @bid.budget%>分 + <%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %> <%= @bid.budget%><%= l(:label_bids_grade_number) %> <% end %> diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb index 0e03479fc..e3a630347 100644 --- a/app/views/tags/_tag.html.erb +++ b/app/views/tags/_tag.html.erb @@ -19,7 +19,7 @@ <%= f.text_field :name ,:id => "name-issue",:size=>"30",:require=>true,:maxlength => 25,:minlength=>1 %> <%= f.text_field :object_id,:value=> obj.id,:style=>"display:none"%> <%= f.text_field :object_flag,:value=> object_flag,:style=>"display:none"%> - <%= f.submit "add"%> + <%= f.submit l(:button_project_tags_add)%> <%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 66534a786..a54d1766a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1262,7 +1262,7 @@ en: label_issue_praise_over: Praised over！ label_issue_tread_over: Treaded over！ label_issue_appraise_over: Appraised over！ - label_welcome_my_respond: My respond： + label_welcome_my_respond: Please leave your comments and suggestions here！ label_no_current_fans: the user has no fans now label_no_current_watchers: the user hasn't watched others label_project_tool_response: Response @@ -1284,7 +1284,8 @@ en: label_choose_reward: choose reward label_money: money label_reward_1: others - label_grade_1: grade + label_bids_grade: grade + label_bids_grade_number: numbers field_budget: reward field_deadline: deadline label_tags_selected: Selected Tags @@ -1299,3 +1300,12 @@ en: label_bid_project: projects label_project_no_follow: The project hasn't been followed now！ label_no_bid_project: has no participate project + label_bids_reward_method: method of reward： + label_bids_reward_what: input what for reward + label_call_bonus: bonus + label_bids_form_new_description: Here you can create a course,competition or publish a requirement,question or ask master for help etc. + label_bids_new_money: input the award money,such as 500,2.5 etc. + label_bids_new_grade: input the award grades,such as 3,2.5 etc. + label_bids_new_content: input the award content,such as certificate,things etc. + label_user_login_tips: You havn't logged in,for leaving message please login first + label_user_login_new: login diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 830e4ee80..5770aa31d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1305,7 +1305,8 @@ zh: label_choose_reward: 选择奖励方式 label_money: 货币 label_reward_1: 其他 - label_grade_1: 学分 + label_bids_grade: 学分 + label_bids_grade_number: 分 field_budget: 奖励 field_deadline: 截止日期 label_tags_selected: 已选标签 @@ -1319,4 +1320,11 @@ zh: label_bid_publish: 发布了 label_bid_project: 项目 label_project_no_follow: 该项目暂未被关注！ - label_no_bid_project: 暂无参与项目 \ No newline at end of file + label_no_bid_project: 暂无参与项目 + label_bids_reward_method: 奖励方式 ： + label_bids_reward_what: 输入奖励内容 + label_call_bonus: 奖金 + label_bids_form_new_description: 您可以在此创建一个课程、竞赛，或者发布一个需求、问题，求助高手等等 + label_bids_new_money: 输入奖励金额，如 500,2.5等 + label_bids_new_grade: 输入奖励学分，如 3,2.5等 + label_bids_new_content: 输入奖励内容，如 奖项，物品等 \ No newline at end of file