From 936a4e148c3b74e7bd3ec7d224d095a052b49185 Mon Sep 17 00:00:00 2001
From: Bernie Chiu <bernie_chiu@hotmail.com>
Date: Fri, 27 Dec 2013 11:10:11 +0800
Subject: [PATCH] Fix conflict YML naming

---
 app/views/admin/sites/search_engine.html.erb | 8 ++++----
 config/locales/en.yml                        | 2 +-
 config/locales/zh_tw.yml                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/sites/search_engine.html.erb b/app/views/admin/sites/search_engine.html.erb
index 2c36913e..bff2dac7 100644
--- a/app/views/admin/sites/search_engine.html.erb
+++ b/app/views/admin/sites/search_engine.html.erb
@@ -25,7 +25,7 @@
 
               <!-- Title-->
               <div class="control-group input-title">
-                <label class="control-label muted"><%= t("search_engine.syntax") %></label>
+                <label class="control-label muted"><%= t("search_engines.syntax") %></label>
                 <div class="controls">
                   <%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"] rescue nil),{ :class => "input-block-level" ,:placeholder => t("search.sitesearch") }%>
                 </div>
@@ -33,7 +33,7 @@
 
               <!-- CKeditor Site Header -->
               <div class="control-group input-content">
-                <label class="control-label muted"><%= t("search_engine.anaytics_code") %></label>
+                <label class="control-label muted"><%= t("search_engines.anaytics_code") %></label>
                 <div class="controls">
                   <div class="textarea">
                     <%= f.text_area :google_analytics, :class => "input-block-level"%>
@@ -45,7 +45,7 @@
 
                <!-- Description -->
         <div class="control-group">
-          <label class="control-label muted"><%= t("search_engine.keywords") %></label>
+          <label class="control-label muted"><%= t("search_engines.keywords") %></label>
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
@@ -65,7 +65,7 @@
         </div>
 
         <div class="control-group">
-          <label class="control-label muted"><%= t("search_engine.description") %></label>
+          <label class="control-label muted"><%= t("search_engines.description") %></label>
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d182025..284a28e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -408,7 +408,7 @@ en:
     sitesearch: Google Site Search
     too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
     unit_get: "Listed items created by :%{unit_name}  Found %{item_num} items"
-  search_engine:
+  search_engines:
     anaytics_code: Google Analytics Code
     description: Description
     keywords: Keywords
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 845eb355..18f412ce 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -408,7 +408,7 @@ zh_tw:
     sitesearch: 全站搜尋
     too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
     unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
-  search_engine:
+  search_engines:
     anaytics_code: Google分析追蹤程式碼
     description: 網站描述
     keywords: 網站關鍵字