修改国际化
This commit is contained in:
parent
767e9b75a4
commit
3e711de070
|
@ -236,7 +236,10 @@ class ProjectsController < ApplicationController
|
|||
end
|
||||
|
||||
has = {
|
||||
"show_issues" => true
|
||||
"show_issues" => true,
|
||||
"show_files" => true,
|
||||
"show_documents" => true,
|
||||
"show_messages" => true
|
||||
}
|
||||
@date_to ||= Date.today + 1
|
||||
@date_from = @date_to - @days
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<% elsif bid.reward_type == 2%>
|
||||
<strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
|
||||
<% else %>
|
||||
<strong><%= l(:label_bids_reward_method) %><span style="color: #54ed24;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_grade) %> <%= bid.budget%><%= l(:label_bids_grade_number) %></span></strong>
|
||||
<strong><%= l(:label_bids_reward_method) %><span style="color: #54ed24;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %> <%= bid.budget%><%= l(:label_bids_credit_number) %></span></strong>
|
||||
<% 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.commit, respond_path(bid)%>)<%= l(:label_responses) %></span>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<td colspan="2" width="580px" ><p class="font_description"><%= textilizable journal.notes%></p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left"><span class="font_lighter">发布于 <%= time_tag(journal.created_on).html_safe %>之前</span></td>
|
||||
<td align="left"><span class="font_lighter"><%= l(:label_bids_published) %> <%= time_tag(journal.created_on).html_safe %> <%= l(:label_bids_published_ago) %></span></td>
|
||||
<% if @user==User.current|| User.current.admin? %>
|
||||
<td width="200" align="right" class="a"><%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true,
|
||||
:method => 'post', :title => l(:button_quote))%>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<% elsif @bid.reward_type == 2%>
|
||||
<td><strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= @bid.budget%></span></strong></td>
|
||||
<% else %>
|
||||
<td><strong><%= l(:label_bids_reward_method) %><span style="color: #54ed24;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_grade) %> <%= @bid.budget%><%= l(:label_bids_grade_number) %></span></strong></td>
|
||||
<td><strong><%= l(:label_bids_reward_method) %><span style="color: #54ed24;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %> <%= @bid.budget%><%= l(:label_bids_credit_number) %></span></strong></td>
|
||||
<% end %>
|
||||
</tr>
|
||||
</table></td>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3>
|
||||
<p class="subtitle">
|
||||
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
|
||||
</p>
|
||||
</p>
|
||||
<div id="activity">
|
||||
<% @events_by_day.keys.sort.reverse.each do |day| %>
|
||||
<h3></h3>
|
||||
|
@ -15,7 +15,7 @@
|
|||
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
|
||||
<td><table width="580px" border="0">
|
||||
<tr>
|
||||
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <span class="font_lighter"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
|
||||
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project.id != e.project.id %></strong> <span class="font_lighter"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" width="580px" ><p class="font_description"><%= textilizable(e.event_description) %></p></td>
|
||||
|
|
|
@ -1313,3 +1313,5 @@ en:
|
|||
label_sort_by_time: sorting by time
|
||||
label_sort_by_active: sorting by active
|
||||
label_sort_by_influence: sorting by influence
|
||||
label_bids_published: published
|
||||
label_bids_published_ago: ago
|
||||
|
|
|
@ -1331,4 +1331,6 @@ zh:
|
|||
label_project_sort: 排序方式
|
||||
label_sort_by_time: 按时间排序
|
||||
label_sort_by_active: 按活跃度排序
|
||||
label_sort_by_influence: 按影响力排序
|
||||
label_sort_by_influence: 按影响力排序
|
||||
label_bids_published: 发布于
|
||||
label_bids_published_ago: 之前
|
Loading…
Reference in New Issue