developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict YML naming

This commit is contained in:
Bernie Chiu 2013-12-27 11:10:11 +08:00 committed by saurabhbhatia
parent 6f44554822
commit 936a4e148c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/admin/sites/search_engine.html.erb
View File

@ -25,7 +25,7 @@
<!-- Title--> <!-- Title-->
<div class="control-group input-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"> <div class="controls">
<%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"] rescue nil),{ :class => "input-block-level" ,:placeholder => t("search.sitesearch") }%> <%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"] rescue nil),{ :class => "input-block-level" ,:placeholder => t("search.sitesearch") }%>
</div> </div>
@ -33,7 +33,7 @@
<!-- CKeditor Site Header --> <!-- CKeditor Site Header -->
<div class="control-group input-content"> <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="controls">
<div class="textarea"> <div class="textarea">
<%= f.text_area :google_analytics, :class => "input-block-level"%> <%= f.text_area :google_analytics, :class => "input-block-level"%>
@ -45,7 +45,7 @@
<!-- Description --> <!-- Description -->
<div class="control-group"> <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="controls">
<div class="tab-content textarea-lang"> <div class="tab-content textarea-lang">
<div class="btn-group" data-toggle="buttons-radio"> <div class="btn-group" data-toggle="buttons-radio">
@ -65,7 +65,7 @@
</div> </div>
<div class="control-group"> <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="controls">
<div class="tab-content textarea-lang"> <div class="tab-content textarea-lang">
<div class="btn-group" data-toggle="buttons-radio"> <div class="btn-group" data-toggle="buttons-radio">

2
config/locales/en.yml
View File

@ -408,7 +408,7 @@ en:
sitesearch: Google Site Search sitesearch: Google Site Search
too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?" 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" unit_get: "Listed items created by :%{unit_name} Found %{item_num} items"
search_engine: search_engines:
anaytics_code: Google Analytics Code anaytics_code: Google Analytics Code
description: Description description: Description
keywords: Keywords keywords: Keywords

2
config/locales/zh_tw.yml
View File

@ -408,7 +408,7 @@ zh_tw:
sitesearch: 全站搜尋 sitesearch: 全站搜尋
too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?" too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆" unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
search_engine: search_engines:
anaytics_code: Google分析追蹤程式碼 anaytics_code: Google分析追蹤程式碼
description: 網站描述 description: 網站描述
keywords: 網站關鍵字 keywords: 網站關鍵字