p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add time describe

This commit is contained in:
yanxd 2013-11-07 17:21:32 +08:00
parent 607eb2c2ff
commit 7c4e62cc40
7 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/bids/_contest_show.html.erb
View File

@ -23,7 +23,7 @@
</tr>
</table></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= l :label_create_time %>: <%= format_time bid.created_on %></span></td>
</tr>
<tr>
<td>

2
app/views/news/index.html.erb
View File

@ -74,7 +74,7 @@
<td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= format_time(news.created_on) %></span></td>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time(news.created_on) %></span></td>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
</tr>
</table></td>

2
app/views/projects/feedback.html.erb
View File

@ -35,7 +35,7 @@
</p></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= format_time journal.created_on %></span></td>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time journal.created_on %></span></td>
<td width="200" align="right" class="a">
<% ids = 'project_respond_form_'+journal.id.to_s%>
<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> </td>

4
app/views/projects/show.html.erb
View File

@ -32,7 +32,7 @@
</p></td>
</tr>
<tr>
<td align="left"><a class="font_lighter"> <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
<td align="left"><a class="font_lighter"> <%= l :label_activity_time %>: <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
<% if e.event_type == "issue" %>
<td align="right"><span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span></td>
<% end %>
@ -62,7 +62,7 @@
<td > <%= link_to (h @user.lastname+@user.firstname), user_path(@user) %> <%= l(:label_user_create_project) %> <%= link_to @project.name %><strong> !</strong></td>
</tr>
<tr>
<td class="font_lighter" style="float: right"><%= format_time(@project.created_on) %>
<td class="font_lighter" style="float: right"><%= l :label_update_time %>: <%= format_time(@project.created_on) %>
</table></td>
</tr>
</table>

16
app/views/users/show.html.erb
View File

@ -155,7 +155,7 @@
<div style="display: inline-block; float: left; margin-top: 0px" width="200" align="right" class="a"><span class="font_lighter"> <% if e.act_type == 'Changeset' %>
<%= format_time(e.act.committed_on) %>
<% else %>
<%= format_time(e.act.created_on) %>
<%= l :label_update_time %>: <%= format_time(e.act.created_on) %>
<% end %></span></div>
</td>
</tr>
@ -173,13 +173,13 @@
<ul>
</div>
<% else %>
<% if @user == User.current %>
<%= l(:label_user_activities) %>
<% else %>
<p class="font_description">
<%= l(:label_user_activities_other) %>
</p>
<% end %>
<% if @user == User.current %>
<%= l(:label_user_activities) %>
<% else %>
<p class="font_description">
<%= l(:label_user_activities_other) %>
</p>
<% end %>
<% end %>
<% else %>
<!-- fq -->

2
app/views/words/_message.html.erb
View File

@ -18,7 +18,7 @@
</p></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= format_time journal.created_on %></span></td>
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>: <%= format_time journal.created_on %></span></td>
<td width="200" align="right" class="a"> <% if @user == User.current %>
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,

3
config/locales/zh.yml
View File

@ -1221,6 +1221,9 @@ zh:
setting_default_projects_tracker_ids: Default trackers for new projects
label_total_time: 合计
label_create_time: 创建时间 #Customer added！Added by nie
label_comment_time: 留言时间 #nyan
label_activity_time: 发布时间 #nyan
label_update_time: 更新时间 #nyan
label_current_contributors: 位当前贡献者
label_commit_limit: 作业提交时间已过！
label_commit_ar: 作业提交截止时间快到了！