diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 8ec03755..6ba4ee20 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -402,11 +402,10 @@ module OrbitBackendHelper def site_breadcrumb res = '' divider = "/" - res << "
  • Dashboard#{divider}
  • " + res << "
  • #{t(:settings)}#{divider}
  • " site = Site.first case controller.controller_name when 'sites' - res << "
  • #{t(:settings)}#{divider}
  • " case controller.action_name when 'sitemap' res << "
  • #{t(:sitemap)}
  • " @@ -422,13 +421,10 @@ module OrbitBackendHelper res << "
  • #{t(:site_info)}
  • " end when 'items' - res << "
  • Structure#{divider}
  • " - res << "
  • #{t(:items)}
  • " + res << "
  • #{t(:structure)}
  • " when 'module_store' - res << "
  • #{t(:settings)}#{divider}
  • " res << "
  • #{t(:modules)}
  • " when 'designs' - res << "
  • #{t(:settings)}#{divider}
  • " res << "
  • #{t(:templates)}
  • " end res.html_safe diff --git a/config/locales/en.yml b/config/locales/en.yml index ea28d31f..0d182025 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -423,6 +423,7 @@ en: index: Index summary: Summary thumbnail: Thumbnail + settings: Site setting site: backend_openness_on: Backend Openness mobile_api_openness_on: Mobile API Openness diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 0abb8b11..845eb355 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -423,6 +423,7 @@ zh_tw: index: 檢索 summary: 摘要 thumbnail: 縮圖 + settings: 基本設定 site: frontend_closed: 前台關閉? frontend_open: 開啟前台 diff --git a/patches/0001-add-translation-for-terms-of-use-frontpage-ui.patch b/patches/0001-add-translation-for-terms-of-use-frontpage-ui.patch new file mode 100644 index 00000000..a9a07cad --- /dev/null +++ b/patches/0001-add-translation-for-terms-of-use-frontpage-ui.patch @@ -0,0 +1,52 @@ +From 427c24be97de625b2dc3de95048d8a8aa0a81577 Mon Sep 17 00:00:00 2001 +Message-Id: <427c24be97de625b2dc3de95048d8a8aa0a81577.1387872856.git.saurabh.a.bhatia@gmail.com> +From: thomaschen <99703040@nccu.edu.tw> +Date: Tue, 24 Dec 2013 16:09:58 +0800 +Subject: [PATCH] add translation for terms of use frontpage ui + +--- + app/controllers/front_controller.rb | 2 +- + config/locales/en.yml | 1 + + config/locales/zh_tw.yml | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb +index 9fb1d5a..a5b3780 100644 +--- a/app/controllers/front_controller.rb ++++ b/app/controllers/front_controller.rb +@@ -17,7 +17,7 @@ class FrontController < ApplicationController + @url = "/#{@name}" if @name.present? + + if (!@site.enable_terms_of_use && @page.first.present?) +- render :text => (@site.footer + "Terms of Use") ++ render :text => (@site.footer + "#{t(:terms_of_use)}") + else + render :text => @site.footer + end +diff --git a/config/locales/en.yml b/config/locales/en.yml +index 9e9e7d8..08894af 100644 +--- a/config/locales/en.yml ++++ b/config/locales/en.yml +@@ -484,6 +484,7 @@ en: + template: Template + templates: Templates + template_name: Template name ++ terms_of_use: Terms of Use + text: Text + theme: Theme + themes: Themes +diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml +index 7342e17..ca81e12 100644 +--- a/config/locales/zh_tw.yml ++++ b/config/locales/zh_tw.yml +@@ -485,6 +485,7 @@ zh_tw: + template: 樣版 + templates: 網站模版 + template_name: 樣版名稱 ++ terms_of_use: 使用規則 + text: 內文 + theme: 套用頁面樣式 + themes: 主題 +-- +1.8.3.2 +