Translation changes

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 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="thumbnail" class="btn <%= "active" if params[:at] == "thumbnail" %>"><i class="icon-th-large"></i> <%= t("admin.new_admin.show_mode.thumbnail")%></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("show_mode.summary")%></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-name" class="sort span1-2 select active"><%= t("admin.new_admin.attributes.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-admin" class="sort span2"><%= t("admin.new_admin.attributes.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-roles" class="sort span3"><%= t(:roles)%><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(:publications)%><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(: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('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('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('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(: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(: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(: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(: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/_temp_form.html.erb

@@ -7,12 +7,12 @@
   <%= file_field_tag 'file' %>
   <%= hidden_field_tag :avatar_cache %>
   <label>
-  <span><%= t('admin.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' %>
+  <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.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">

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 -%>