diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index fb96bf13..e17b0e2e 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -46,7 +46,7 @@

<%= textilizable journal.notes%>

- <%= journal.created_at %> + <%= journal.created_on %> <%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%><%= link_to(image_tag('delete.png'), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid}, :remote => true, :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.user_id == User.current.id %> diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index bba8dbf9..d3bac2d0 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -23,7 +23,7 @@ - + @@ -37,10 +37,10 @@
<%= link_to(b_project.project.name, project_path(b_project.project)) %>参与了应标<%= link_to(b_project.project.name, project_path(b_project.project)) %><%= l(:label_join_bidding)%>
- + - +
应标人:<%= link_to(b_project.user.name, user_path(b_project.user)) %><%= l(:label_bidding_user) %><%= link_to(b_project.user.name, user_path(b_project.user)) %>
应标宣言:<%= b_project.description %><%= l(:label_bidding_reason) %><%= b_project.description %>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 01a68e73..f613434b 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -20,7 +20,7 @@

<%= textilizable journal.notes%>

- <%= format_time journal.created_at %> + <%= format_time journal.created_on %> <%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%><%= link_to(image_tag('delete.png'), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user}, :remote => true, :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 753d679a..9c58d5b3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1207,4 +1207,7 @@ en: label_has_fans: fans(%{count}) label_me: me label_my: my - label_i: I \ No newline at end of file + label_i: I + label_join_bidding: joined the bidding + label_bidding_user: Bidding user: + label_bidding_reason: Bidding reason: \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 31c7599a..9451e84c 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1216,4 +1216,7 @@ zh: label_has_fans: 粉丝(%{count}) label_me: 我 label_my: 我 - label_i: 我 \ No newline at end of file + label_i: 我 + label_join_bidding: 参与了应标 + label_bidding_user: 应标人: + label_bidding_reason: 应标宣言: \ No newline at end of file