From 90885a4eb5ac712f6f30ee7e506ee6a7a6a05e74 Mon Sep 17 00:00:00 2001
From: Administrator <user@example.com>
Date: Thu, 15 Aug 2013 10:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb             | 18 ------------------
 app/views/repositories/_form_create.html.erb |  2 +-
 app/views/welcome/index.html.erb             |  2 +-
 config/locales/en.yml                        |  3 ++-
 config/locales/zh.yml                        |  1 +
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index a4924ba98..6f822d2c3 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -50,28 +50,10 @@ class MyController < ApplicationController
   def account
     @user = User.current
     @pref = @user.pref
-    #Modified by young
-    unless @user.change_password_allowed?
-      flash[:error] = l(:notice_can_t_change_password)
-      redirect_to my_account_path
-      return
-    end
-    #Ended by young
     if request.post?
       @user.safe_attributes = params[:user]
       @user.pref.attributes = params[:pref]
       @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
-      #Added by young
-      if @user.check_password?(params[:password])
-        @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-        if @user.save
-          flash[:notice] = l(:notice_account_password_updated)
- #         redirect_to my_account_path
-        end
-      else
-        flash[:error] = l(:notice_account_wrong_password)
-      end
-      #Ended by young
       if @user.save
         @user.pref.save
         @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
diff --git a/app/views/repositories/_form_create.html.erb b/app/views/repositories/_form_create.html.erb
index be3296704..9815db08b 100644
--- a/app/views/repositories/_form_create.html.erb
+++ b/app/views/repositories/_form_create.html.erb
@@ -22,7 +22,7 @@ border:none
 <% end %>
 </p>
 <p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
-<p><%= f.text_field :identifier, :required=>true, :disabled => @repository.identifier_frozen?  %>
+<p><%= f.text_field :identifier, :required=>true, :disabled => @repository.identifier_frozen?, :label => l(:label_repository_name)  %>
 <% unless @repository.identifier_frozen? %>
   <em class="info"><%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %>
   	 <%= l(:text_repository_identifier_info).html_safe %></em>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 6ae0cb553..799338dfb 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -137,7 +137,7 @@ software development and software crowdsourcing.</td></tr>
 <!--add by huang-->
 
 <!--add by huang-->
-<div style="height:250px;">
+<div style="height:230px;">
 	<div class="welcone_left">
 		<table width="350px">
 			<tr>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e672c6371..11a5cb0a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1244,4 +1244,5 @@ en:
   label_tags_user_mail: User E-mail：
   label_tags_numbers: Tag numbers：
   label_max_number: Must be at most 25 characters long.
-  label_all_revisions: All revisions：
\ No newline at end of file
+  label_all_revisions: All revisions：
+  label_repository_name: Repository name
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 83c9ebeb1..a1ca1a7f5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1059,6 +1059,7 @@ zh:
   label_repository_new: 连接到已有的SVN版本库
   label_repository_no: 还没有版本库？
   label_repository_new_repos: 新建版本库
+  label_repository_name: 版本库名
   #end
   field_repository_is_default: 主版本库
   label_copy_attachments: 复制附件