From bd793a00fe25a763af238e46206a1ddae0a25f48 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 22 Oct 2015 16:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E8=80=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 4 ---- app/views/repositories/committers.html.erb | 6 +++++- config/locales/zh.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 96ade096d..bf3875835 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -187,15 +187,11 @@ update # Build a hash with repository usernames as keys and corresponding user ids as values @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h} flash[:notice] = l(:notice_successful_update) - redirect_to settings_project_url(@project, :tab => 'repositories') - elsif request.get? respond_to do |format| format.html{ render :layout => "base_projects" } end - - end end diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb index ccb037e09..93350889d 100644 --- a/app/views/repositories/committers.html.erb +++ b/app/views/repositories/committers.html.erb @@ -1,4 +1,8 @@ -

<%= l(:label_repository) %>

+
+
+

<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

+
+
<%= simple_format(l(:text_repository_usernames_mapping)) %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 2b95c917d..f53389969 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -988,7 +988,7 @@ zh: text_enumeration_destroy_question: "%{count} 个对象被关联到了这个枚举值。" text_enumeration_category_reassign_to: '将它们关联到新的枚举值:' text_email_delivery_not_configured: "邮件参数尚未配置,因此邮件通知功能已被禁用。\n请在config/configuration.yml中配置您的SMTP服务器信息并重新启动以使其生效。" - text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的Trustie用户。\n版本库中与Trustie中的同名用户将被自动对应。" + text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的Trustie用户,版本库中与Trustie中的同名用户将被自动对应。" text_diff_truncated: '... 差别内容超过了可显示的最大行数并已被截断' text_custom_field_possible_values_info: '每项数值一行' text_wiki_page_destroy_question: 此页面有 %{descendants} 个子页面和下级页面。您想进行那种操作?