From 8309be475aaa742988876880871ab4ea7b579d32 Mon Sep 17 00:00:00 2001
From: kaizheng <18763216000@163.com>
Date: Mon, 12 Aug 2013 23:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E5=B0=8F=E4=BF=AE=E6=94=B9=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb  | 4 ++--
 app/helpers/repositories_helper.rb | 2 +-
 config/locales/en.yml              | 5 ++++-
 config/locales/zh.yml              | 3 +++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1419047f8..87d89eb35 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1006,7 +1006,7 @@ module ApplicationHelper
       html << "<div id='errorExplanation'><ul>\n"
       errors.each do |error|
         ###by xianbo
-        if(error!="库路径 不能为空字符")
+        if(error!="#{l(:abel_repository_path_not_null)}")
           html << "<li>#{h error}</li>\n"
         end
         ###xianbo
@@ -1014,7 +1014,7 @@ module ApplicationHelper
       ###by xianbo
       unless pramas[:repository].nil?
       if params[:repository][:upassword]==""
-        html << "<li>密码不能设置为空。</li>\n"
+        html << "<li>"+ l(:label_password_not_null) +"</li>\n"
       end
       end
       ###xianbo
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 264fac501..4b5bcfb46 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -163,7 +163,7 @@ module RepositoriesHelper
       content_tag('p', form.text_field(:url, :size => 60, :required => true,
                        :disabled => !repository.safe_attribute?('url')) +
                        '<br />'.html_safe +
-                       "<em class='info'>".html_safe+"定义已有版本库URL路径，定义格式file:///, http://, https://, svn://, svn+[tunnelscheme]://"+"</em>".html_safe) +
+                       "<em class='info'>".html_safe+"#{l(:label_exist_repository_path)}"+"</em>".html_safe) +
       content_tag('p', form.text_field(:login, :size => 30))+
       content_tag('p', form.password_field(
                             :password, :size => 30, :name => 'ignore',
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dc07b0063..f4ea64903 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1231,4 +1231,7 @@ en:
   label_repository_path: path of repository
   label_repository_new_repos: create a new repository
   label_repository_no: have no repository?
-  label_welcome_page_to: Participate %{project_count} projects！
\ No newline at end of file
+  label_welcome_page_to: Participate %{project_count} projects！
+  label_repository_path_not_null: repository path can't be null
+  label_password_not_null: password can't be null。
+  label_exist_repository_path: Define exist repository's path of URL and format must be file:///, http://, https://, svn://
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 82096ef4a..d5a2cfede 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1244,3 +1244,6 @@ zh:
   label_board_description: 七嘴八舌，汇聚众人智慧，为您排忧解难！
   label_create_course_description: 课程小社区，创建新课程，让我们共同分享多到想不到的公共资源！
   label_welcome_page_to: 参与了 %{project_count} 个项目！
+  label_repository_path_not_null: 库路径 不能为空字符
+  label_password_not_null: 密码不能设置为空。
+  label_exist_repository_path: 定义已有版本库URL路径，定义格式file:///, http://, https://, svn://
\ No newline at end of file