Merge branch 'widget' into publication

* widget: (41 commits)
  midify button type
  change settings table default display
  delete onside widget in db
  Fix typo
  Fix some translations
  stupid bug fixed
  uniq relation
  can display relation between author
  add back button
  new type fixed
  separate relation list from index page and render it
  can select relection from relation db
  form for coauthor - fixed
  modify delete co-author message
  new type fixed
  coauthor edit and destroy fixed
  can add relation between co-author
  refine co-authro page
  add journal_list. now, those pair, (journal_title, journal_levels), is uniq
  adjust update password textfield position
  ...

app/assets/stylesheets/desktop.css

@@ -12,4 +12,5 @@
  *= require desktopmedia
  *= require orbitTimeline
  *= require orbit-bar
+ *= require icons
 */

app/assets/stylesheets/site_editor.css.erb

@@ -13,4 +13,5 @@
  *= require scroll_style
  *= require site_items
  *= require sidebar
+ *= require icons
 */

app/controllers/admin/designs_controller.rb

@@ -101,7 +101,6 @@ class Admin::DesignsController < OrbitBackendController
   def create
     @design = Design.new(params[:design])
     if @design.save
-        flash[:notice] = "Successfully created design and tasks."
         redirect_to admin_designs_url
       else
         render :action => 'new'

app/controllers/admin/purchases_controller.rb

@@ -112,7 +112,7 @@ class Admin::PurchasesController < ApplicationController
       
       log = Logger.new(STDOUT)
       log.level = Logger::WARN
-      log.warn("App unzip procress is finished,please restart the server to apply effect")
+      log.warn(t(:unzip_app))
       
       #TODO Perform touch tmp/restart to restart in production env
     end
@@ -159,7 +159,7 @@ class Admin::PurchasesController < ApplicationController
 
         log = Logger.new(STDOUT)
         log.level = Logger::WARN
-        log.warn("App unzip procress is finished,please restart the server to apply effect")
+        log.warn(t(:unzip_app))
       }
       
       temp_file.close

app/controllers/admin/users_controller.rb

@@ -1,78 +0,0 @@
-class Admin::UsersController < ApplicationController
-  
-  layout "admin"
-  before_filter :authenticate_user!
-  before_filter :set_attribute, :only => [:index, :show, :new, :edit]
-  
-  def index
-    @users = User.all.entries
-  end
-  
-  def show
-    @user = User.find(params[:id])
-    get_info_and_roles
-  end
-  
-  def new
-    @user = User.new
-    get_info_and_roles
-  end
-  
-  def create
-    puts params.to_yaml
-    @user = User.new(params[:user])
-    if @user.save
-      flash[:notice] = t('create.success.user')
-      redirect_to :action => :index
-    else
-      render :action => :new      
-    end
-  end
-  
-  def edit
-    @user = User.find(params[:id])
-    get_info_and_roles
-  end
-  
-  def update
-    @user = User.find(params[:id])
-    
-    # Update changes to the avatar
-    @user.remove_avatar! if params[:file]
-    @user.avatar = params[:file] if params[:file]
-    
-    if @user.id.to_s.eql?(session['warden.user.user.key'][1].to_s) && @user.admin != params[:user][:admin].to_i.to_b
-      flash.now[:error] = t(:cant_revoke_self_admin)
-    end
-    if !flash[:error] && @user.update_attributes(params[:user])
-      flash[:notice] = t('update.success.user')
-      redirect_to :action => :index
-    else
-      get_info_and_roles
-      render :action => :edit
-    end
-  end
-  
-  def destroy
-    if params[:id].eql?(session['warden.user.user.key'][1].to_s)
-      flash[:error] = t(:cant_delete_self)
-    else
-      @user = User.find(params[:id]) 
-      @user.destroy
-    end
-    
-    redirect_to :action => :index
-  end
-  
-  protected
-  
-  def get_info_and_roles
-    @infos = Info.excludes('disabled' => true)
-    @roles = Role.excludes('disabled' => true)
-  end
-
-  def set_attribute
-    @class = 'users'
-  end
-  
-end

app/controllers/desktop/co_authors_controller.rb

@@ -39,7 +39,7 @@ class Desktop::CoAuthorsController < ApplicationController
     @co_author.name_id= current_user.id
 
     if @co_author.save
-      render json: {success:true, msg: "Co-author successfully saved!"}.to_json
+      render json: {success:true, msg: t('create.sucess.co_author')}.to_json
     else
       error_msg = @co_author.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
@@ -50,7 +50,7 @@ class Desktop::CoAuthorsController < ApplicationController
     @co_author = CoAuthor.find(params[:id])
 
     if @co_author.update_attributes(params[:co_author])
-      render json: {success:true, msg: "Co-author successfully update!"}.to_json
+      render json: {success:true, msg: t('update.sucess.co_author')}.to_json
     else
       error_msg = @co_author.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json

app/controllers/desktop/journal_pages_controller.rb

@@ -44,7 +44,7 @@ class Desktop::JournalPagesController < ApplicationController
     @writing_journal = WritingJournal.new(params[:writing_journal])
 
     if @writing_journal.save
-      render json: {success: true, msg: "Paper successfully saved!"}.to_json
+      render json: {success: true, msg: t('create.success.paper')}.to_json
     else
       error_msg = @writing_journal.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
@@ -56,7 +56,7 @@ class Desktop::JournalPagesController < ApplicationController
     @writing_journal= WritingJournal.find(params[:id])
 
     if @writing_journal.update_attributes(params[:writing_journal])
-      render json: {success: true, msg: "Paper successfully saved!"}.to_json
+      render json: {success: true, msg: t('update.success.paper')}.to_json
     else
       error_msg = @writing_journal.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
@@ -75,7 +75,7 @@ class Desktop::JournalPagesController < ApplicationController
   def destroy
     @writing_journal = WritingJournal.find(params[:id])
     @writing_journal.destroy
-    render :json => {success: true, msg: "Paper deleted successfully!"}
+    render :json => {success: true, msg: t('delete.success.paper')}
   end
 
   def get_journals_json

app/controllers/pages_controller.rb

@@ -10,7 +10,7 @@ class PagesController < ApplicationController
       impressionist(@item)
       render_page 
     else
-      render :text => 'You need a home page'
+      render :text => t(:need_home)
     end
   end
   

app/helpers/admin/items_helper.rb

@@ -12,13 +12,13 @@ module Admin::ItemsHelper
       end
       ret << "<li id='#{node.id}' class='#{no_nested}'>"
       # ret << "<i class='icons-moves'></i>"
-      ret << "<div class='with_action'><i class='icons-moves'></i>"
+      ret << "<div class='with_action'><i class='icons-cplus'></i>"
       ret << (link_to node.title, dest, :class => 'js_history')
       ret << "<div class='quick-edit hide'>"
       ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
       ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
       ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
-      ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
+      ret << (link_to t(:delete_), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
       ret << "</div>"
       ret << "</div>"
       ret << render_children(node)

app/helpers/application_helper.rb

@@ -44,13 +44,6 @@ module ApplicationHelper
     User.find(session[:guest_user_id].nil? ? session[:guest_user_id] = create_guest_user.id : session[:guest_user_id])
   end
 
-
-
-
-  def colorize_in_use_locale(locale)
-    @site_in_use_locales.include?(locale)? 'green' : 'red'
-  end
-  
   def flash_messages
     return unless messages = flash.keys.select{|k| FLASH_NOTICE_KEYS.include?(k)}
     formatted_messages = messages.map do |type|      

app/helpers/attribute_fields_helper.rb

@@ -228,7 +228,7 @@ protected
     temp_field_name =  get_basic_field_name_base + '[temp]'
     add_more = content_tag :div,:class=> 'controls' do
       content_tag :span,:class=> 'help-block' do
-        content = link_to (content_tag :i,I18n.t("admin.infos.add"),:class=>"icon-plus-sign"),"#",:class=>'addinput'
+        content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus-sign"),"#",:class=>'addinput'
         content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count")
         content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name")
         content

app/helpers/attribute_values_helper.rb

@@ -33,7 +33,7 @@ module AttributeValuesHelper
     end
     year_str = ""
       unless date.year == 1912
-        m_year = (date.year - 1912).abs.to_s + I18n.t("admin.infos.date.minguo_calendar.year")
+        m_year = (date.year - 1912).abs.to_s + I18n.t("date.minguo_calendar.year")
         year_str = minguo_format_year(m_year)
       end
       get_minguo_year + minguo_m_y_d_time
@@ -42,15 +42,15 @@ module AttributeValuesHelper
   def get_minguo_year
     date = get_date
     m_year = (date.year - 1911).abs
-    year_end = I18n.t("admin.infos.date.minguo_calendar.year")
+    year_end = I18n.t("date.minguo_calendar.year")
       case 
         when date.year <1912
-          I18n.t("admin.infos.date.minguo_calendar.before") + (m_year+1).to_s + year_end
+          I18n.t("date.minguo_calendar.before") + (m_year+1).to_s + year_end
         when  date.year ==1912
-          I18n.t("admin.infos.date.minguo_calendar.first_year") 
+          I18n.t("date.minguo_calendar.first_year") 
         when date.year >1912
-          I18n.t("admin.infos.date.minguo_calendar.after")+ (m_year).to_s + year_end
+          I18n.t("date.minguo_calendar.after")+ (m_year).to_s + year_end
-    end # of case tw_claendar year
+    end # of case tw_calendar year
   end
 
   def minguo_m_y_d_time
@@ -61,7 +61,7 @@ module AttributeValuesHelper
         when 'format2' #  Y/M/D
           date.strftime(" %m/%d")
         when 'format3' #  Y/M
-          date.strftime(" %m#{I18n.t("admin.infos.date.minguo_calendar.month")}")
+          date.strftime(" %m#{I18n.t("date.minguo_calendar.month")}")
         when 'format4' #  Y
           ''
       end # of  case 
@@ -71,11 +71,11 @@ module AttributeValuesHelper
     case I18n.locale
     when :zh_tw
       case 
-        when self.attribute_field["typeC"]["claendar"] == "west_claendar"
+        when self.attribute_field["typeC"]["calendar"] == "west_calendar"
           show_west_calender(from_to)
-        when self.attribute_field["typeC"]["claendar"] == "tw_claendar"
+        when self.attribute_field["typeC"]["calendar"] == "tw_calendar"
           show_minguo_calendar(from_to)
-      end #case self.attribute_field["typeC"]["claendar"]
+      end #case self.attribute_field["typeC"]["calendar"]
     when :en
       show_west_calender(from_to)
     end

app/models/design/layout.rb

@@ -10,6 +10,7 @@ class Layout < DesignFile
   embeds_many :layout_parts
   
   before_save :parse_layout
+  after_save :save_pages
 
   def content
     self.file.read.force_encoding("UTF-8") rescue ''
@@ -24,5 +25,9 @@ class Layout < DesignFile
     self.body = html.at_css("body").inner_html
     parse_body(self)
   end
+
+  def save_pages
+    self.design.pages.each(&:generate_parts)
+  end
   
 end

app/models/desktop/section.rb

@@ -11,7 +11,6 @@ class Section
   
   def initialize_group
     self.groups.build
-    self.groups.build
   end
   
-end
+end

app/models/page.rb

@@ -26,6 +26,15 @@ class Page < Item
   
   # embeds_many :custom_images, :class_name => 'Image', as: :design_image
   
+  def generate_parts
+    page_design = self.design
+    page_design.layout.layout_parts.each do |layout_part|
+      current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
+      current_part = self.page_parts.build(:name => layout_part.name) unless current_part
+      current_part.save if current_part.new_record?
+    end
+  end
+
   protected
   
   def create_parts

app/models/user/attribute_field.rb

@@ -12,7 +12,7 @@ class AttributeField
   field :to_delete,:type=> Boolean,:default => false
   field :typeA,:type=> Hash,:default=>{:cross_lang=>false}
   field :typeB,:type=> Hash,:default=>{}
-  field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar",:format=>"format3"}
+  field :typeC,:type=> Hash,:default=>{:calendar=>"west_calendar",:format=>"format3"}
   field :typeD,:type=> Hash,:default=>{:cross_lang=>false}
   field :typeE,:type=> Hash,:default=>{}
   field :title, localize: true

app/models/user/user.rb

@@ -3,7 +3,7 @@ class User
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :registerable, :validatable, :timeoutable
   
   mount_uploader :avatar, AvatarUploader
   

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -22,7 +22,7 @@
 			<%if  (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%>
 				<%=  content_tag :div ,:class=>'adbanner-action' do%>
 					<%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-					<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
+					<%= link_to t(:preview), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
 				<% end -%>
 			<% end -%>
 			<ul class="clear">
@@ -30,7 +30,7 @@
 			</ul>
 			 <% if at_least_module_manager  %>
 				<%= show_ad_banner_permission_link ad_banner_tab%>
-				<%= link_to	t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+				<%= link_to	t(:delete_),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
 			<% end -%>
 
 			<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>

app/views/admin/ad_banners/_ad_image_update.html.erb

@@ -7,7 +7,7 @@
                   <%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>
       			<p>
 	       			<%= link_to	t('edit'),edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn  btn-primary'  %>
-			       	<%= link_to	t('delete'),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+			       	<%= link_to	t(:delete_),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
 			     </p>
                   <% end -%>
 </li>

app/views/admin/ad_banners/_modal_ad_banner_form.html.erb

@@ -25,7 +25,7 @@
 		<div class="control-group">
 			<%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
 			<div class="controls">
-				<%= f.text_field :best_size %> Ex: 500px x 300px
+				<%= f.text_field :best_size %> <%= t('ad.best_size_example') %>
 			</div>
 		</div>
 		

app/views/admin/ad_banners/_modal_preview.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in banner-preview" id="slideshow-<%=ad_banner.title.dehumanize%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("modal.preview") %></h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="ad_banner_slideshow">
@@ -13,7 +13,7 @@
     </p>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

app/views/admin/ad_banners/_preview_block.html.erb

@@ -1,10 +1,10 @@
 <% if ad_banner -%>
-<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
+<%= link_to t(:preview),"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
 
 <div class="modal hide fade in banner-preview" id='slideshow-<%=ad_banner.title.dehumanize%>'>
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3>Modal header</h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="ad_banner_slideshow">

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

@@ -17,9 +17,9 @@
 		<div id="sub-wiget">
           <div id="widget-date" class="widget-box">
               <div class="widget-action clear">
-                  <a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
+                  <a href="#" class="action"><i title="<%= t('ad.set_dates') %>" class="icon-exclamation-sign icon-white tip"></i></a>
               </div>
-              <h3 class="widget-title"><i class="icons-calendar"></i><%= t('nccu.date') %></h3>
+              <h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
               <div class="widget-content clear">
                   <div id="calendarRange">
                       <div class="input-append">
@@ -71,9 +71,9 @@
 		
 			<div id="widget-picture" class="widget-box">
         <div class="widget-action clear">
-            <a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
+            <a class="action"><i title="<%= t('ad.upload_pictures') %>" class="icon-exclamation-sign icon-white tip"></i></a>
         </div>
-        <h3 class="widget-title"><i class="icons-pictures"></i><%= t('nccu.picture') %></h3>
+        <h3 class="widget-title"><i class="icons-pictures"></i><%= t(:picture) %></h3>
         <div class="widget-content clear">         
           <div class="control-group">
             <div  class="upload-picture">
@@ -99,7 +99,7 @@
 				
 			<div id="widget-type" class="widget-box">
 					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Upload pictures"></i></a>
+						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.select_fx') %>"></i></a>
 					</div>
 					<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:type) %></h3>
 					<div class="widget-content clear">
@@ -109,21 +109,21 @@
 			
 			<div id="widget-time" class="widget-box widget-size-300">
 					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Set the range time"></i></a>
+						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.set_range') %>"></i></a>
 					</div>
 					<h3 class="widget-title"><i class="icons-time"></i><%= t(:frequency) %></h3>
 					<div class="widget-content clear">
-						 <%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
+						 <%= f.text_field :weight ,:class=> 'span3',:placeholder=> t('ad.chinese_1') %>
 					</div>
 				</div>
 				
 			<div id="widget-link" class="widget-box widget-size-300">
 					<div class="widget-action clear">
-						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Add a reference link"></i></a>
+						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.add_link') %>"></i></a>
 					</div>
 					<h3 class="widget-title"><i class="icons-landscape"></i><%= t(:link) %></h3>
 					<div class="widget-content clear">
-						<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
+						<%= f.text_field :out_link ,:class=> 'span3',:placeholder => t('ad.chinese_2') %>
 					</div>
 				</div>
 
@@ -143,7 +143,7 @@
 							<%= content_tag :div,:class	=> "tab-pane #{active_when_current_locale_eq locale}",:id=>"#{locale}" do%>
 								<div class="title">
 									<%= f.fields_for :title_translations do |f| %>
-										<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => "輸入標題", :value => (@ad_image.title_translations[locale] rescue nil) %>
+										<%= f.text_field locale, :class=>"ad_image-title post-title", :placeholder => t('ad.chinese_1'), :value => (@ad_image.title_translations[locale] rescue nil) %>
 									<% end %>
 								</div>
 								<br/>
@@ -160,7 +160,7 @@
 					</div>
 				</div>
 				<div class="form-actions">
-					<%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
+					<%#= link_to t(:preview), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
 					<%= f.submit t("submit"),:class=>"btn btn-primary" %>
 					<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
 				</div>

app/views/admin/app_auths/index.html.erb

@@ -37,7 +37,7 @@
 				<td class="action">
 					<%= link_to t(:show), admin_module_app_path(module_app), :class => 'show' %>
 					<%= link_to t(:edit), edit_admin_module_app_path(module_app), :class => 'edit' %>
-					<%= link_to t(:delete), admin_module_app_path(module_app), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
+					<%= link_to t(:delete_), admin_module_app_path(module_app), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
 				</td>
 			</tr>
 			<tr>

app/views/admin/asset_categories/_asset_category.html.erb

@@ -6,7 +6,7 @@
 				<ul class="nav nav-pills hide">
 
 						<li><%= link_to t(:edit), edit_admin_asset_category_path(asset_category), :remote => true %></li>
-						<li><%= link_to t(:delete), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
+						<li><%= link_to t(:delete_), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
 					
 				</ul>
 			</div>

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

@@ -2,7 +2,7 @@
 
 <%= form_for(@asset_category, :remote => true, :url => @url) do |f| %>
 
-	<h2><%= (@asset_category.new_record? ? 'Add' : 'Edit') %></h2>
+	<h2><%= (@asset_category.new_record? ? t(:add) : t(:edit)) %></h2>
 
 	<div id="widget-title">
 		<%= f.label :key %>
@@ -13,7 +13,7 @@
 		<%= f.fields_for :title_translations do |f| %>
 		  <% @site_valid_locales.each do |locale| %>
 				<div class="control-group">
-					<%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 					<div class="controls">
 						<%= f.text_field locale, :class => 'input-xxlarge', :value => (@asset_category.title_translations[locale] rescue nil) %>
 					</div>

app/views/admin/assets/_asset.html.erb

@@ -6,7 +6,7 @@
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<li><%= link_to t(:edit), edit_admin_asset_path(asset), :remote => true, :class => 'edit'  %></li>
-				<li class="dropdown"><%= link_to t(:delete), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
+				<li class="dropdown"><%= link_to t(:delete_), admin_asset_path(asset), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
 			</ul>
 		</div>
 	</td>

app/views/admin/attributes/_attribute_field.html.erb

@@ -10,15 +10,15 @@
 	<% end %>
   <td class='select_type'>
     <ul>
-      <li>markup<%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
+      <li><%= t(:markup) %> : <%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
-      <li>markup_value<%= f.text_field :markup_value,:size=>50 %></li>
+      <li><%= t(:markup_value) %> : <%= f.text_field :markup_value,:size=>50 %></li>
-      <li>markup_options<%= f.text_field :markup_options,:size=>50 %></li>
+      <li><%= t(:markup_options) %> : <%= f.text_field :markup_options,:size=>50 %></li>
-      <li>locale<%= f.check_box :locale,{},true,false %></li>
+      <li><%= t(:locale) %> : locale<%= f.check_box :locale,{},true,false %></li>
-      <li>built_in<%= f.check_box :built_in,{},true,false %></li>
+      <li><%= t(:built_in) %> : built_in<%= f.check_box :built_in,{},true,false %></li>
-      <li>disabled<%= f.check_box :disabled,{},true,false %></li>
+      <li><%= t(:disabled) %> : disabled<%= f.check_box :disabled,{},true,false %></li>
-      <li>add_more<%= f.check_box :add_more,{},true,false %></li>
+      <li><%= t(:add_more) %> : add_more<%= f.check_box :add_more,{},true,false %></li>
-      <li>neutral_title<%= f.text_field :neutral_title,:size=>50 %></li>
+      <li><%= t(:neutral_title) %> : neutral_title<%= f.text_field :neutral_title,:size=>50 %></li>
-      <li>neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
+      <li><%= t(:neutral_for) %> : neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
     <!--  
       <li><%#= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%> </li>
       <li><%#= t(:options) %>: <%#= f.text_field :markup_value%></li>
@@ -27,14 +27,14 @@
   </td>
   <td class="action">
 		<% if attribute_field.new_record? %>
-	      <a href="#" class="delete"><%= t(:delete) %></a>
+	      <a href="#" class="delete"><%= t(:delete_) %></a>
 	    <% else %>	
 	      <%= f.hidden_field :id %>
 				<% if attribute_field.is_built_in? %>
 					<a href="#" class="switch" id="<%= attribute_field.id %>"></a>
 					<%= f.hidden_field :disabled, :value => attribute_field.is_disabled? , :class => 'built_in_state' %>
 				<% else %>
-					<a href="#" class="remove_existing_record delete"><%= t(:delete) %></a>
+					<a href="#" class="remove_existing_record delete"><%= t(:delete_) %></a>
 		      <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
 				<% end %>
 	    <% end %>

app/views/admin/attributes/edit.html.erb

@@ -1,34 +1,34 @@
             <%= form_for @attribute,:url => admin_info_path(@attribute) ,:class=> "form-horizontal" do |f| %>
             <div class="site-map role-block">
                 <div class="map-block back">
-                    <h4><span><%= t("admin.info")%></span></h4>
+                    <h4><span><%= t(:info)%></span></h4>
                                         <div class="form-horizontal">
                         <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="controls">
                                     <% if @attribute.new_record? %>
-                                        <%= f.text_field :key,:placeholder=>"Key" %>
+                                        <%= f.text_field :key, :placeholder => t(:key) %>
                                     <% else %>
                                         <div><%= @attribute.key%></div>
                                     <% end %>
                                 </div>
                             </div>
-                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.item_name"),:field_name=>"info[title_translations]"}%>
+                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"info[title_translations]"}%>
                         </div>
                     </div>
                 </div>
 
                         <% @attribute_fields_upper_object.each do |attribute|%>
                             <div class="map-block back attributes">
-                                <h4><span><%=  attribute.title+ t("admin.attributes")%></span></h4>
+                                <h4><span><%=  attribute.title+ t(:attributes)%></span></h4>
                                 <%= render :partial=>"shared/attribute_field/attribute_field",:collection=>attribute.attribute_fields%>
                             </div>
                         <% end %>
                     </div>
             <div class="form-actions form-fixed pagination-right">
-                <%= link_to content_tag(:i,t("admin.infos.add_attribute_field"),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%>
+                <%= link_to content_tag(:i,t(:add_attribute_field),:class=>"icon-plus icon-white"),admin_info_add_attribute_field_path(@attribute),:class=>"btn btn-primary",:remote => true%>
-                <%= f.submit t("admin.infos.save"),:class=>"btn btn-primary"%>
+                <%= f.submit t(:save),:class=>"btn btn-primary"%>
                 
             </div>
         <% end %>

app/views/admin/attributes/index.html.erb

@@ -23,7 +23,7 @@
 				<%= link_to t(:enable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? 'none' : ''}", :class => 'switch' %>
 				<%= link_to t(:disable), eval("admin_#{@attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{@attribute_type} => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? '' : 'none'}", :class => 'switch' %>
 				<% if !attribute.is_built_in? %>
-	      	<%= link_to t(:delete), eval("admin_#{@attribute_type}_path(attribute)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
+	      	<%= link_to t(:delete_), eval("admin_#{@attribute_type}_path(attribute)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
 				<% end %>
 			</td>
 		</tr>

app/views/admin/components/_user_role_management.html.erb

@@ -19,12 +19,12 @@
 	<% end %>
 	<% unless auth.nil? %>
 		<% auth.roles.each do |role| %>
-			<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>
+			<li> <%= role.key %> <%= t(:built_in) %> :<%= role.built_in ? t(:yes_) : t(:no_) %>
 				<%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'role',:target_id=>role.id),:method => :delete %></li>
 		<% end %>
 	<ul>Sub Roles </ul>
 		<% auth.sub_roles.each do |role| %>
-			<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %> </li><%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'sub_role',:target_id=>role.id),:method => :delete %>
+			<li> <%= role.key %> <%= t(:built_in) %> :<%= role.built_in ? t(:yes_) : t(:no_) %> </li><%= link_to '[X]',polymorphic_path(ploy_route_ary,:type=>'sub_role',:target_id=>role.id),:method => :delete %>
 			<% end %>
 	<ul>PrivilegeList </ul>
 			<% auth.privilege_users.each do |user| %>

app/views/admin/designs/_design.html.erb

@@ -5,7 +5,7 @@
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<li><%= link_to t(:edit), edit_admin_design_path(design), :class => 'edit'  %></li>
-				<li class="dropdown"><%= link_to t(:delete), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
+				<li class="dropdown"><%= link_to t(:delete_), admin_design_path(design), :confirm => t('sure?'), :method => :delete, :class => 'delete' %></li>
 			</ul>
 		</div>
 	</td>

app/views/admin/designs/_design_file.html.erb

@@ -5,7 +5,7 @@
         <%= f.hidden_field :id %>
         <%= f.hidden_field :file %>
         <%= f.hidden_field :to_destroy %>
-      <a class="remove_mark" href="#"><%= t('Delete') %></a>
+      <a class="remove_mark" href="#"><%= t(:delete_) %></a>
     <% end %>
     <% if classes.include?('r_edit') %>
       <a class="edit_mark" href="#"><%= t('Edit') %></a>

app/views/admin/designs/_images.html.erb

@@ -16,7 +16,7 @@
 <div class="modal hide fade" id="imageModal" tabindex="-1" role="dialog" aria-labelledby="imageModalLabel" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="imageModalLabel">Add image</h3>
+    <h3 id="imageModalLabel"><%= t(:add_image) %></h3>
   </div>
   <%= form_for :image, :url => upload_image_admin_design_path, :html => {:id => 'ajaxForm', :class => 'form-horizontal'}, :method => :post do |f| %>
     <div class="modal-body">
@@ -28,7 +28,7 @@
       </div>
     </div>
     <div class="modal-footer">
-      <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+      <button class="btn" data-dismiss="modal" aria-hidden="true"><%= t(:close) %></button>
       <%= f.submit t(:add), :class => "btn btn-primary" %>
     </div>
   <% end %>

app/views/admin/designs/edit.html.erb

@@ -5,12 +5,12 @@
 <h1><%= t('editing.design') %></h1>
 
 <ul class="nav nav-tabs" id="myTab">
-  <li class="active"><a href="#info" data-toggle="tab"><%= t('design.info') %></a></li>
+  <li class="active"><a href="#info" data-toggle="tab"><%= t(:info) %></a></li>
   <li><a href="#layout" data-toggle="tab"><%= @design.layout.name %></a></li>
   <li><a href="#css_default" data-toggle="tab"><%= @design.css_default.name %></a></li>
   <li><a href="#css_reset" data-toggle="tab"><%= @design.css_reset.name %></a></li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.themes') %> <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(:themes) %> <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <% @design.themes.each do |theme| %>
         <li><a href="#<%= dom_id theme %>" data-toggle="tab"><%= theme.name %></a></li>
@@ -18,14 +18,14 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.javascripts') %> <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t(javascripts) %> <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <% @design.javascripts.each do |js| %>
         <li><a href="#<%= dom_id js %>" data-toggle="tab"><%= js.name %></a></li>
       <% end %>
     </ul>
   </li>
-  <li><a href="#images" data-toggle="tab"><%= t('design.images') %></a></li>
+  <li><a href="#images" data-toggle="tab"><%= t(:images) %></a></li>
 </ul>
  
 <div class="tab-content">

app/views/admin/infos/_form.html.erb.bak

@@ -1,70 +0,0 @@
-<div class="attributes_block <%= @class %>">
-	<h2><%= t("#{@attribute_type}") %></h2>
-	<div class="info_input">
-		<table border="0" cellspacing="0" cellpadding="0">
-			<thead class="list_head">
-				<tr>
-					<td><%= t(:key) %></td>
-					<% @site_valid_locales.each do |locale| %>
-			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-			    <% end %>
-				</tr>
-			</thead>
-			<tbody>
-			<tr class="list_item">
-			    <td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td>
-					<%= f.fields_for :title_translations do |f| %>
-					  <% @site_valid_locales.each do |locale| %>
-					    <td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td>
-					  <% end %>
-					<% end %>
-			  </tr>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-
-<div class="attributes_block <%= @class %>">
-	<h2>Attributes</h2>
-	<div class="info_input">
-		<table id='attributes' border="0" cellspacing="0" cellpadding="0">
-			<thead class="list_head">
-				<tr>
-					<td><%= t('admin.key') %></td>
-					<td><%= t('admin.cross_lang') %></td>
-					<% @site_valid_locales.each do |locale| %>
-			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-			    <% end %>
-					<td><%= t(:type)%></td>
-					<td>&nbsp;</td>
-				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-					<td colspan="6">
-						<%= hidden_field_tag 'attribute_field_count', @attribute.attribute_fields.count %>
-						<a href="#" class="add"><%= t(:add) %></a>
-					</td>
-				</tr>
-			</tfoot>
-			<tbody>
-				<% @attribute.attribute_fields.each do |attribute_field| %>
-					<%= render :partial => 'attribute_field', :object => attribute_field, :locals => {:f => f} %>
-				<% end %>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "attribute_form" %>
-	<script>
-		$('.attributes_block a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_attribute_fields", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-		  $('#attributes').append(("<%= escape_javascript(add_attribute 'admin/attributes/attribute_field', f, :attribute_fields) %>").replace(old_id, new_id));
-		});
-	</script>
-<% end %>

app/views/admin/links/delete.html.erb

@@ -1,7 +1,7 @@
 <% form_for :link, :url => admin_link_path(@item), :html => { :method => :delete } do |f| %>
   <h2><%= t('sure?') %></h2>
   <p>
-    <%= submit_tag t(:delete) %>
+    <%= submit_tag t(:delete_) %>
     <%= link_back %>
   </p>
 <% end %>

app/views/admin/module_apps_new_interface/_modal_list.html.erb

@@ -22,7 +22,7 @@
 		<divl>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

app/views/admin/object_auths/index.html.erb

@@ -24,7 +24,7 @@
 				<td class="action">
 					<%= link_to t(:show), admin_object_auth_path(object_auth), :class => 'show' %>
 					<%= link_to t(:edit), edit_admin_object_auth_path(object_auth), :class => 'edit' %>
-					<%= link_to t(:delete), admin_object_auth_path(object_auth), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
+					<%= link_to t(:delete_), admin_object_auth_path(object_auth), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
 				</td>
 			</tr>
 			<tr>

app/views/admin/object_auths_new_interface/_modal_list.html.erb

@@ -22,7 +22,7 @@
 		<divl>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

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/pages/delete.html.erb

@@ -1,7 +1,7 @@
 <% form_for :page, :url => admin_page_path(@page), :html => { :method => :delete } do |f| %>
   <h2><%= t('sure?') %></h2>
   <p>
-    <%= submit_tag t(:delete) %>
+    <%= submit_tag t(:delete_) %>
     <%= link_back %>
   </p>
 <% end %>

app/views/admin/plugins/index.html.erb

@@ -10,7 +10,7 @@
                 <div class="module-nav-view">
                     <ul class="nav nav-pills">
                         <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
-                            <%= link_to t("admin.new_admin.users.all_plugin_summary")%>
+                            <%= link_to t(:all_plugin_summary)%>
                         <% end -%>
                         <% @plugins.each do |plugin| %>
                             <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>

app/views/admin/purchases/index.html.erb

@@ -1,5 +1,5 @@
 <div class="main2">
-	<h1><%= t('list.puchase') %></h1>
+	<h1><%= t('list.purchase') %></h1>
 	<table>
 		<thead>
 			<tr>

app/views/admin/roles/_attribute_field.html.erb.bak

@@ -1,3 +0,0 @@
-<%= f.fields_for :attribute_fields, attribute_field do |f| %>
-	<%= render :partial => 'admin/attributes/attribute_field', :object => attribute_field, :locals => {:f => f} %>
-<% end %>

app/views/admin/roles/_form.html.erb.bak

@@ -1,52 +0,0 @@
-<div class="attributes_block <%= @class %>">
-	<h2><%= t("#{@attribute_type}") %></h2>
-	<hr>
-	<div class="info_input">
-		<table border="0" cellspacing="0" cellpadding="0">
-			<thead class="list_head">
-				<tr>
-					<td><%= t(:key) %></td>
-					<% @site_valid_locales.each do |locale| %>
-			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-			    <% end %>
-				</tr>
-			</thead>
-			<tbody>
-			<tr class="list_item">
-			    <td><%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @attribute.key %></td>
-					<%= f.fields_for :title_translations do |f| %>
-					  <% @site_valid_locales.each do |locale| %>
-					    <td><%= f.text_field locale, :style => "width:150px", :value => (@attribute.title_translations[locale] rescue nil) %></td>
-					  <% end %>
-					<% end %>
-			  </tr>
-			</tbody>
-		</table>
-	</div>
-</div>
-
-<div id='sub_roles' class="attributes_block <%= @class %>">
-	<h2>Sub roles</h2>
-	<hr>
-		<% @attribute.sub_roles.each_with_index do |sub_role, i| %>
-			<%= render :partial => 'form_sub', :object => sub_role, :locals => {:f => f, :i => i} %>
-		<% end %>	
-	</div>
-</div>
-
-<div id='add_sub_role'>
-	<%= hidden_field_tag 'attribute_field_count', @attribute.sub_roles.count %>
-	<a href="#" class="add"><%= t(:add) %></a>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "attribute_form" %>
-	<script>
-		$('#add_sub_role a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_sub_roles", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-		  $('#sub_roles').append(("<%= escape_javascript(add_attribute 'admin/roles/sub_role', f, :sub_roles) %>").replace(old_id, new_id));
-		});
-	</script>
-<% end %>

app/views/admin/roles/_form_sub.html.erb.bak

@@ -1,3 +0,0 @@
-<%= f.fields_for :sub_roles, form_sub do |f| %>
-	<%= render :partial => 'sub_role', :object => form_sub, :locals => {:f => f, :i => i} %>
-<% end %>

app/views/admin/roles/_sub_role.html.erb.bak

@@ -1,69 +0,0 @@
-<div class="info_input">
-	<table border="0" cellspacing="0" cellpadding="0">
-		<thead class="list_head">
-			<tr>
-				<td><%= t(:key) %></td>
-				<% @site_valid_locales.each do |locale| %>
-		      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-		    <% end %>
-			</tr>
-		</thead>
-		<tbody>
-		<tr class="list_item">
-		    <td><%= sub_role.new_record? ? (f.text_field :key, {:style => "width:150px"}) : sub_role.key %></td>
-				<%= f.fields_for :title_translations do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-				    <td><%= f.text_field locale, :style => "width:150px", :value => (sub_role.title_translations[locale] rescue nil) %></td>
-				  <% end %>
-				<% end %>
-		  </tr>
-		</tbody>
-	</table>
-	<div class="group">
-		<h2>Attributes</h2>
-		<div class="info_input">
-			<table class="sub_role_attributes" border="0" cellspacing="0" cellpadding="0">
-				<thead class="list_head">
-					<tr>
-						<td><%= t(:key) %></td>
-						<td><%= t(:multilingual) %></td>
-						<% @site_valid_locales.each do |locale| %>
-				      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-				    <% end %>
-						<td><%= t(:type)%></td>
-						<td>&nbsp;</td>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr>
-						<td colspan="6">
-							<div id='add_attribute'>
-								<%= hidden_field_tag 'attribute_field_count', sub_role.attribute_fields.count %>
-								<a href="#" class="add"><%= t(:add) %></a>
-								<%= hidden_field_tag 'sub_role_temp_id', (i rescue 'new_sub_roles') %>
-							</div>
-						</td>
-					</tr>
-				</tfoot>
-				<tbody>
-					<% sub_role.attribute_fields.each do |attribute_field| %>
-						<%= render :partial => 'attribute_field', :object => attribute_field, :locals => {:f => f} %>
-					<% end %>
-				</tbody>
-			</table>
-		</div>
-	</div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<script>
-		$('#add_attribute a.add').live('click', function(){
-			var new_parent_id = $(this).next().attr('value');
-			var old_parent_id = new RegExp("new_sub_roles", "g");
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_attribute_fields", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-	    $(this).parents('table').append(("<%= escape_javascript(add_attribute 'admin/attributes/attribute_field', f, :attribute_fields) %>").replace(old_id, new_id).replace(old_parent_id, new_parent_id));
-		});
-	</script>
-<% end unless !sub_role.new_record? %>

app/views/admin/tags/_tag.html.erb

@@ -8,6 +8,6 @@
 	</div>
 	<div class="action">
 	<%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true  %>
-	<%= link_to t(:delete), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
+	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

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

@@ -1,40 +0,0 @@
-<div id="person" class="clear">
-	<% if @user.avatar? %>
-		<%= image_tag(@user.avatar.thumb.url) %>
-	<% else %>
-		<%= image_tag "person.png" %>
-	<% end %>
- 	<%= file_field_tag 'file' %>
- 	<%= hidden_field_tag :avatar_cache %>
-	<label>
-	<span><%= t(:email) %>：</span>
-	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
-	</label>
-	<label>
-    <%= f.check_box :admin %>
-	<span><%= t(:admin) %>：</span>
-	</label>
-	<label>
-	<span><%= t(:role) %>：</span>
-	<%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.title, role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %>
-	</label>
-</div>
-
-
-<%= render :partial => 'info', :collection => @infos, :locals => {:f => f} %>
-
-
-<div id='roles'>
-	<% @roles.each do |role| %>
-		<div id="<%= role.id %>_block" class="attributes_block <%= @class %>" <%= raw(' style="display: none;"') unless ((@user.role.id.eql?(role.id) rescue nil) || (role.key.eql?('student') && @user.new_record?)) %>>
-			<h2><%= role.title %></h2>
-			<hr class="<#%= @user.role.key %>_block">
-			<%= render :partial => 'sub_role_selector', :locals => {:f => f, :role => role} %>
-			<%= render :partial => 'sub_role', :collection => role.sub_roles, :locals => {:f => f, :role => role} %>
-		</div>	
-	<% end -%>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "user_form" %>
-<% end -%>

app/views/admin/users/_info.html.erb

@@ -1,40 +0,0 @@
-<div id="basic_block" class="attributes_block <%= @class %>">
-	<h2><%= info.title %></h2>
-	<hr>	
-	<div class="info_input">
-		<table border="0" cellspacing="0" cellpadding="0">
-			<thead class="list_head">
-				<tr>
-					<td><%= t(:key) %></td>
-					<% @site_valid_locales.each do |locale| %>
-		        	<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-		      		<% end %>
-				</tr>
-			</thead>
-			<tbody>
-				<% info.get_enabled_attribute_fields.each do |attr| %>
-					<%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %>
-		      	<tr class="list_item">
-			        <td><%= attr.title %></td>
-			        <% if attr["locale"] && attr["markup"] == 'text_field' %>
-							  <% @site_valid_locales.each do |locale| %>
-							    <td><%= f.text_field locale %></td>
-							  <% end %>
-			        <% else %>
-			          <td colspan=<%= @site_valid_locales.size %>>
-			            <% if attr["markup"] == "text_field"  %>
-										<%= f.text_field :non_locale %>
-			            <% elsif attr["markup"] == "select" %>
-			              <%= f.select :non_locale, options_for_select(attr["options"], value['non_locale']) %>
-			            <% end -%>
-			          </td>        
-			        <% end -%>
-							<%= f.hidden_field :attribute_field_id, :value => attr.id %>
-							<%= f.hidden_field :key, :value => attr.key %>
-			      </tr>
-					<% end %>
-		    <% end %>
-			</tbody>
-		</table>
-	</div>	
-</div>

app/views/admin/users/_show_attribute.html.erb

@@ -1,26 +0,0 @@
-<div class="info_input">
-	<table border="0" cellspacing="0" cellpadding="0">
-		<thead class="list_head">
-			<td><%= t(:key) %></td>
-			<% @site_valid_locales.each do |locale| %>
-			<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-			<% end %>
-		</thead>
-		<tbody>
-			<% show_attribute.get_enabled_attribute_fields.each do |attr| %>
-				<tr class="list_item">
-					<td><%= attr.title %></td>
-					<% @site_valid_locales.each do |locale| %>
-						<td>
-							<% if attr["locale"] && attr["markup"] == 'text_field' %>
-							<%= show_attribute(@user, attr.id, locale) %>
-							<% else %>
-							<%= show_attribute(@user, attr.id) %>  
-							<% end %>
-						</td>
-					<% end %>
-				</tr>
-			<% end %>
-		</tbody>
-	</table>
-</div>

app/views/admin/users/_show_sub_role.html.erb

@@ -1,4 +0,0 @@
-<div id="sub_role_<%= show_sub_role.id %>" class="group">
-	<h2><%= show_sub_role.title %></h2>
-	<%= render :partial => 'show_attribute', :object => show_sub_role %>
-</div>

app/views/admin/users/_side_bar.html.erb

@@ -1,11 +0,0 @@
-<div id="search">
-	<input id="user_search" name="user[username]" size="30" type="text" />
-</div>
-<div class="member_setup <%= @class %>">
-	<h1><%= t(:setup_member) %></h1>
-	<ul class="list">
-		<li class="set_1"><%= link_to content_tag(:span, t('list.user')), admin_users_path %></li>
-		<li class="set_2"><%= link_to content_tag(:span, t('list.role')), admin_roles_path %></li>
-		<li class="set_3"><%= link_to content_tag(:span, t('list.info')), admin_infos_path %></li>
-	</ul>	
-</div>

app/views/admin/users/_sub_role.html.erb

@@ -1,39 +0,0 @@
-<div id="sub_role_<%= sub_role.id %>" class="group" <%= raw(' style="display: none;"') unless @user.sub_role_ids.include?(sub_role.id) %>>
-	<h2><%= sub_role.title %></h2>
-	<div class="info_input">
-		<table border="0" cellspacing="0" cellpadding="0">
-			<thead class="list_head">
-				<tr>
-					<td><%= t(:key) %></td>
-					<% @site_valid_locales.each do |locale| %>
-					<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
-					<% end %>
-				</tr>
-			</thead>
-			<tbody>
-				<% sub_role.get_enabled_attribute_fields.each do |attr| %>
-				<%= f.fields_for :attribute_values, @user.get_value_from_field_id(attr.id) do |f| %>
-				<tr class="list_item">
-					<td><%= attr.title %></td>
-					<% if attr["locale"] && attr["markup"] == 'text_field' %>
-					<% @site_valid_locales.each do |locale| %>
-					<td><%= f.text_field locale %></td>
-					<% end %>
-					<% else %>
-					<td colspan=<%= @site_valid_locales.size %>>
-						<% if attr["markup"] == "text_field"  %>
-						<%= f.text_field :non_locale %>
-						<% elsif attr["markup"] == "select" %>
-						<%= f.select :non_locale, options_for_select(attr["options"], value['non_locale']) %>
-						<% end -%>
-					</td>        
-					<% end -%>
-					<%= f.hidden_field :attribute_field_id, :value => attr.id %>
-					<%= f.hidden_field :key, :value => attr.key %>
-				</tr>
-				<% end %>
-				<% end %>
-			</tbody>
-		</table>
-	</div>
-</div>

app/views/admin/users/_sub_role_selector.html.erb

@@ -1,4 +0,0 @@
-<% role.sub_roles.each do |sub_role| %>
-	<%= f.label sub_role.title, :for => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
-	<%= check_box_tag "user[sub_role_ids][]", sub_role.id, @user.sub_role_ids.include?(sub_role.id), :id => "check_sub_role_#{sub_role.id}", :class => 'sub_role_select' %>
-<% end %>

app/views/admin/users/edit.html.erb

@@ -1,14 +0,0 @@
-<% content_for :secondary do %>
-	<%= render 'side_bar' %>
-<% end %>
-
-<div id="profile" class="clear">
-	<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
-    <%= f.error_messages %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <div class="button_bar">
-    	<%= link_back %>
-		<%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
-    </div>
-  <% end -%>
-</div>

app/views/admin/users/index.html.erb

@@ -1,42 +0,0 @@
-<% content_for :secondary do %>
-	<%= render 'side_bar' %>
-<% end %>
-
-<div class="main_list clear">
-	<%= flash_messages %>
-	<div class="button_bar up">
-		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
-	</div>
-	<table>
-		<thead>
-			<tr>
-				<td class="roles"><%= t(:role) %></td>
-				<td class="name"><%= t(:name) %></td>
-				<td class="email"><%= t(:email) %></td>
-				<td class="admin"><%= t(:admin) %></td>
-				<td class="action"><%= t(:action) %></td>
-			</tr>
-		</thead>
-		<tbody>
-			<% @users.each do |user| %>
-			<tr class="have">
-				<td class="roles <%= user.role.key.downcase rescue nil %>"><%= user.role.title rescue nil %></td>
-				<td class="name"><%= user.name ? user.name : 'bob' %></td>
-				<td class="email"><%= user.email %></td>
-				<td class="admin"><%= user.admin ? t(:yes_) : t(:no_) %></td>
-				<td class="action">
-					<%= link_to t(:show), admin_user_path(user), :class => 'show' %>
-					<%= link_to t(:edit), edit_admin_user_path(user), :class => 'edit' %>
-					<%= link_to t(:delete), admin_user_path(user), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="5"></td>
-			</tr>
-			<% end %>
-		</tbody>
-	</table>
-	<div class="button_bar">
-		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
-	</div>	
-</div>

app/views/admin/users/new.html.erb

@@ -1,19 +0,0 @@
-<% content_for :secondary do %>
-	<%= render 'side_bar' %>
-<% end %>
-
-<div id="profile" class="clear">
-	<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %>
-    <%= f.error_messages %>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <div class="button_bar">
-    	<%= link_back %>
-		<%= link_to t('create'), "#", :onclick=>"$('#new_user').submit()" %>
-    </div>
-  <% end -%>
-</div>
-
-
-
-  
-

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

@@ -1,33 +0,0 @@
-<% content_for :secondary do %>
-	<%= render 'side_bar' %>
-<% end %>
-
-<div id="profile" class="clear">
-	
-	<div id="person">
-		<% if @user.avatar? %>
-			<%= image_tag(@user.avatar.thumb.url) %>
-		<% else %>
-			<%= image_tag "person.png" %>
-		<% end %>
-		<label><span><%= @user.email %></span></label>
-	</div>
-	<% @infos.each do |a| %>
-		<div id="basic_block" class="roles_block <%= @class %>">
-			<h2><%= a.title %></h2>
-			<hr>
-			<%= render :partial => 'show_attribute', :object => a %>
-		</div>
-	<% end -%>
-
-	<div id="basic_block" class="roles_block <%= @class %>">
-		<h2><%= @user.role.title %></h2>
-		<hr class="<%= @user.role.key %>_block">
-		<%= render :partial => 'show_sub_role', :collection => @user.sub_roles %>
-	</div>
-    <div class="button_bar">
-		<%= link_to t(:edit), edit_admin_user_path(@user) %>
-    	<%= link_back %>
-    </div>
-</div>
-

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

@@ -1,8 +1,8 @@
   <div class="quick-edit">
                             <ul class="nav nav-pills hide">
-                                <li><a href="#"><%= t("admin.new_admin.action.edit")%> </a></li>
+                                <li><a href="#"><%= t(:edit)%> </a></li>
                                 <li class="dropdown">
-                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t("admin.new_admin.action.quick_edit")%><b class="caret"></b></a>
+                                    <a href="#" data-toggle="dropdown" class="dropdown-toggle"><%= t(:quick_edit)%><b class="caret"></b></a>
                                     <ul class="dropdown-menu" id="menu1">
                                         <li><a href="#"># TODO:Basic</a></li>
                                         <li><a href="#"># TODO:Picture</a></li>
@@ -11,6 +11,6 @@
                                         <li><a href="#"># TODO:File</a></li>
                                     </ul>
                                 </li>
-                                <li><a href="#"><%= t("admin.new_admin.action.delete")%></a></li>
+                                <li><a href="#"><%= t(:delete_)%></a></li>
                             </ul>
                         </div>

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

@@ -1,25 +1,25 @@
         <div class="subnav">
             <div class="btn-group pull-right view-mode">
                 <form action="" method="get">
-                <button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("admin.new_admin.show_mode.index")%></button>
+                <button class="btn <%= "active" if params[:at].blank? %>"><i class="icon-align-justify"></i> <%= t("show_mode.index")%></button>
-                <button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("admin.new_admin.show_mode.summary")%></button>
+                <button name="at" value="summary" class="btn <%= "active" if params[:at] == "summary" %>"><i class="icon-th-list"></i> <%= t("show_mode.summary")%></button>
-                <button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("admin.new_admin.show_mode.thumbnail")%></button>
+                <button name="at" value="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("show_mode.thumbnail")%></button>
             </form>
             </div>
             <ul class="nav nav-pills filter">
                 <li class="accordion-group">
                     <div class="accordion-heading">
-                        <a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.status")%> <b class="web-symbol"></b></a>
+                        <a href="#collapse-status" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:status)%> <b class="web-symbol"></b></a>
                     </div>
                 </li>
                 <li class="accordion-group">
                     <div class="accordion-heading">
-                        <a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.category")%> <b class="web-symbol"></b></a>
+                        <a href="#collapse-category" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:category)%> <b class="web-symbol"></b></a>
                     </div>
                 </li>
                 <li class="accordion-group">
                     <div class="accordion-heading">
-                        <a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("admin.new_admin.table_header.tags")%> <b class="web-symbol"></b></a>
+                        <a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t(:tags)%> <b class="web-symbol"></b></a>
                     </div>
                 </li>
             </ul>
@@ -32,7 +32,7 @@
                         <a href="#" class="btn">Distinguished</a>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-category">
@@ -42,7 +42,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-tags">
@@ -52,7 +52,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t("admin.new_admin.table_header.clear_filter")%></a>
+                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <% if params[:at].blank?  #header for index%>
@@ -66,11 +66,11 @@
                                             <a href class="list-remove"><i class="icon-minus-sign"></i></a>
                                         <%end%>
                                     </th>
-                                <th id="sort-roles" class="sort span3"><%= t("admin.new_admin.attributes.roles")%><b class="web-symbol"></b></th>
+                                <th id="sort-roles" class="sort span3"><%= t(:roles)%><b class="web-symbol"></b></th>
-                                <th id="sort-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.name")%><b class="web-symbol"></b></th>
+                                <th id="sort-name" class="sort span1-2 select active"><%= t(:name)%><b class="web-symbol"></b></th>
-                                <th id="sort-email" class="sort span2"><%= t("admin.new_admin.attributes.publications")%><b class="web-symbol"></b></th>
+                                <th id="sort-email" class="sort span2"><%= t(:publications)%><b class="web-symbol"></b></th>
-                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.courses")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t(:courses)%><b class="web-symbol"></b></th>
-                                <th id="sort-admin" class="sort span2"><%= t("admin.new_admin.attributes.followers")%><b class="web-symbol"></b></th>
+                                <th id="sort-admin" class="sort span2"><%= t(:followers)%><b class="web-symbol"></b></th>
                             </tr>
                         </thead>
                     </table>

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

@@ -1,7 +1,7 @@
        <div class="form-actions form-fixed pagination-right">
           <% if is_admin? %>
             <%= link_to(new_admin_users_new_interface_path,:class=> "btn btn-primary pull-right") do%>
-                <i class="icon-plus icon-white"></i><%= t("admin.new_admin.action.add")%>
+                <i class="icon-plus icon-white"></i><%= t(:add)%>
             <% end -%>
           <%end -%>
             <div class="paginationFixed" id="user_pagination">

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

@@ -8,7 +8,7 @@
       <% sub_role_disable = @user.sub_roles.include?(sub_role) ?   false : true    %>
       <%#= hidden_field_tag("[user][new_attribute_values][sub_role][disable][#{sub_role.id}]",sub_role_disable)%>
       <legend>
-        <button  for=<%=@form_index%> class="onoff pull-right  <%= sub_role_disable ? 'disabled' : '' %> ">ON</button><%= sub_role.title %>
+        <button  for=<%=@form_index%> class="onoff pull-right  <%= sub_role_disable ? 'disabled' : '' %> "><%= t(:on_upcase) %></button><%= sub_role.title %>
         <%= hidden_field_tag("user[disable_sub_role][id][#{sub_role.id}]",sub_role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>sub_role_disable)%>
       </legend>
     <div class="controls-block <%= sub_role_disable ? 'hide' : '' %>" >

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

@@ -1,16 +1,16 @@
 <%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t('admin.new_admin.user')), admin_users_new_interface_index_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
+      <%= content_tag :li, link_to((t(:all_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
+      <%= content_tag :li, link_to((t(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_infos_path ), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t(:roles) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_infos_path ), :class => active_for_action('users_new_interfacexx', 'index') %>
-      <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_roles_path), :class => active_for_action('users_new_interfacexx', 'index') %>
+      <%= content_tag :li, link_to((t(:info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_roles_path), :class => active_for_action('users_new_interfacexx', 'index') %>
     <% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t('admin.plugins')), admin_plugins_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t(:plugins)), admin_plugins_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
-      <%= content_tag :li, link_to((t('admin.all_plugins') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
+      <%= content_tag :li, link_to((t(:all_plugins) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
     <% end -%>
 <% end -%>

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/_temp_form.html.erb

@@ -7,12 +7,12 @@
   <%= file_field_tag 'file' %>
   <%= hidden_field_tag :avatar_cache %>
   <label>
-  <span><%= t('admin.email') %>：</span>
+  <span><%= t(:email) %>：</span>
-  <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+  <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
   </label>
   <label>
     <%= f.check_box :admin %>
-  <span><%= t('admin.admin') %>：</span>
+  <span><%= t(:admin) %>：</span>
   </label>
   <label>
   
@@ -21,7 +21,7 @@
     <tr>
     <%=render :partial=>"temp_profile",:collection=>Info.all%>
     <tr>
-    <tr> <span><%= t('admin.role') %>：</span> </tr>
+    <tr> <span><%= t(:role) %>：</span> </tr>
     <tr>
   <%= render :partial=>"temp_sub_role_from",:collection=>@user.sub_roles %>
 </tr>

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

@@ -1,11 +1,11 @@
   <%#= devise_error_messages! %>
 
   <div class="map-block back">
-                <h4><span><%=t('admin.user_new_interface.sys_basic_form')%></span></h4>
+                <h4><span><%=t(:sys_basic_form)%></span></h4>
 
                 <div class="form-horizontal">
                     <div class="control-group">
-                        <%= f.label t('admin.user_new_interface.email'),:class=>"control-label" %><br />
+                        <%= f.label t(:email),:class=>"control-label" %><br />
                         <div class="controls">
                             <%= f.email_field :email %>
                         </div>
@@ -14,7 +14,7 @@
 
                 <div class="form-horizontal">
                     <div class="control-group">
-                        <%= f.label t('admin.user_new_interface.password'),:class=>"control-label" %>
+                        <%= f.label t(:password),:class=>"control-label" %>
                         <div class="controls">
                             <%= f.password_field :password %>
                         </div>
@@ -23,7 +23,7 @@
 
                   <div class="form-horizontal">
                     <div class="control-group">
-                      <%= f.label t('admin.user_new_interface.password_confirmation'),:class=>"control-label" %>
+                      <%= f.label t(:password_confirmation),:class=>"control-label" %>
                           <div class="controls">
                               <%= f.password_field :password_confirmation %>
                         </div>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <div class="member-plugin">

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

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>
@@ -11,7 +11,7 @@
                 <div class="module-nav-view">
                     <ul class="nav nav-pills">
                         <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %>
-                            <%= link_to t("admin.new_admin.users.all_plugin_summary")%>
+                            <%= link_to t(:all_plugin_summary)%>
                         <% end -%>
                         <% @plugins.each do |plugin| %>
                             <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %>
@@ -38,7 +38,7 @@
                 <p class="user-mail">
                     <%= @user.email %>
                 </p>
-                <%= link_to("<i class='icon-pencil'></i>#{t('admin.edit')}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
+                <%= link_to("<i class='icon-pencil'></i>#{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
             </div>
             <div class="user-roles my_scroll">
                 <div class="scrollbar">
@@ -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/admin/users_new_interface/temp_edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/desktop/co_author_relations/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Listing co_author_relations</h1>
 
-<%= submit_tag "Back", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
+<%= submit_tag "Back", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
 <%= render 'form' %>
 
 <table id="co_author_relation_table">

app/views/desktop/co_authors/_form.html.erb

@@ -1,6 +1,6 @@
 <div class="fn_g hp">
   <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
-  <%= submit_tag "Cancel", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
+  <%= submit_tag "Cancel", :type => "button", class: "bt-cancel fn_btn hh2 thmc2 thmtxt" %>
 </div>
 
 <div></div>

app/views/desktop/settings.html.erb

@@ -9,8 +9,8 @@
       <div id="panel_l" class="ph">
         <div class="s_menu sm_v" content-type="menu">
           <ul id='setting_left_nav'>
-            <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
+            <li><a href="" class="admtxt hh2 w2 hp" load="true" onclick='return false;'>Overview</a></li>
-            <li><a href="<%= edit_user_registration_path %>" callback-method="account" custom-load="account" class="admtxt hh2 w2 hp" load="true" onclick='return false;'>Account</a></li>
+            <li><a href="<%= edit_user_registration_path %>" callback-method="account" custom-load="account" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
             <li><a href="<%= desktop_sections_path %>" callback-method="sections" custom-load="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
             <li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
             <li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>

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/_guest_orbit_menu.erb

@@ -1,5 +1,5 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
           </ul>

app/views/layouts/_member_orbit_menu.erb

@@ -1,7 +1,7 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
 
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>

app/views/layouts/_orbit_bar.html.erb

@@ -20,6 +20,7 @@
 	            <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
 	          <% end %>
           </ul>
+        </li>
         <li class="search clear" title="<%= t :search_google %>">
           <a class="orbit-bar-search" href="#" data-icon="search"></a>
 					<form class="navbar-search" method="get" action="http://www.google.com/custom">
@@ -54,7 +55,7 @@
 					</li>
 				<% else %>
 					<li class="dropdown bar-login">
-						<a class="dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
+						<a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
 						<div class="dropdown-menu">
 							<ul class="log">
 								<li class="title hide"></li>

app/views/layouts/_side_bar.html.erb

@@ -1,6 +1,6 @@
 <div id="main-sidebar" class="my_scroll">
   <div id="position">
-    <%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t('admin.dashboard')), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
+    <%= link_to content_tag(:i, nil, :class => (local_assigns.has_key? :icon) ? icon : 'icons-gauge') + content_tag(:span, (local_assigns.has_key? :link_name) ? link_name : t(:dashboard_)), (local_assigns.has_key? :link_url) ? link_url : admin_dashboards_path %>
     <div id="collapse-menu"><i class="icon-chevron-right"></i><i class="icon-chevron-right"></i></div>
   </div>
 	<div class="scrollbar">

app/views/layouts/_side_bar_content.html.erb

@@ -1,108 +1,82 @@
-
-<%#= content_tag :li, :class => active_for_controllers('purchases') do -%>
-  <%#= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
-<%# end -%>
 <% content_for :page_specific_javascript do %>
   <%= javascript_include_tag "/static/kernel.js"  %>
 <% 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('admin.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) %>
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") )if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.bulletin.approval_setting') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  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: "announcement"}))), :class => active_for_app_auth('Announcement') 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: "announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
 
   <% end -%>
 
 <% end -%>
 
-<%#= content_tag :li, :class => active_for_controllers('users') do -%>
-  <%#= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %>
-<%# end -%>
-
 <%= content_tag :li, :class => active_for_controllers('page_contexts') || active_for_app_auth('page_content') || active_for_ob_auths_object("PageContext")  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-page') + content_tag(:span, t('admin.page')), panel_page_content_back_end_page_contexts_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-page') + content_tag(:span, t(:page)), panel_page_content_back_end_page_contexts_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
-      <%#= content_tag :li, link_to(t('admin.all_articles'), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %>
+      <%= 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: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? 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: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? rescue nil) %>
     <% end -%>
 
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banner') do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-landscape') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-landscape') + content_tag(:span, t(:ad_banner)), admin_ad_banners_path %>
-
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
-    <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
+    <%= 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: "ad_banner"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%= 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: "ad_banner"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
   <% end -%>
 <% end %>
 
 
 <%= 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('admin.all_articles') + 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('announcement.add_new') + 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('announcement.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(: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('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
   <%= 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.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
+  <%= 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.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
+  <%= 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) %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%= 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('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('admin.module.authorization'),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('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 -%>
-    <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
-    <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%#= 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') %>
-  <%#= content_tag :li, link_to(t('gallery.tags'), panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %>
-  <%#= content_tag :li, link_to(t('admin.module.authorization'),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 %>
 
 <div class="content">
   <% flash.each do |key, msg| %>
     <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
-    <% end%>
+    <% end %>
 </div>

app/views/seminar_p.html.erb

@@ -1,33 +0,0 @@
-<div id="seminar_p">
-	<div id="content">
-		<div id="header" class="hh3">
-			<div class="dtitle w2 hh3 hp">
-				<span class="thmtxth">Seminar</span>
-			</div>
-			<div id="search_app" class="hfn w2 hh2 hp thmc3">
-			<input type="text" class="ini_input form" value="Search" id="searchbox" />
-			<input type="submit" class="ini_input submit thmc1" value="Submit"/>
-		</div>
-		</div>
-		<div id="holder">
-			<div id="panel_l" class="ph">
-				<div class="s_menu sm_v">
-					<ul id='setting_left_nav'>
-						<li><a href="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
-						<li><a href="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Books</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Import</a></li>
-						<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Export</a></li>
-					</ul>
-				</div>
-			</div>
-			<div id="panel_r" class="ph pw admbg hp">
-			</div>
-			<div class="clear"></div>
-		</div>
-	</div>
-	</div>
-</div>

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

@@ -56,7 +56,7 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal" aria-hidden="true"><%=t("modal.close")%></button>
+        <button class="btn" data-dismiss="modal" aria-hidden="true"><%=t(:close)%></button>
         <button href="" class="btn btn-primary bt-save" data-dismiss="modal" aria-hidden="true"><%=t("modal.save_and_close")%></button>
     </div>
 </div>

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

@@ -3,19 +3,19 @@
           <button class="onoff pull-right <%= attribute_field.disabled ?  'disabled' : ''%>">ON</button>
           <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","disabled",:value=>attribute_field.disabled,:class=>"attribute_field_disabled"%>
           <%= hidden_field "info[attribute_fields][#{attribute_field_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%>
-          <a class="btn btn-small pull-right btn-danger remove_attribute" href="#"><i class="icon-trash icon-large"></i> <%= t("delete")%></a>
+          <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%>
                       </div>
                   </div>
               </div>
-              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t("admin.infos.name"),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"info[attribute_fields][#{attribute_field_counter}][title_translations]"}%>
               <div class="control-group pull-left">
-                  <label class="control-label" for=""><%= t("admin.infos.type")%></label>
+                  <label class="control-label" for=""><%= t(:type)%></label>
                   <div class="controls">
                       <%#= select_tag "info[attribute_fields][#{attribute_field_counter}][markup]" do %>
                        <select class="dataType" name=<%= "info[attribute_fields][#{attribute_field_counter}][markup]"%>>
@@ -30,15 +30,15 @@
       <div class="<%= attribute_field.disabled ?  'hide' : ''%>">
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeA") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t("admin.infos.options")%></label>
+                  <label class="control-label"><%= t(:options)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                             <%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeA][cross_lang]","true",attribute_field["typeA"]["cross_lang"]) %>
-                            <%=  t("admin.infos.cross_lang")%>
+                            <%=  t(:cross_lang)%>
                       </label>
                       <label class="checkbox inline">
                           <%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeA][add_more]","true",attribute_field["typeA"]["add_more"]) %>
-                          <%= t("admin.infos.add_more")%>
+                          <%= t(:add_more)%>
                       </label>
                   </div>
               </div>
@@ -46,7 +46,7 @@
           <% end %>
 
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeB") do %>
-              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t("admin.infos.initial"),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>
+              <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:label_ext=>t(:initial),:values=>attribute_field["typeB"]["initial"],:field_name=>"info[attribute_fields][#{attribute_field_counter}][typeB][initial]"}%>
 
               <% if attribute_field.self_defined_markup_options?%>
                 <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:values=>attribute_field["option_list"],:field_name=> "info[attribute_fields][#{attribute_field_counter}][attribute][role][statuses]"} %>
@@ -57,41 +57,41 @@
           <% end %>
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeC") do %>
               <div class="control-group">
-                  <label class="control-label"><%= t("admin.infos.date.format")%></label>
+                  <label class="control-label"><%= t("date.format")%></label>
                   <div class="controls">
                         <%= select "info[attribute_fields][#{attribute_field_counter}][typeC]","format",Admin::AttributeValuesViewHelper::OPT,:class=>"dataType",:selected=>attribute_field["typeC"]["format"] %>
                   </div>
               </div>
               <div class="control-group">
-                  <label class="control-label"><%= t("admin.infos.date.range")%></label>
+                  <label class="control-label"><%= t("date.range")%></label>
                   <div class="controls">
                       <label class="radio inline">
-                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (!attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.not_range")%>
+                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "false",:checked => (!attribute_field.date_is_range? ? true : false)) %><%= t(:yes_)%>
                       </label>
                       <label class="radio inline">
-                        <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field.date_is_range? ? true : false)) %><%= t("admin.infos.is_range")%>
+                        <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "is_range", "true",:checked => (attribute_field.date_is_range? ? true : false)) %><%= t(:no_)%>
                       </label>
                   </div>
               </div>
               <div class="control-group">
-                  <label class="control-label"><%= t("admin.infos.date.claendar")%></label>
+                  <label class="control-label"><%= t("date.calendar")%></label>
                   <div class="controls">
                       <label class="radio inline">
-                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "claendar", "west_claendar",:checked =>(attribute_field["typeC"]["claendar"]== "west_claendar" ? true : false)) %><%= t("admin.infos.date.west_claendar")%>
+                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "calendar", "west_calendar",:checked =>(attribute_field["typeC"]["calendar"]== "west_calendar" ? true : false)) %><%= t("date.west_calendar")%>
                       </label>
                       <label class="radio inline">
-                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "claendar", "tw_claendar",:checked =>(attribute_field["typeC"]["claendar"]== "tw_claendar" ? true : false)) %><%= t("admin.infos.date.tw_claendar")%>
+                          <%= radio_button("info[attribute_fields][#{attribute_field_counter}][typeC]", "calendar", "tw_calendar",:checked =>(attribute_field["typeC"]["calendar"]== "tw_calendar" ? true : false)) %><%= t("date.tw_calendar")%>
                       </label>
                   </div>
               </div>
           <% end %>
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeD") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t("admin.infos.options")%></label>
+                  <label class="control-label"><%= t(:options)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                         <%= check_box_tag("info[attribute_fields][#{attribute_field_counter}][typeD][cross_lang]","true",attribute_field["typeD"]["cross_lang"]) %>
-                        <%= t("admin.infos.cross_lang")%>
+                        <%= t(:cross_lang)%>
                       </label>
                   </div>
               </div>

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

@@ -2,7 +2,7 @@
               <div class="control-group">
                 <%= hidden_field_tag "#{temp_field_name}[count]",((values.keys.collect{|t| t.to_i}.max rescue nil)  || 0 ),:class=>"list_count"%>
                 <%= hidden_field_tag "#{temp_field_name}[name]",field_name,:class=>"field_name"%>
-                  <label class="control-label" ><%= t("admin.infos.list")%></label>
+                  <label class="control-label" ><%= t(:list)%></label>
                   <div class="multipleInput">
                     <%if values.blank? %>
                         <div class="controls">
@@ -39,7 +39,7 @@
                   </div>
                   <div class="controls">
                       <span class="help-block">
-                          <a href="#"><i class="icon-plus-sign"></i><%= t("admin.infos.add") %></a>
+                          <a href="#"><i class="icon-plus-sign"></i><%= t(:add) %></a>
                       </span>
                   </div>
               </div>

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

@@ -1,6 +1,6 @@
               <% values ||=[]%>
               <%= content_tag :div,:class=>"control-group language-swich #{class_ext rescue "" }" do%>
-                  <label class="control-label" for=""><%= (defined? label_ext) ?  label_ext : t("admin.infos.placeholder") %></label>
+                  <label class="control-label" for=""><%= (defined? label_ext) ?  label_ext : t(:placeholder) %></label>
                   <div class="controls">
                       <div class="tabbable">
                           <div class="tab-content">

app/views/shared/preview/_modal_preview.html.erb

@@ -1,7 +1,7 @@
 <div class="modal hide fade in banner-preview" id="<%= @preview_obj.id %>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("modal.preview") %></h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="">
@@ -16,7 +16,7 @@
   </div>
   <div class="modal-footer">
     
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
     <script type="text/javascript" src="/static/kernel.js"></script>

config/initializers/devise.rb

@@ -80,6 +80,7 @@ Devise.setup do |config|
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again.
   # config.timeout_in = 10.minutes
+  config.timeout_in = 10.minutes
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.

config/locales/devise.zh_tw.yml

@@ -1,43 +1,42 @@
 zh_tw:
-  errors:
-    messages:
-      not_found: "沒有找到"
-      already_confirmed: "已被確認過了"
-      not_locked: "被鎖定了"
-
   devise:
-    failure:
-      unauthenticated: '您需要先註冊、登入後才能繼續。'
-      unconfirmed: '您的帳號需需要經過確認後，才能繼續。'
-      ldap_invalid: '您的LDAP帳號錯誤'
-      ldap_connection_failed: '與LDAP之間連線異常'
-      ldap_pass_but_account_not_in_orbit: '很抱歉，您的LDAP帳號並不支援在此網站登入'
-      locked: '您的帳號已被鎖定。'
-      invalid: 'Email 或密碼是無效的。'
-      invalid_token: '無效的認證代碼。'
-      timeout: '您的登入時效過期，請重新登入，才能繼續。'
-      inactive: '您的帳號尚未被啟用。'
-    sessions:
-      signed_in: '成功登入了。'
-      signed_out: '成功登出了。'
-    passwords:
-      send_instructions: '您將在幾分鐘後收到一封電子郵件，內有重新設定密碼的步驟說明。'
-      updated: '您的密碼已被修改，而您現在已重新登入。'
     confirmations:
-      send_instructions: '您將在幾分鐘後收到一封電子郵件，內有確認帳號的步驟說明。'
+      confirmed: 您的帳號已經過確認，現在您已成功登入。
-      confirmed: '您的帳號已經過確認，現在您已成功登入。'
+      send_instructions: 您將在幾分鐘後收到一封電子郵件，內有確認帳號的步驟說明。
-    registrations:
+    failure:
-      signed_up: '您已經成功的登錄，確認信件已送至您的 Email 信箱。'
+      already_authenticated: 你已經登入。
-      updated: '您已經成功的更新帳號資訊。'
+      inactive: 您的帳號尚未被啟用。
-      destroyed: '再會！您的帳號已被取消。有緣再會。'
+      invalid: Email 或密碼是無效的。
-      email_not_unique: '已被註冊'
+      invalid_token: 無效的認證代碼。
-    unlocks:
+      locked: 您的帳號已被鎖定。
-      send_instructions: '您將在幾分鐘後收到一封電子郵件，內有將帳號解除鎖定的步驟說明。'
+      timeout: 您的登入時效過期，請重新登入，才能繼續。
-      unlocked: '您的帳號已被解鎖，現在您已成功登入。'
+      unauthenticated: 您需要先註冊，登入後才能繼續。
+      unconfirmed: 您的帳號需需要經過確認後，才能繼續。
     mailer:
       confirmation_instructions:
-        subject: '確認步驟'
+        subject: 確認步驟
       reset_password_instructions:
-        subject: '重設密碼步驟'
+        subject: 重設密碼步驟
       unlock_instructions:
-        subject: '解鎖步驟'
+        subject: 解鎖步驟
+    passwords:
+      send_instructions: 您將在幾分鐘後收到一封電子郵件，內有重新設定密碼的步驟說明。
+      updated: 您的密碼已被修改，而您現在已重新登入。
+    registrations:
+      destroyed: 再會！您的帳號已被取消。有緣再會。
+      signed_up: 您已經成功註冊，確認信件已送至您的 Email 信箱。
+      updated: 您已經成功的更新帳號資訊。
+    sessions:
+      signed_in: 成功登入了。
+      signed_out: 成功登出了。
+    unlocks:
+      send_instructions: 您將在幾分鐘後收到一封電子郵件，內有將帳號解除鎖定的步驟說明。
+      unlocked: 您的帳號已被解鎖，現在您已成功登入。
+  errors:
+    messages:
+      already_confirmed: 已被確認過了
+      not_found: 沒有找到
+      not_locked: 被鎖定了
+      not_saved:
+        one: 有一個錯誤導致%{resource}不能被儲存：
+        other: 有 %{count} 個錯誤導致%{resource}不能被儲存：

config/locales/en.yml

@@ -6,35 +6,58 @@ en:
     denied:
       app:
         not_sub_manager: Access Denied for you are not SubManager for this app
-        not_manager: Access Denied for you are not SubManager for this app
+        not_manager: Access Denied for you are not Manager for this app
         not_authed_user: Access Denied for you are not User for this app
       object: Access Denied for you don't have permission for this object
       not_admin: Access Denied for you are not Admin
   account_settings: Account settings
   action: Action
   ad:
+    chinese_1: 在套圖中出現次數 1次請輸入1
+    chinese_2: 輸入連結
+    chinese_3: 輸入標題
     ab_fx: FX
+    add_link: Add a reference link
     banner_best_size: Banner Best Size
     best_size: Best size
+    best_size_example: "Ex: 500px x 300px"
     new_image: New image
     not_showing: Not showing
     picture_list: Picture List
     sec_place_holder: Enter 3 if 3 sec
+    select_fx: Select the effect type
+    set_dates: Set the image to start and end dates
+    set_range: Set the range time
     showing: Showing
     success_destroy_ad_image: Image successfully destroyed
     trans_unit_sec: sec
     transition_sec: Transition time
     update_banner: Update Banner
+    upload_pictures: Upload pictures
     widget_info_for_ad_image_size: "Best size with: %{best_size}"
   ad_banner: AD Banner
   add: Add
+  add_attribute_field: Add attribute field
+  add_image: Add image
   add_item: Add item
+  add_member: Add member
+  add_more: Add more
+  address_modal:
+    default_title: Address
+    street_address: Street address
+    city: City
+    county: County
+    zip: ZIP
+    country: Country
   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
+  all_plugin_summary: All plugin summary
+  all_plugins: All plugins
   always_display_title: Always displayed in the title bar
   app_auth:
     list_setting_result: Authorization List
@@ -52,6 +75,7 @@ en:
       fail: Removal of sub-manager failed
       success: Sub-manager successfully removed
     failed_no_user: Failed, no user
+    operation_not_permitted: Operation not permitted
   approval:
     not_pass: Not pass
     not_pass_reason: Not pass reason
@@ -60,7 +84,9 @@ en:
     stat: Approval status
     user_list: Unit
   approval_: Approval
+  archive: Archive
   asset: Asset
+  attributes: Attributes
   auth:
     add_manager: Add Manager
     add_sub_manager: Add SubManager
@@ -74,6 +100,8 @@ en:
   back: Back
   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 (*)
@@ -82,7 +110,9 @@ en:
   category: Category
   category_auth: Category Authorization
   clear: Clear
+  close: Close
   content: Content
+  courses: Courses
   create:
     error:
       link: Error when creating link.
@@ -90,11 +120,27 @@ en:
     fail: Creation failed
     success:
       asset_category: Asset category was successfully created.
+      co_author: Co-author was successfully created.
       link: Link was successfully created.
       page: Page was successfully created.
+      paper: Paper was successfully created.
       user: User was successfully created.
   create_: Create
+  cross_lang: 跨語言輸入
   data: Data
+  date:
+    calendar: 紀年法
+    range: 本欄為時間區段
+    format: 格式
+    tw_calendar: 民國
+    minguo_calendar: 
+      after: 民國
+      before: 民前
+      first_year: 民國元年
+      year: 年
+      month: 月
+    west_calendar: 西元
+  date_: Date
   dashboard:
     bulletin: Announcement
     news_bulletin: News
@@ -103,11 +149,15 @@ en:
   dashboard_: Dashboard
   deadline: Deadline
   default_css: Default CSS
-  delete: Delete
+  delete:
-  delete_file: Delete file
+    file: Delete file
+    success:
+      paper: Paper was successfully deleted.
+  delete_: Delete
   description: Description
   desktop: Desktop
   disable: Disable
+  disabled: Disabled
   dots: ●●●●●●
   download: Download
   downloaded: Downloaded
@@ -130,8 +180,11 @@ en:
     upload: File upload
   file_: File
   file_type: File Type
+  followers: Followers
   forgot_password: Forgot your password?
   frequency: Frequency
+  frontend_data_count: Frontend data count
+  gallery: Gallery
   help: Help
   hidden: Hidden
   hide: Hide
@@ -140,10 +193,14 @@ en:
   horizontal: Horizontal
   hot: Hot
   image: Image
+  images: Images
   info: Information
+  initial: 起始值
   intro: Introduction
   is_published: Is published
   item: Item
+  item_name: Item name
+  javascripts: Javascripts
   key: Key
   last_modified: Last modified
   layout: Layout
@@ -166,6 +223,8 @@ en:
       text_area: Text Area
       radio_button: Radio button
       checkbox: Checkbox
+  locale: Locale
+  location: Location
   login: Login
   logout: Logout
   mail:
@@ -180,20 +239,21 @@ en:
     user_name: User Name
     manager: Manager
   manager: Manager
+  markup: Markup
+  markup_options: Markup options
+  markup_value: Markup value
   me: Me
   member: Member
   menu_enabled_for: Menu enabled for
-  modal:
-    close: Close
-    preview: Preview
   module: Module
   module_authorization: Module Authorization
   more_plus: more+
   most_visited_page: Most Visited Page
   multilingual: Multilingual
   name: Name
-  nccu_c:
+  need_home: You need a home page
-    nccu_ldap_uid: NCCU LDAP Account
+  neutral_title: Neutral title
+  neutral_for: Neutral for
   new:
     asset: New asset
     banner: New banner
@@ -203,6 +263,7 @@ en:
     user: New user
     info: New user information
     role: New user role
+  new_: New
   news: News
   no_: "No"
   no_deadline: No deadline
@@ -222,40 +283,17 @@ en:
     text: Text Area
   passed: Approved
   password: Password
-# : <<<<<<< HEAD
+  password_confirmation: Password Confirmation
   pending: Pending
   picture: Picture
+  placeholder: Placeholder
+  plugins: Plugins
   postdate: Postdate
   posted_by: Posted by
   preview: Preview
+  profile: Profile
+  publications: Publications
   purchase: Purchase
-# : =======
-  register: Register
-  remember_me: Remember me
-  search_google: Search Google
-  show: Show
-  submit: Submit
-  sure?: Are you sure?
-  update: Update
-  update_failed: Update failed
-  view: View
-  view_count: View count
-  yes_: "Yes"
-  addthis_tools:
-    add_to_bookmark: Add this to bookmark
-  all_content: All Content
-  all_file: All File
-  all_member: All Member
-  content: Content
-  data: Data
-  file: File
-  file_type: File Type
-  hits: Hits
-  item: Item
-  member: Member
-  module: Module
-  most_visited_page: Most Visited Page
-# : >>>>>>> various_bugs
   quantity: Quantity
   quick_edit: Quick edit
   recent_update: Recent Update
@@ -276,9 +314,14 @@ en:
     sitesearch: Google Site Search
     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"
-  search_nccu: Search NCCU
+  search_: Search
+  search_google: Search Google
   setup_member: Member setup
   show: Show
+  show_mode:
+    index: Index
+    summary: Summary
+    thumbnail: Thumbnail
   site:
     description: Site description
     description_help: ''
@@ -298,6 +341,7 @@ en:
   site_info: Site Info
   sitemap: Sitemap
   site_name: Site Name
+  size: Size
   start: Start
   start_date: Start date
   statistics: Statistics
@@ -315,6 +359,7 @@ en:
     module_page_lang_not_support: "We are sorry, this page is not available for English"
     not_previewable: "Preview not support"
     preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
+  sys_basic_form: User system info
   system_info: System information
   tag_cloud: Tag cloud
   tags: Tags
@@ -329,15 +374,18 @@ en:
   traffic: Traffic
   type: Type
   unit_name: Unit name
+  unzip_success: "App unzip procress is finished, please restart the server to apply effect"
   up_to_date: Up-to-date
   update:
     error:
       link: Error when updating link.
     fail: Update failed
     success:
+      co_author: Co-author was successfully updated.
       content: Content was successfully updated.
       link: Link was successfully updated.
       page: Page was successfully updated.
+      paper: Paper was successfully updated.
       user: User was successfully updated.
     success_: Successfully updated
   update_: Update
@@ -354,243 +402,3 @@ en:
   visitors_this_year: This year's visitors
   visitors_today: Today's visitors
   yes_: "Yes"
-
-# : <<<<<<< HEAD
-  nccu:
-    date: Date
-    file: File
-    file_description: Description
-    file_name: Name
-    link_name: Name
-    picture: Picture
-    selected_file: File
-# : =======
-  errors:
-    at_least_one: must at least have one value
-
-  # admin:
-  #   access:
-  #     denied:
-  #       app:
-  #         not_sub_manager: Access Denied for you are not SubManager for this app
-  #         not_manager: Access Denied for you are not SubManager for this app
-  #         not_authed_user: Access Denied for you are not User for this app
-  #       not_admin: Access Denied for you are not Admin
-  #       object: "Access Denied for you don't have permission for this object"
-  #   action: Action
-  #   ad_banner: AD Banner
-  #   orbit_gallery: Gallery
-  #   calendar: Calendar
-  #   ad:
-  #     sec_place_holder: Enter 3 if 3 sec
-  #     ab_fx: FX
-  #     all_banners: AdBanner list
-  #     banner_best_size: Banner Best Size
-  #     best_size: Best size
-  #     new_banner: New banner
-  #     new_image: New image
-  #     showing: Showing
-  #     not_showing: NotShowing
-  #     picture_list: Picture List
-  #     title: Title
-  #     transition_sec: Transition time
-  #     trans_unit_sec: sec
-  #     update_banner: Update Banner
-  #     widget_info_for_ad_image_size: "Best size with: %{best_size}"
-  #   add: Add
-  #   add_item: Add item
-  #   add_language: Add language
-  #   add_drop_down_item: +Add Menu Item
-  #   admin: Admin
-  #   action: Action
-  #   all_articles: List
-  #   always_display_title: Always displayed in the title bar
-  #   announcement: Announcement
-  #   asset: Asset
-  #   assets:
-  #       file: File
-  #       album: Album
-  #       video: Video
-  #       book: Book
-  #   attributes: Attributes
-  #   author: Author
-  #   calendar: Calendar
-  #   gprs: GPS
-  #   cant_delete_self: You can not delete yourself.
-  #   cant_revoke_self_admin: You can not revoke your admin role yourself.
-  #   category: Category
-  #   choose_file: Choose a file...
-  #   class: Class
-  #   content: Content
-  #   create_error_link: Error when creating link.
-  #   create_error_page: Error when creating page.
-  #   create_success_home: Homepage was successfully created.
-  #   create_success_layout: Layout was successfully created.
-  #   create_success_link: Link was successfully created.
-  #   create_success_page: Page was successfully created.
-  #   create_success_snippet: Snippet was successfully created.
-  #   create_success_user: User was successfully created.
-  #   data: Data
-  #   dashboard: Dashboard
-  #   delete_language: Delete language
-  #   description: Description
-  #   design: Template
-  #   disable_language: Disable language
-  #   editing_home: Editing homepage
-  #   editing_layout: Editing layout
-  #   editing_link: Editing link
-  #   editing_page: Editing page
-  #   editing_snippet: Editing snippet
-  #   editing_info: Editing user information
-  #   editing_role: Editing user role
-  #   email: Email
-  #   enable_language: Enable language
-  #   enabled_for: Enabled for
-  #   file_name: Filename
-  #   file_size: File size
-  #   file_upload: File upload
-  #   format: Format
-  #   home: Home
-  #   id: ID
-  #   info: Information
-  #   intro: Introduction
-  #   is_published: Is published
-  #   item: Item
-  #   key: Key
-  #   keywords: Keywords
-  #   language: Language
-  #   layout: Layout
-  #   layout_name: Layout name
-  #   links: Links
-  #   link: Links
-  #   list_assets: Assets list
-  #   list_designs: Designs list
-  #   list_items: Items list
-  #   list_puchases: Purchases list
-  #   list_snippets: Snippets list
-  #   list_users: Users list
-  #   list_infos: User information list
-  #   list_roles: User roles list
-  #   mail_address: Address
-  #   mail_port: Port
-  #   mail_domain: Domain
-  #   mail_authentication: Authentication
-  #   mail_user_name: User Name
-  #   mail_password: Password
-  #   mail_tls: TLS
-  #   mail_enable_starttls_auto: Enable Start TLS Auto
-  #   member: Member
-  #   menu_enabled_for: Menu enabled for
-  #   module:
-  #     authorization: Module Authorization
-  #   move_down: Move down
-  #   move_up: Move up
-  #   multilingual: Multilingual
-  #   my_avatar: My Avatar
-  #   no_home_page: You don't have a homepage
-  #   no_layout: You don't have a layout
-  #   name: Name
-  #   nccu: NCCU Custom
-  #   nccu_c:
-  #     nccu_ldap_uid: NCCU LDAP Account
-  #   new_asset: New asset
-  #   new_component: New component
-  #   new_design: New design
-  #   new_home: New homepage
-  #   new_layout: New layout
-  #   new_link: New link
-  #   new_page: New page
-  #   new_snippet: New snippet
-  #   new_user: New user
-  #   new_info: New user information
-  #   new_role: New user role
-  #   news: News
-  #   non_multilingual: Non multilingual
-  #   object_auth:
-  #     list_title_of_users: %{auth_title} Auth List
-  #     update_done: Update done,reulst showing in list
-  #     update_failed: Update failed
-  #   options: Options
-  #   orig_upload_file: Original filename
-  #   page: Page
-  #   page_context:
-  #     edit: Edit
-  #     ob_auth:
-  #       edit: Category authorization
-  #   page_part_kinds:
-  #     text: Text Area
-  #     public_r_tag: System Widget
-  #     module_widget: Plug-in Module Widget
-  #   position: Position
-  #   published?: Published?
-  #   purchase: Purchase
-  #   registered: Registered
-  #   role: Role
-  #   roles: Roles
-  #   setup_member: Member setup
-  #   setup_translations: Translations setup
-  #   setup_designs: Designs setup
-  #   site: Site
-  #   site_description: Site description
-  #   site_footer: Site footer
-  #   site_settings: Site Setting
-  #   site_sub_menu: Site sub-menu
-  #   site_title: Site title
-  #   super_pages: Super pages
-  #   structure: Structure
-# : >>>>>>> various_bugs
-    tags: Tags
-    url: URL
-# : <<<<<<< HEAD
-# : =======
-    user: User
-    user_new_interface: 
-      sys_basic_form: User system info
-      password: Password
-      password_confirmation: Password Confirmation
-      email: User account
-    user_role:
-      auth:
-        all_member: All Member
-        manager: Manager
-        sub_mamanger: SubManager
-        by_role: By Role
-        by_sub_role: By SubRole
-        block_list: Block List
-        privilege_list: Privilege List
-        add_manager: Add Manager
-        add_sub_manager: Add SubManager
-        add_to_block_list: Add to block List
-        add_to_privilege_list: Add to privilege List
-        auth_by: -AuthBy %{user_display_name}
-    info: User information
-    panel: User panel
-    role: User role
-  
-  dashboard:
-    bulletin: Announcement
-    news_bulletin: News
-    page_context: Page
-    web_link: Link
-
-  panel:
-    
-  modal:
-    close: Close
-    preview: Preview
-  sys:
-    not_previewable: "Preview not support"
-    limit_of_upload_file_size: "Upload file must be less than: %{best_size}"
-    preview_only_for_img: "Preview only supprt with file type:jpg,png,gif,bmp"
-    can_not_display_due_to_no_context: "Can not display due to no context for English"
-    module_page_lang_not_support: "We are sorry, this page is not available for English"
-  search:
-    not_found: "NOT FOUND"
-    domains: Google Search Domains
-    site_search: Site Search
-    sitesearch: Google Site Search
-    site_setting_help: Please Enter the search argument for Google search.
-    result_get: "Searched about '  %{search_word}  ' Found %{item_num} items"
-    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"
-# : >>>>>>> various_bugs

config/locales/mongoid.zh_tw.yml

@@ -0,0 +1,70 @@
+zh_tw:
+  mongoid:
+    errors:
+      messages:
+        blank:
+          不能为空
+        callbacks:
+          "Calling %{method} on %{klass} resulted in a false return from a callback."
+        taken:
+          已占用
+        document_not_found:
+          没有发现类是%{klass}id(s)是%{identifiers}的文档
+        eager_load:
+          "Eager loading :%{name} is not supported due to it being a many-to-many
+          or polymorphic belongs_to relation."
+        invalid_database:
+          数据库应该是Mongo::DB,而不是%{name}.
+        invalid_time:
+          "'%{value}' is not a valid Time."
+        invalid_type:
+          在类%{klass}中定义了字段,实际值是%{value}的%{other}.
+        invalid_options:
+          "Invalid option :%{invalid} provided to relation :%{name}. Valid options
+          are: %{valid}."
+        unsupported_version:
+          MongoDB %{version} 版本已过期，请升级到 %{mongo_version}.
+        validations:
+          校验失败 - %{errors}.
+        invalid_collection:
+          不允许直接访问嵌入式的集合%{klass} , 请从文档的根访问集合.
+        invalid_field:
+          字段的名字不允许为 %{name}. 你不应该定义跟Mongoid内部属性或者方法相同的名字，详细请看Use Document#instance_methods.
+        too_many_nested_attribute_records:
+          被关联的%{association} 嵌入式属性不能超过 %{limit}.
+        embedded_in_must_have_inverse_of:
+          embedded_in的关联属性必须包含inverse_of.
+        dependent_only_references_one_or_many:
+          dependent => destroy|delete 选项只有在references_one或者references_many时候有效.
+        association_cant_have_inverse_of:
+          在当前的关联中，不允许定义inverse_of去,其只有在embedded_in或者references_many是数组的情况下使用
+        unsaved_document:
+          You cannot call create or create! through a relational association
+          relation (%{document}) who's parent (%{base}) is not already saved.
+        mixed_relations:
+          Referencing a(n) %{embedded} document from the %{root} document via a
+          relational association is not allowed since the %{embedded} is embedded.
+        no_environment:
+          "Mongoid attempted to find the appropriate environment but no Rails.env,
+          Sinatra::Base.environment, or RACK_ENV could be found."
+        scope_overwrite:
+          "Cannot create scope :%{scope_name}, because of existing method
+          %{model_name}.%{scope_name}."
+        blank_on_locale: "can't be blank in %{in_locale}"
+
+
+    models:
+      news_bulletin: 新聞
+      bulletin: 公告
+      ad_banner: 廣告輪播
+      web_link: 連結管理
+    attributes:
+      news_bulletin:
+        title: 新聞標題
+      bulletin:
+        title: 公告標題
+      ad_banner:
+        title: 標題
+      web_link:
+        title: 名稱
+        url: 路徑

config/locales/rails.yml

@@ -1,132 +0,0 @@
-# Chinese (Taiwan) translations for Ruby on Rails 
-# by tsechingho (http://github.com/tsechingho)
-
-:zh_tw:
-  date:
-    formats:
-      default: "%Y-%m-%d"
-      short: "%b%d日"
-      long: "%Y年%b%d日"
-    day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六]
-    abbr_day_names: [日, 一, 二, 三, 四, 五, 六]
-    month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
-    abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
-    order: [ :year, :month, :day ]
-  
-  time:
-    formats:
-      default: "%Y年%b%d日 %A %H:%M:%S %Z"
-      short: "%b%d日 %H:%M"
-      long: "%Y年%b%d日 %H:%M"
-    am: "上午"
-    pm: "下午"
-  
-  datetime:
-    distance_in_words:
-      half_a_minute: "半分鐘"
-      less_than_x_seconds:
-        one: "不到一秒"
-        other: "不到 {{count}} 秒"
-      x_seconds:
-        one: "一秒"
-        other: "{{count}} 秒"
-      less_than_x_minutes:
-        one: "不到一分鐘"
-        other: "不到 {{count}} 分鐘"
-      x_minutes:
-        one: "一分鐘"
-        other: "{{count}} 分鐘"
-      about_x_hours:
-        one: "大約一小時"
-        other: "大約 {{count}} 小時"
-      x_days:
-        one: "一天"
-        other: "{{count}} 天"
-      about_x_months:
-        one: "大約一個月"
-        other: "大約 {{count}} 個月"
-      x_months:
-        one: "一個月"
-        other: "{{count}} 個月"
-      about_x_years:
-        one: "大約一年"
-        other: "大約 {{count}} 年"
-      over_x_years:
-        one: "一年多"
-        other: "{{count}} 年多"
-    prompts:
-      year:   "年"
-      month:  "月"
-      day:    "日"
-      hour:   "時"
-      minute: "分"
-      second: "秒"
-  
-  number:
-    format:
-      separator: "."
-      delimiter: ","
-      precision: 3
-    currency:
-      format:
-        format: "%u %n"
-        unit: "NT$"
-        separator: "."
-        delimiter: ","
-        precision: 2
-    percentage:
-      format:
-        delimiter: ""
-    precision:
-      format:
-        delimiter: ""
-    human:
-      format:
-        delimiter: ""
-        precision: 1
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-  
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " 和 "
-      last_word_connector: ", 和 "
-  
-  activerecord:
-    errors:
-      template:
-        header: 
-          one: "有 1 個錯誤發生使得「{{model}}」無法被儲存。"
-          other: "有 {{count}} 個錯誤發生使得「{{model}}」無法被儲存。"
-        body: "下面欄位有問題："
-      messages:
-        inclusion: "沒有包含在列表中"
-        exclusion: "是被保留的"
-        invalid: "是無效的"
-        confirmation: "不符合確認值"
-        accepted: "必須是可被接受的"
-        empty: "不能留空"
-        blank: "不能是空白字元"
-        too_long: "過長（最長是 {{count}} 個字）"
-        too_short: "過短（最短是 {{count}} 個字）"
-        wrong_length: "字數錯誤（必須是 {{count}} 個字）"
-        taken: "已經被使用"
-        not_a_number: "不是數字"
-        greater_than: "必須大於 {{count}}"
-        greater_than_or_equal_to: "必須大於或等於 {{count}}"
-        equal_to: "必須等於 {{count}}"
-        less_than: "必須小於 {{count}}"
-        less_than_or_equal_to: "必須小於或等於 {{count}}"
-        odd: "必須是奇數"
-        even: "必須是偶數"
-  
-

config/locales/rails.zh_tw.yml

@@ -0,0 +1,202 @@
+# Chinese (Taiwan) translations for Ruby on Rails 
+# by tsechingho (http://github.com/tsechingho)
+
+zh_tw:
+  date:
+    abbr_day_names:
+    - 日
+    - 一
+    - 二
+    - 三
+    - 四
+    - 五
+    - 六
+    abbr_month_names:
+    - 
+    - 1月
+    - 2月
+    - 3月
+    - 4月
+    - 5月
+    - 6月
+    - 7月
+    - 8月
+    - 9月
+    - 10月
+    - 11月
+    - 12月
+    day_names:
+    - 星期日
+    - 星期一
+    - 星期二
+    - 星期三
+    - 星期四
+    - 星期五
+    - 星期六
+    formats:
+      default: ! '%Y-%m-%d'
+      long: ! '%Y年%b%d日'
+      short: ! '%b%d日'
+    month_names:
+    - 
+    - 一月
+    - 二月
+    - 三月
+    - 四月
+    - 五月
+    - 六月
+    - 七月
+    - 八月
+    - 九月
+    - 十月
+    - 十一月
+    - 十二月
+    order:
+    - :year
+    - :month
+    - :day
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: 大約一小時
+        other: 大約 %{count} 小時
+      about_x_months:
+        one: 大約一個月
+        other: 大約 %{count} 個月
+      about_x_years:
+        one: 大約一年
+        other: 大約 %{count} 年
+      almost_x_years:
+        one: 接近一年
+        other: 接近 %{count} 年
+      half_a_minute: 半分鐘
+      less_than_x_minutes:
+        one: 不到一分鐘
+        other: 不到 %{count} 分鐘
+      less_than_x_seconds:
+        one: 不到一秒
+        other: 不到 %{count} 秒
+      over_x_years:
+        one: 一年多
+        other: ! '%{count} 年多'
+      x_days:
+        one: 一天
+        other: ! '%{count} 天'
+      x_minutes:
+        one: 一分鐘
+        other: ! '%{count} 分鐘'
+      x_months:
+        one: 一個月
+        other: ! '%{count} 個月'
+      x_seconds:
+        one: 一秒
+        other: ! '%{count} 秒'
+    prompts:
+      day: 日
+      hour: 時
+      minute: 分
+      month: 月
+      second: 秒
+      year: 年
+  errors: &errors
+    format: ! '%{attribute} %{message}'
+    messages:
+      accepted: 必須是可被接受的
+      blank: 不能是空白字元
+      confirmation: 不符合確認值
+      empty: 不能留空
+      equal_to: 必須等於 %{count}
+      even: 必須是偶數
+      exclusion: 是被保留的關鍵字
+      greater_than: 必須大於 %{count}
+      greater_than_or_equal_to: 必須大於或等於 %{count}
+      inclusion: 沒有包含在列表中
+      invalid: 是無效的
+      less_than: 必須小於 %{count}
+      less_than_or_equal_to: 必須小於或等於 %{count}
+      not_a_number: 不是數字
+      not_an_integer: 必須是整數
+      odd: 必須是奇數
+      record_invalid: ! '校驗失敗: %{errors}'
+      taken: 已經被使用
+      too_long: 過長（最長是 %{count} 個字）
+      too_short: 過短（最短是 %{count} 個字）
+      wrong_length: 字數錯誤（必須是 %{count} 個字）
+    template:
+      body: 以下欄位發生問題：
+      header:
+        one: 有 1 個錯誤發生使得「%{model}」無法被儲存。
+        other: 有 %{count} 個錯誤發生使得「%{model}」無法被儲存。
+  helpers:
+    select:
+      prompt: 請選擇
+    submit:
+      create: 新增%{model}
+      submit: 儲存%{model}
+      update: 更新%{model}
+  number:
+    currency:
+      format:
+        delimiter: ! ','
+        format: ! '%u %n'
+        precision: 2
+        separator: .
+        significant: false
+        strip_insignificant_zeros: false
+        unit: NT$
+    format:
+      delimiter: ! ','
+      precision: 3
+      separator: .
+      significant: false
+      strip_insignificant_zeros: false
+    human:
+      decimal_units:
+        format: ! '%n %u'
+        units:
+          billion: 十億
+          million: 百萬
+          quadrillion: 千兆
+          thousand: 千
+          trillion: 兆
+          unit: ''
+      format:
+        delimiter: ''
+        precision: 1
+        significant: false
+        strip_insignificant_zeros: false
+      storage_units:
+        format: ! '%n %u'
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+    percentage:
+      format:
+        delimiter: ''
+    precision:
+      format:
+        delimiter: ''
+  support:
+    array:
+      last_word_connector: ! ', 和 '
+      two_words_connector: ! ' 和 '
+      words_connector: ! ', '
+  time:
+    am: 上午
+    formats:
+      default: ! '%Y年%b%d日 %A %H:%M:%S %Z'
+      long: ! '%Y年%b%d日 %H:%M'
+      short: ! '%b%d日 %H:%M'
+    pm: 下午
+  # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+  activemodel:
+    errors:
+      <<: *errors
+  activerecord:
+    errors:
+      <<: *errors