From 984c33acfb1d8c3a41f0c7fafd610bde2d5b045b Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 14 Oct 2014 11:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=88=E4=BD=9C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=EF=BC=8Curl=E7=9A=84=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E9=AA=8C=E8=AF=81=E3=80=81=E5=AD=97=E7=AC=A6=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=AA=8C=E8=AF=81=EF=BC=88=E4=B8=8D=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?255=EF=BC=89=E3=80=81url=E6=A0=BC=E5=BC=8F=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/web_footer_companies/edit.html.erb  | 1 +
 app/views/web_footer_companies/index.html.erb | 2 +-
 app/views/web_footer_companies/new.html.erb   | 2 +-
 config/locales/en.yml                         | 5 +++++
 config/locales/zh.yml                         | 4 ++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/web_footer_companies/edit.html.erb b/app/views/web_footer_companies/edit.html.erb
index b84d3e064..033a97c30 100644
--- a/app/views/web_footer_companies/edit.html.erb
+++ b/app/views/web_footer_companies/edit.html.erb
@@ -6,6 +6,7 @@
       <div class="box tabular">
         <p><%= f.text_field :name, :required => true %></p>
         <p><%= f.text_field :url, :required => true %></p>
+        <p><%= l(:label_url_prompt) %></p>
         <p>
           <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_upload_logo) %>:</label>
         </p>
diff --git a/app/views/web_footer_companies/index.html.erb b/app/views/web_footer_companies/index.html.erb
index e2f5bc111..19a6aea48 100644
--- a/app/views/web_footer_companies/index.html.erb
+++ b/app/views/web_footer_companies/index.html.erb
@@ -6,6 +6,6 @@
        <span class="footer_logo_link"><%= link_to image_tag(url_to_avatar(company),:size=>"100x30",:alt=>company.name),company.url, :target => "_blank" %></span>
        <%= link_to l(:button_edit),edit_web_footer_company_path(company) %>
        <%= delete_link web_footer_company_path(company) %>
-       <br/>
+       <hr/>
      <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/web_footer_companies/new.html.erb b/app/views/web_footer_companies/new.html.erb
index 0afd3009c..86af4ffe3 100644
--- a/app/views/web_footer_companies/new.html.erb
+++ b/app/views/web_footer_companies/new.html.erb
@@ -6,7 +6,7 @@
       <div class="box tabular">
         <p><%= f.text_field :name, :required => true %></p>
         <p><%= f.text_field :url, :required => true %></p>
-
+        <p><%= l(:label_url_prompt) %></p>
       </div>
       <%= submit_tag l(:button_create) %>
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1f8224485..0f1e03ee0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -532,6 +532,11 @@ en:
   label_web_footer_cooperation_compnay: Site footer cooperation unit
   label_new_company: Add the cooperation unit
   label_upload_logo: Upload logo
+  label_url_prompt: Web site needs to http or https at the beginning, for example 'http://forge.trustie.net'
+  web_footer_company_create_fail: The cooperation unit creation failed
+  web_footer_company_update_fail: The cooperation unit update failed
+  is_not_url_error: Is not a valid URL
+
   label_x_projects:
     zero:  no projects
     one:   1 project
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5d40bfc34..c0cb5f3d8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -534,6 +534,10 @@ zh:
   label_new_company: 添加合作单位
   label_edit_company: 编辑合作单位
   label_upload_logo: 上传logo
+  label_url_prompt: 网址需以"http://"或"https://"开头，例：http://forge.trustie.net
+  web_footer_company_create_fail: 合作单位创建失败
+  web_footer_company_update_fail: 合作单位更新失败
+  is_not_url_error: 不是正确的url
   label_x_projects:
     zero:  无项目
     one:   1 个项目