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

fix translation conflict and breadcrumb divider

This commit is contained in:
thomaschen 2013-12-24 14:36:51 +08:00 committed by saurabhbhatia
parent 8fcb9d2124
commit 8cdcb18976
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/orbit_backend_helper.rb
View File

@ -406,12 +406,12 @@ module OrbitBackendHelper
site = Site.first site = Site.first
case controller.controller_name case controller.controller_name
when 'sites' when 'sites'
res << "<li>#{t(:settings)}{divider}</li>" res << "<li><li>#{t(:settings)}#{divider}</li>"
case controller.action_name case controller.action_name
when 'sitemap' when 'sitemap'
res << "<li class='active'>#{t(:sitemap)}</li>" res << "<li class='active'>#{t(:sitemap)}</li>"
when 'responsive_setting' when 'responsive_setting'
res << "<li class='active'>#{t(:mobile_setting) }</li>" res << "<li class='active'>#{t(:mobile_settings)}</li>"
when 'mail_setting' when 'mail_setting'
res << "<li class='active'>#{t(:mail_setting)}</li>" res << "<li class='active'>#{t(:mail_setting)}</li>"
when 'preference' when 'preference'

2
app/views/admin/items/_site_bar.html.erb
View File

@ -14,7 +14,7 @@
<li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li> <li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
<li title="<%= t('mobile_setting') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li> <li title="<%= t('mobile_settings') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
<li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li> <li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>

2
app/views/admin/sites/_side_bar.html.erb
View File

@ -14,7 +14,7 @@
<li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li> <li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
<li title="<%= t('mobile_setting') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li> <li title="<%= t('mobile_settings') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
<li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li> <li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>

1
config/locales/en.yml
View File

@ -300,6 +300,7 @@ en:
select_announcement_categories: Select Announcement Categories select_announcement_categories: Select Announcement Categories
select_image: Select Image select_image: Select Image
select_orbit_bar_color: Select Orbit Bar Color select_orbit_bar_color: Select Orbit Bar Color
mobile_settings: Mobile Setting
module: Module module: Module
modules: Modules modules: Modules
module_authorization: Module Authorization module_authorization: Module Authorization

1
config/locales/zh_tw.yml
View File

@ -301,6 +301,7 @@ zh_tw:
select_announcement_categories: 選擇公告顯示分類 select_announcement_categories: 選擇公告顯示分類
select_image: 選擇圖片 select_image: 選擇圖片
select_orbit_bar_color: 選擇Orbit Bar顏色 select_orbit_bar_color: 選擇Orbit Bar顏色
mobile_settings: 行動設定
module: 模組 module: 模組
modules: 網站模組 modules: 網站模組
module_authorization: 模組授權 module_authorization: 模組授權