hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

稍该国际化。

Browse Source
exceptionHandle
kaizheng 12 years ago
parent 38ed91746f
commit 997e4a1751
8 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File

12
app/views/bids/_bid_show.html.erb
Unescape View File

@ -15,11 +15,11 @@
<table border="0"> <table border="0">
<tr><td> <tr><td>
<% if bid.reward_type.nil? or bid.reward_type == 1%> <% if bid.reward_type.nil? or bid.reward_type == 1%>
<strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong>
<% elsif bid.reward_type == 2%> <% elsif bid.reward_type == 2%>
<strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
<% else %> <% else %>
<strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_grade) %>&nbsp;<%= bid.budget%><%= l(:label_bids_grade_number) %></span></strong>
<% end %> <% end %>
<span class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></span> <span class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></span>
<span class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></span> <span class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></span>
@ -64,11 +64,11 @@
<tr> <tr>
<% if bid.reward_type.nil? or bid.reward_type == 1%> <% if bid.reward_type.nil? or bid.reward_type == 1%>
<td><strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong></td>
<% elsif bid.reward_type == 2%> <% elsif bid.reward_type == 2%>
<td><strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong></td>
<% else %> <% else %>
<td><strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>

6
app/views/bids/_form.html.erb
Unescape View File

@ -22,12 +22,12 @@
<%= error_messages_for 'bid' %> <%= error_messages_for 'bid' %>
<!--[form:project]--> <!--[form:project]-->
<p>您可以在此创建一个课程、竞赛，或者发布一个需求、问题、求助高手等等</p> <p><%= l(:label_bids_form_new_description) %></p>
<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_name)}" %></p> <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_name)}" %></p>
<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_description)}" %></p> <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_description)}" %></p>
<p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_grade_1)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, :onChange => "show('bid_reward_type', 'bid_budget')" %> <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_grade)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, :onChange => "show('bid_reward_type', 'bid_budget')" %>
<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => '输入奖励内容' %> <%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
</p> </p>
<p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%> <p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;", :placeholder => "#{l(:label_deadline)}" %><%= calendar_for('bid_deadline')%>
</p> </p>

2
app/views/bids/_new_bid.html.erb
Unescape View File

@ -59,7 +59,7 @@ border-top: 1px solid #acaeb1; border-bottom: 1px solid #acaeb1; margin-top: 30p
<td colspan="2"><div class="tableline"></div></td> <td colspan="2"><div class="tableline"></div></td>
</tr> </tr>
<tr> <tr>
<td width="22%"><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option><option value = '3'>#{l(:label_grade_1)}</option>".html_safe, :class => 'noline' %></td> <td width="22%"><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option><option value = '3'>#{l(:label_bids_grade)}</option>".html_safe, :class => 'noline' %></td>
<td><%= text_field_tag 'bid_budget', "#{l(:label_requirement_bargain_money)}", :class => 'noline', :required => true, <td><%= 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)}')" %> :onfocus => "clearInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')", :onblur => "showInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')" %>
</td> </td>

6
app/views/bids/show.html.erb
Unescape View File

@ -8,11 +8,11 @@
</tr> </tr>
<tr> <tr>
<% if @bid.reward_type.nil? or @bid.reward_type == 1%> <% if @bid.reward_type.nil? or @bid.reward_type == 1%>
<td><strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></span></strong></td>
<% elsif @bid.reward_type == 2%> <% elsif @bid.reward_type == 2%>
<td><strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= @bid.budget%></span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= @bid.budget%></span></strong></td>
<% else %> <% else %>
<td><strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= @bid.budget%>分</span></strong></td> <td><strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_grade) %>&nbsp;<%= @bid.budget%><%= l(:label_bids_grade_number) %></span></strong></td>
<% end %> <% end %>
</tr> </tr>
</table></td> </table></td>

6
app/views/layouts/base_bids.html.erb
Unescape View File

@ -49,11 +49,11 @@
</tr> </tr>
<tr> <tr>
<% if @bid.reward_type.nil? or @bid.reward_type == 1%> <% if @bid.reward_type.nil? or @bid.reward_type == 1%>
<td>奖励方式：奖金&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></td> <td><%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %>&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></td>
<% elsif @bid.reward_type == 2%> <% elsif @bid.reward_type == 2%>
<td>奖励方式：<%= @bid.budget%></td> <td><%= l(:label_bids_reward_method) %><%= @bid.budget%></td>
<% else %> <% else %>
<td>奖励方式：学分&nbsp;<%= @bid.budget%>分</td> <td><%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %>&nbsp;<%= @bid.budget%><%= l(:label_bids_grade_number) %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>

2
app/views/tags/_tag.html.erb
Unescape View File

@ -19,7 +19,7 @@
<%= f.text_field :name ,:id => "name-issue",:size=>"30",:require=>true,:maxlength => 25,:minlength=>1 %> <%= 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_id,:value=> obj.id,:style=>"display:none"%>
<%= f.text_field :object_flag,:value=> object_flag,: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();'%> <%= link_to_function l(:button_cancel), '$("#put-tag-form-issue").hide();'%>
<% end %> <% end %>
</div> </div>

14
config/locales/en.yml
Unescape View File

@ -1262,7 +1262,7 @@ en:
label_issue_praise_over: Praised over！ label_issue_praise_over: Praised over！
label_issue_tread_over: Treaded over！ label_issue_tread_over: Treaded over！
label_issue_appraise_over: Appraised 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_fans: the user has no fans now
label_no_current_watchers: the user hasn't watched others label_no_current_watchers: the user hasn't watched others
label_project_tool_response: Response label_project_tool_response: Response
@ -1284,7 +1284,8 @@ en:
label_choose_reward: choose reward label_choose_reward: choose reward
label_money: money label_money: money
label_reward_1: others label_reward_1: others
label_grade_1: grade label_bids_grade: grade
label_bids_grade_number: numbers
field_budget: reward field_budget: reward
field_deadline: deadline field_deadline: deadline
label_tags_selected: Selected Tags label_tags_selected: Selected Tags
@ -1299,3 +1300,12 @@ en:
label_bid_project: projects label_bid_project: projects
label_project_no_follow: The project hasn't been followed now！ label_project_no_follow: The project hasn't been followed now！
label_no_bid_project: has no participate project 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

10
config/locales/zh.yml
Unescape View File

@ -1305,7 +1305,8 @@ zh:
label_choose_reward: 选择奖励方式 label_choose_reward: 选择奖励方式
label_money: 货币 label_money: 货币
label_reward_1: 其他 label_reward_1: 其他
label_grade_1: 学分 label_bids_grade: 学分
label_bids_grade_number: 分
field_budget: 奖励 field_budget: 奖励
field_deadline: 截止日期 field_deadline: 截止日期
label_tags_selected: 已选标签 label_tags_selected: 已选标签
@ -1320,3 +1321,10 @@ zh:
label_bid_project: 项目 label_bid_project: 项目
label_project_no_follow: 该项目暂未被关注！ label_project_no_follow: 该项目暂未被关注！
label_no_bid_project: 暂无参与项目 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: 输入奖励内容，如 奖项，物品等
Write Preview
Loading…
Cancel
Save