Fix Gemfile and OrbitBar language switching

This commit is contained in:
manson 2014-04-21 15:49:32 +08:00
parent 2154edea9e
commit 21245a4a86
2 changed files with 1 additions and 2 deletions

View File

@ -41,7 +41,6 @@ eval(File.read(File.dirname(__FILE__) + '/downloaded_extensions.rb'))
#development related gems #development related gems
group :development do group :development do
gem 'better_errors' gem 'better_errors'
gem 'binding_of_caller', :platforms=>[:mri_19, :mri_20, :rbx]
gem 'guard-bundler' gem 'guard-bundler'
gem 'guard-rails' gem 'guard-rails'
gem 'rails_layout' gem 'rails_layout'

View File

@ -12,7 +12,7 @@
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="<%#= t('site.language')%>"><%= t(:_locale, :locale => I18n.locale) %></a> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="<%#= t('site.language')%>"><%= t(:_locale, :locale => I18n.locale) %></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="orbit-language"> <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-language">
<% current_site.in_use_locales.each do |locale| %> <% current_site.in_use_locales.each do |locale| %>
<%= content_tag :li, (link_to t(:_locale, :locale => locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil), tabindex: "-1" %> <%= content_tag :li, (link_to t(:_locale, :locale => locale), :locale => locale), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil), tabindex: "-1" %>
<% end %> <% end %>
</ul> </ul>
</li> </li>