From 3e711de070450b72b3ffb65bb4d969ec95293796 Mon Sep 17 00:00:00 2001 From: baiyu <316257774@qq.com> Date: Thu, 22 Aug 2013 22:07:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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/controllers/projects_controller.rb | 5 ++++- app/views/bids/_bid_show.html.erb | 2 +- app/views/bids/_history.html.erb | 2 +- app/views/bids/show.html.erb | 2 +- app/views/projects/show.html.erb | 4 ++-- config/locales/en.yml | 2 ++ config/locales/zh.yml | 4 +++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 451283954..9a3e2d70f 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -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 diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index c033a7357..4317be5d0 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -19,7 +19,7 @@ <% elsif bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> - <%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %> <%= bid.budget%><%= l(:label_bids_grade_number) %> + <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= bid.budget%><%= l(:label_bids_credit_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) %> diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index ed969df00..494511e54 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -24,7 +24,7 @@

<%= textilizable journal.notes%>

- 发布于 <%= time_tag(journal.created_on).html_safe %>之前 + <%= l(:label_bids_published) %> <%= time_tag(journal.created_on).html_safe %> <%= l(:label_bids_published_ago) %> <% if @user==User.current|| User.current.admin? %> <%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%> diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index a99f75ab6..97dbbdbb0 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -12,7 +12,7 @@ <% elsif @bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= @bid.budget%> <% else %> - <%= l(:label_bids_reward_method) %><%= l(:label_bids_grade) %> <%= @bid.budget%><%= l(:label_bids_grade_number) %> + <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= @bid.budget%><%= l(:label_bids_credit_number) %> <% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 12adb3b55..7b3241b2d 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -3,7 +3,7 @@

<%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %>

<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> -

+

<% @events_by_day.keys.sort.reverse.each do |day| %>

@@ -15,7 +15,7 @@ <%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%> - + diff --git a/config/locales/en.yml b/config/locales/en.yml index 914366e81..910c8e3bf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index cf786d4af..294e7b48d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1331,4 +1331,6 @@ zh: label_project_sort: 排序方式 label_sort_by_time: 按时间排序 label_sort_by_active: 按活跃度排序 - label_sort_by_influence: 按影响力排序 \ No newline at end of file + label_sort_by_influence: 按影响力排序 + label_bids_published: 发布于 + label_bids_published_ago: 之前 \ No newline at end of file
<%= h(e.project) if @project.nil? || @project != e.project %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %> <%= h(e.project) if @project.nil? || @project.id != e.project.id %> <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title(e.event_title), e.event_url %>

<%= textilizable(e.event_description) %>