From a17458f132f326169957f468c2e7eabcc384f2a0 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 23 Mar 2015 14:11:57 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8=E2=80=9C=E4=BF=AE=E6=94=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E2=80=9D=E4=B8=AD=E4=BF=AE=E6=94=B9=202=E3=80=81?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=BB=9F=E8=AE=A1=E5=9B=BD=E5=AE=B6=E5=8C=96?= =?UTF-8?q?=E5=8F=8A=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/index.html.erb | 4 ++-- app/views/memos/show.html.erb | 12 ++++++------ app/views/my/account.html.erb | 2 +- config/locales/projects/zh.yml | 2 ++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 4b282aa8f..012178ae2 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -1,5 +1,5 @@
-

问题跟踪

+

<%= l(:label_issue_tracking) %>

<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> @@ -12,7 +12,7 @@ :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %> <% end %> - 问题总数：<%= @project.issues.count %> 未解决：<%= @project.issues.where('status_id in (1,2,4,6)').count %> + <%= l(:label_issues_sum) %>：<%= @project.issues.count %> <%= l(:lable_issues_undo) %> <%= @project.issues.where('status_id in (1,2,4,6)').count %>
<% if !@query.new_record? && @query.editable_by?(User.current) %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 995529fe9..7c32e801d 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -7,7 +7,7 @@
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> -
+
<%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
@@ -30,7 +30,7 @@ :remote => true, :method => 'get', :title => l(:button_quote) - )if !@memo.locked? && User.current.logged? %> + )if !@memo.locked? && User.current.logged? %> <%= link_to( #image_tag('edit.png'), @@ -64,7 +64,7 @@
<%= textAreailizable(@memo,:content) %> -

+

<% if @memo.attachments.any?%> <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> <%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> @@ -100,7 +100,7 @@ :method => 'get', :title => l(:button_quote) )if !@memo.locked? && User.current.logged? %> - + <%= link_to( #image_tag('edit.png'), l(:button_edit), @@ -120,7 +120,7 @@ :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete) - ) if reply.destroyable_by?(User.current) %> + ) if reply.destroyable_by?(User.current) %>


@@ -146,7 +146,7 @@ <%= authoring reply.created_at, reply.author %> - +
<% end %>