From a3de72ecb24c46a72ce46bd99d9eef16175867f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=A3is=20Ozols?= Date: Thu, 15 Nov 2012 12:16:30 +0200 Subject: Remove Refinery.i18n_enabled? checks because refinerycms-i18n is now a hard dependency for refinerycms-core. --- app/controllers/refinery/blog/posts_controller.rb | 2 +- app/views/refinery/blog/admin/categories/_form.html.erb | 2 +- app/views/refinery/blog/admin/posts/_form.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index 6c9049d..ed94a8d 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -76,7 +76,7 @@ module Refinery protected def canonical? - ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale + Refinery::I18n.default_frontend_locale != Refinery::I18n.current_frontend_locale end end end diff --git a/app/views/refinery/blog/admin/categories/_form.html.erb b/app/views/refinery/blog/admin/categories/_form.html.erb index 559dbe1..f2148ea 100644 --- a/app/views/refinery/blog/admin/categories/_form.html.erb +++ b/app/views/refinery/blog/admin/categories/_form.html.erb @@ -4,7 +4,7 @@ :include_object_name => true %> <%= render "/refinery/blog/admin/shared/locale_picker", - :current_locale => Thread.current[:globalize_locale] if Refinery.i18n_enabled? %> + :current_locale => Thread.current[:globalize_locale] %>
<%= f.label :title -%> diff --git a/app/views/refinery/blog/admin/posts/_form.html.erb b/app/views/refinery/blog/admin/posts/_form.html.erb index 4aac811..7b63520 100644 --- a/app/views/refinery/blog/admin/posts/_form.html.erb +++ b/app/views/refinery/blog/admin/posts/_form.html.erb @@ -4,7 +4,7 @@ :include_object_name => true %> <%= render "/refinery/blog/admin/shared/locale_picker", - :current_locale => Thread.current[:globalize_locale] if Refinery.i18n_enabled? %> + :current_locale => Thread.current[:globalize_locale] %>
<%= f.label :title -%> -- cgit v1.2.3