From fbed496034a007ae816448051ab3977b14e3e4d3 Mon Sep 17 00:00:00 2001 From: OrbitServer Date: Thu, 6 Dec 2012 23:08:13 +0800 Subject: [PATCH] Harry's changes in i18n --- app/views/layouts/_side_bar_content.html.erb | 4 ++-- vendor/built_in_modules/calendar/config/locales/en.yml | 1 + vendor/built_in_modules/calendar/config/locales/zh_tw.yml | 1 + vendor/built_in_modules/gallery/config/locales/en.yml | 1 + vendor/built_in_modules/gallery/config/locales/zh_tw.yml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_side_bar_content.html.erb b/app/views/layouts/_side_bar_content.html.erb index a0909e69..f5d54d9b 100644 --- a/app/views/layouts/_side_bar_content.html.erb +++ b/app/views/layouts/_side_bar_content.html.erb @@ -44,7 +44,7 @@ <% end -%> <%= content_tag :li, :class => active_for_controllers('albums','album_images','gallery_categories','/panel/gallery/back_end/tags') || active_for_app_auth("gallery") do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-pictures') + content_tag(:span, t(:gallery)), panel_gallery_back_end_albums_path %> + <%= link_to content_tag(:i, nil, :class => 'icons-pictures') + content_tag(:span, t("gallery.gallery")), panel_gallery_back_end_albums_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('albums') ) do -%> <%= content_tag(:li, link_to((t('gallery.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_gallery_back_end_gallery_categories_path), :class => active_for_action('gallery_categories','index') )if (is_manager? rescue nil)%> <%= content_tag :li, link_to((t('gallery.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') if (is_manager? rescue nil) %> @@ -63,7 +63,7 @@ <% end -%> <%= content_tag :li, :class => active_for_controllers('cals','panel/calendar/back_end/tags') || active_for_app_auth("calendar") do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-calendar') + content_tag(:span, t(:calendar)), panel_calendar_back_end_cals_path %> + <%= link_to content_tag(:i, nil, :class => 'icons-calendar') + content_tag(:span, t("calendar.calendar")), panel_calendar_back_end_cals_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('cals','calendar_categories') ) do -%> <%= content_tag :li, link_to((t('calendar.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_calendar_back_end_cal_path), :class => active_for_action('cals','new') if (is_manager? rescue nil)%> <%= content_tag :li, link_to(t(:tags), panel_calendar_back_end_tags_path), :class => active_for_action('/panel/calendar/back_end/tags', 'index')if (is_manager? rescue nil) %> diff --git a/vendor/built_in_modules/calendar/config/locales/en.yml b/vendor/built_in_modules/calendar/config/locales/en.yml index efb893d1..32396ad2 100644 --- a/vendor/built_in_modules/calendar/config/locales/en.yml +++ b/vendor/built_in_modules/calendar/config/locales/en.yml @@ -1,5 +1,6 @@ en: calendar: + calendar: Calendar calendars: Calendars color: Color name: Name diff --git a/vendor/built_in_modules/calendar/config/locales/zh_tw.yml b/vendor/built_in_modules/calendar/config/locales/zh_tw.yml index dd67783f..1e7df002 100644 --- a/vendor/built_in_modules/calendar/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/calendar/config/locales/zh_tw.yml @@ -1,5 +1,6 @@ zh_tw: calendar: + calendar: 日曆 calendars: Calendars color: Color name: Name diff --git a/vendor/built_in_modules/gallery/config/locales/en.yml b/vendor/built_in_modules/gallery/config/locales/en.yml index b6b11bad..be3472af 100644 --- a/vendor/built_in_modules/gallery/config/locales/en.yml +++ b/vendor/built_in_modules/gallery/config/locales/en.yml @@ -1,5 +1,6 @@ en: gallery: + gallery: Gallery album_name: Album Name album_tag: Album Tag photo_tag: Photo Tag diff --git a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml index f254c8ff..279c536d 100644 --- a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml @@ -1,5 +1,6 @@ zh_tw: gallery: + gallery: 相簿 album_name: 相簿名稱 album_tag: 相簿標籤 photo_tag: 照片標籤