Fix some translations

app/views/admin/pages/_form.html.erb

@@ -58,7 +58,7 @@
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :frontend_data_count, t('admin.frontend_data_count'), :class => 'control-label' %>
+	<%= f.label :frontend_data_count, t(:frontend_data_count), :class => 'control-label' %>
 	<div class="controls">
 		<%= f.text_field :frontend_data_count %>
 	</div>

app/views/admin/users_new_interface/_sort_headers.html.erb

@@ -1,7 +1,7 @@
 <%#= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
- ['title', 'title','span4', 'admin.title'],
+ ['title', 'title','span4', 'title'],
-                          ['description', 'description', 'span1-2', 'admin.data'],
+                          ['description', 'description', 'span1-2', 'data'],
-                          ['intro', 'intro', 'span1-2', 'admin.file_type'],
+                          ['intro', 'intro', 'span1-2', 'file_type'],
-                          ['intro', 'intro', 'span1-2', 'admin.file_length'],
+                          ['intro', 'intro', 'span1-2', 'file_length'],
-                          ['intro', 'intro', 'span1-2', 'admin.description'],
+                          ['intro', 'intro', 'span1-2', 'description'],
-                          ['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
+                          ['intro', 'intro', 'span1-2', 'tags']).html_safe %>

app/views/admin/users_new_interface/show.html.erb

@@ -50,7 +50,7 @@
                 </div>
                 <div class="viewport">
                     <div class="overview">
-                        <%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"admin.new_admin.users.profile",:items=>@profile_data} %>
+                        <%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"profile",:items=>@profile_data} %>
                         <%= render :partial=> "show_roles",:collection=>@user.roles %>
                         <%# @user.sub_roles.each{|sr| render :partial=> "user_role",:locals=>{:role_class=>sr.key.to_s,:i18n=>"admin.new_admin.users.roles.#{sr.key.to_s}",:items=>sr} }%>
 

app/views/devise/sessions/new.html.erb

@@ -11,8 +11,8 @@
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">
-					<%= f.label :email ,t("admin.user_new_interface.email")%>
+					<%= f.label :email ,t(:email)%>
-					<%= f.text_field :email, :placeholder => t("admin.user_new_interface.email"), :style => "width: 330px;" %>
+					<%= f.text_field :email, :placeholder => t(:email), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">

app/views/layouts/_side_bar_content.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= content_tag :li, :class => (active_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals') ||  active_for_app_auth('Announcement') || active_for_ob_auths_object("BulletinCategory") ) do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-megaphone') + content_tag(:span, t(:announcement)), panel_announcement_back_end_bulletins_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-megaphone') + content_tag(:span, t('announcement.announcement')), panel_announcement_back_end_bulletins_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('bulletins', '/panel/announcement/back_end/tags', 'bulletin_categorys', 'approvals')||active_for_ob_auths_object("BulletinCategory"))) do -%>
     <%= content_tag :li, link_to((t('announcement.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') if (is_manager? rescue nil) %>
@@ -33,44 +33,44 @@
 
 
 <%= content_tag :li, :class => active_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys') || active_for_app_auth('web_resource')  || active_for_ob_auths_object("WebLinkCategory")  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.link')), panel_web_resource_back_end_web_links_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t(:link)), panel_web_resource_back_end_web_links_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('web_links', '/panel/web_resource/back_end/tags', 'web_link_categorys')) do -%>
-    <%= content_tag :li, link_to((t(:list) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index')if (is_manager? rescue nil) %>
+    <%= content_tag :li, link_to((t(:list_) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_links_path), :class => active_for_action('web_links', 'index')if (is_manager? rescue nil) %>
-    <%= content_tag :li, link_to((t('new.link') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
+    <%= content_tag :li, link_to((t(:link) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t(:categories) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) if (is_manager? rescue nil)%>
-    <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
+    <%= content_tag :li, link_to((t(:tags) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
-    <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
+    <%= content_tag :li, link_to((t(:module_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
   <% end -%>
 <% 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('admin.orbit_gallery')), panel_gallery_back_end_albums_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-pictures') + content_tag(:span, t(: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) %>
-  <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
+  <%= content_tag :li, link_to((t(:module_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
   <% end -%>
 <% end %>
 
 <%= content_tag :li, :class => active_for_controllers('archive_files', 'panel/archive/back_end/tags', 'archive_file_categorys') do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-archive') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-archive') + content_tag(:span, t(:archive)), panel_archive_back_end_archive_files_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
-    <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index')if (is_manager? rescue nil) %>
+    <%= content_tag :li, link_to((t(:all) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index')if (is_manager? rescue nil) %>
-    <%= content_tag :li, link_to((t('admin.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new')  if (is_admin? rescue nil)%>
+    <%= content_tag :li, link_to((t(:add) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_archive_back_end_archive_file_path), :class => active_for_action('archive_file', 'new')  if (is_admin? rescue nil)%>
-    <%= content_tag(:li, link_to((t('admin.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index'))if (is_manager? rescue nil)%>
+    <%= content_tag(:li, link_to((t(:categories) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_file_categorys_path), :class => active_for_action('archive_file_categorys', 'index'))if (is_manager? rescue nil)%>
-    <%= content_tag :li, link_to((t('admin.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil)%>
+    <%= content_tag :li, link_to((t(:tags) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_tags_path), :class => active_for_action('tags', 'index') if (is_manager? rescue nil)%>
   <% end -%>
 <% 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('admin.calendar')), panel_calendar_back_end_cals_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-calendar') + content_tag(:span, t(: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('admin.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('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('admin.tags'), panel_calendar_back_end_tags_path), :class => active_for_action('/panel/calendar/back_end/tags', 'index')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) %>
   <% end -%>
 <% end %>
 <%= content_tag :li, :class => active_for_controllers('locations') || active_for_app_auth("gprs") do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-location') + content_tag(:span, t(:location)), panel_gprs_back_end_locations_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('locations') ) do -%>
   <% end -%>
 <% end %>

app/views/shared/attribute_field/_attribute_field.html.erb

@@ -6,7 +6,7 @@
           <a class="btn btn-small pull-right btn-danger remove_attribute" href="#"><i class="icon-trash icon-large"></i> <%= t(:delete_)%></a>
           <div class="clear">
               <div class="control-group pull-left">
-                  <label class="control-label" for="key"><%= t("admin.key") %></label>
+                  <label class="control-label" for="key"><%= t(:key) %></label>
                   <div class="multipleInput">
                       <div class="controls">
                         <%= text_field "info[attribute_fields][#{attribute_field_counter}]","key",:value=>attribute_field.key%>

config/locales/en.yml

@@ -52,6 +52,7 @@ en:
   addthis_tools:
     add_to_bookmark: Add this to bookmark
   admin: Admin
+  all: All
   all_content: All Content
   all_file: All File
   all_member: All Member
@@ -83,6 +84,7 @@ en:
     stat: Approval status
     user_list: Unit
   approval_: Approval
+  archive: Archive
   asset: Asset
   attributes: Attributes
   auth:
@@ -99,6 +101,7 @@ en:
   basic: Basic
   browse: Browse
   built_in: Built-in
+  calendar: Calendar
   cancel: Cancel
   cant_delete_self: You can not delete yourself.
   cant_empty_star: Cannot be empty (*)
@@ -180,6 +183,8 @@ en:
   followers: Followers
   forgot_password: Forgot your password?
   frequency: Frequency
+  frontend_data_count: Frontend data count
+  gallery: Gallery
   help: Help
   hidden: Hidden
   hide: Hide
@@ -219,6 +224,7 @@ en:
       radio_button: Radio button
       checkbox: Checkbox
   locale: Locale
+  location: Location
   login: Login
   logout: Logout
   mail:
@@ -285,6 +291,7 @@ en:
   postdate: Postdate
   posted_by: Posted by
   preview: Preview
+  profile: Profile
   publications: Publications
   purchase: Purchase
   quantity: Quantity

config/locales/zh_tw.yml

@@ -52,6 +52,7 @@ zh_tw:
   addthis_tools:
     add_to_bookmark: 加入書籤
   admin: 管理員
+  all: All
   all_content: 所有內容
   all_file: 所有檔案
   all_member: 所有會員
@@ -83,6 +84,7 @@ zh_tw:
     stat: 審核狀態
     user_list: 使用者列表
   approval_: 審核
+  archive: Archive
   asset: 資產
   attributes: 屬性
   auth:
@@ -99,6 +101,7 @@ zh_tw:
   basic: 基本
   browse: 瀏覽
   built_in: Built-in
+  calendar: Calendar
   cancel: 取消
   cant_delete_self: 不可以刪除自己
   cant_empty_star: 不能為空白 (*)
@@ -180,6 +183,8 @@ zh_tw:
   followers: Followers
   forgot_password: 忘記密碼?
   frequency: 頻率
+  frontend_data_count: Frontend data count
+  gallery: Gallery
   help: 幫助
   hidden: 隱藏的
   hide: 隱藏
@@ -219,6 +224,7 @@ zh_tw:
       radio_button: 單選
       checkbox: 多選
   locale: Locale
+  location: Location
   login: 登入
   logout: 登出
   mail:
@@ -285,6 +291,7 @@ zh_tw:
   postdate: 張貼日期
   posted_by: 張貼人
   preview: 預覽
+  profile: Profile
   publications: Publications
   purchase: 購買
   quantity: 數量

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb

@@ -4,7 +4,7 @@
     <div id="imgholder">
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
-	<li><span><%= t('admin.orbit_gallery') %></span><span class="divider">/</span></li>
+	<li><span><%= t(:gallery) %></span><span class="divider">/</span></li>
 	<li class="text-blue"><%= t('gallery.edit') %></li>
 </ul>
 <ul class="nav nav-tabs">

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/edit_album.html.erb

@@ -1,6 +1,6 @@
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
-	<li><span><%= t('admin.orbit_gallery') %></span><span class="divider">/</span></li>
+	<li><span><%= t(:gallery) %></span><span class="divider">/</span></li>
 	<li class="text-blue"><%= t('gallery.edit') %></li>
 </ul>
 <ul class="nav nav-tabs">