fix for Spen's translation and Chris's tag error

2013-04-26 15:37:27 +08:00 · 2013-04-26 15:37:27 +08:00 · 3e567223e3
parent 79ef86f2c9
commit 3e567223e3
27 changed files with 29 additions and 29 deletions
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@ -2,7 +2,7 @@ class Admin::TagsController < OrbitBackendController
  before_filter :force_order_for_visitor,:only=>[:index]
  before_filter :force_order_for_user,:except => [:index]
  before_filter :for_app_sub_manager,:except => [:index]
-  before_filter :set_module_app
+  # before_filter :set_module_app
   
  def index
    @tags = get_tags
@ -39,7 +39,7 @@ class Admin::TagsController < OrbitBackendController
    @tags = @module_app.blank? ? Tag.all : @module_app.tags
  end

-  def set_module_app
+  def setup_vars
    @module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id]
    @module_app_id = @module_app.id rescue nil
  end
--- a/app/models/sub_role_tag.rb
+++ b/app/models/sub_role_tag.rb
@ -1,4 +1,3 @@
 class SubRoleTag < ProtoTag
  has_and_belongs_to_many :sub_roles
-
 end
--- a/app/views/admin/attributes/edit.html.erb
+++ b/app/views/admin/attributes/edit.html.erb
@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>

            <%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>
--- a/app/views/admin/attributes/index.html.erb
+++ b/app/views/admin/attributes/index.html.erb
@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>


--- a/app/views/admin/dashboards/index.html.erb
+++ b/app/views/admin/dashboards/index.html.erb
@ -40,7 +40,7 @@
        </div>
    </div>
 <!--     <div class="item element">
-        <h3><i class="icons-"></i><a href=""><%= t(:member) %></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:member_) %></a></h3>
        <div class="detail w-a h-a">
            <p class="totle"><span><%= t(:all_member) %></span>2,217</p>
            <table class="table table-striped">
--- a/app/views/admin/role_filters/index.html.erb
+++ b/app/views/admin/role_filters/index.html.erb
@ -1,6 +1,6 @@

 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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="subnav">
--- a/app/views/admin/roles/add_sub_role.html.erb
+++ b/app/views/admin/roles/add_sub_role.html.erb
@ -1,6 +1,6 @@

 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>


--- a/app/views/admin/roles/edit_sub_role.html.erb
+++ b/app/views/admin/roles/edit_sub_role.html.erb
@ -1,6 +1,6 @@

 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>


--- a/app/views/admin/roles/role_field.html.erb
+++ b/app/views/admin/roles/role_field.html.erb
@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>
 			
 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>
--- a/app/views/admin/roles/sub_role.html.erb
+++ b/app/views/admin/roles/sub_role.html.erb
@ -1,7 +1,7 @@
 <% # encoding: utf-8 %>

 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>


--- a/app/views/admin/roles/sub_role_field.html.erb
+++ b/app/views/admin/roles/sub_role_field.html.erb
@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= 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'} %>
+  <%= 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 %>

 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>
--- a/app/views/admin/users_new_interface/_filter.html.erb
+++ b/app/views/admin/users_new_interface/_filter.html.erb
@ -48,7 +48,7 @@
                <div class="accordion-body collapse" id="collapse-tags">
                    <div class="accordion-inner" data-toggle="buttons-checkbox">
                        <% @sub_role_tags.each do |sr_tag|%>
-                            <a href="#" class="btn"><%= sr_tag.name %></a>
+                            <a href="#" class="btn"><%= sr_tag[I18n.locale] %></a>
                        <% end -%>
                    </div>
                    <div class="filter-clear">
--- a/app/views/admin/users_new_interface/_side_bar.html.erb
+++ b/app/views/admin/users_new_interface/_side_bar.html.erb
@ -1,5 +1,5 @@
 <%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ 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(: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') if (is_admin? rescue nil) %>
--- a/app/views/admin/users_new_interface/edit.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <% content_for :page_specific_css do -%>
--- a/app/views/admin/users_new_interface/edit_passwd.html.erb
+++ b/app/views/admin/users_new_interface/edit_passwd.html.erb
@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <% content_for :page_specific_css do -%>
--- a/app/views/admin/users_new_interface/index.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <%= render :partial => "js_and_css"%>
--- a/app/views/admin/users_new_interface/index_summary.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <%= render :partial => "js_and_css"%>
--- a/app/views/admin/users_new_interface/index_thumbnail.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <%= render :partial => "js_and_css"%>
--- a/app/views/admin/users_new_interface/new.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <% content_for :page_specific_css do -%>
--- a/app/views/admin/users_new_interface/plugin_dashbroad.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

            <div class="member-plugin">
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <%= render :partial => "js_and_css"%>
--- a/app/views/admin/users_new_interface/temp_edit.html.erb
+++ b/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(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :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-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>

 <% content_for :page_specific_css do -%>
--- a/app/views/layouts/_drop_down_menu.html.erb
+++ b/app/views/layouts/_drop_down_menu.html.erb
@ -4,6 +4,6 @@
 	<li><%= link_to t(:template), admin_designs_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:purchase), admin_purchases_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:asset), admin_assets_path, :class => 'orblink' %></li>
-	<li><%= link_to t(:member), admin_users_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:member_), admin_users_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:site_), admin_sites_path, :class => 'orblink' %></li>
 </ul>
--- a/app/views/layouts/_guest_orbit_menu.erb
+++ b/app/views/layouts/_guest_orbit_menu.erb
@ -2,7 +2,7 @@
          <% if Me.backend_openness_on %>
            <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-users') + t(:member), admin_users_new_interface_index_path %></li>
+                <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + t(:member_), admin_users_new_interface_index_path %></li>
            </ul>    
          <% end %>  
          
--- a/app/views/layouts/_member_orbit_menu.erb
+++ b/app/views/layouts/_member_orbit_menu.erb
@ -1,10 +1,10 @@
          <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-users') + t(:member), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + 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>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member_), admin_users_path %></li>
              <li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
              <%if (is_admin? rescue false)%>
              <li class="divider"></li>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -277,7 +277,7 @@ en:
  markup_options: Markup options
  markup_value: Markup value
  me: Me
-  member: Member
+  member_: Member
  member_authorization: Authorizations
  member_info: Profile Form
  member_registration: Registration Approval
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@ -277,7 +277,8 @@ zh_tw:
  markup_options: 標註選項
  markup_value: 標註值
  me: 我
-  member: 成員
+  # member: 成員
+  member_: 成員
  member_authorization: 成員權限
  member_info: 基本資料表
  member_registration: 註冊審核