aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorUģis Ozols <ugis.ozolss@gmail.com>2012-11-15 12:16:30 +0200
committerUģis Ozols <ugis.ozolss@gmail.com>2012-11-15 12:16:30 +0200
commita3de72ecb24c46a72ce46bd99d9eef16175867f5 (patch)
treec4b8cfd6358db9517b8234979adbd45d78ac84cf /app
parent8219d07d9b78bb862616059a1b4b2b69b1c677e4 (diff)
downloadrefinerycms-blog-a3de72ecb24c46a72ce46bd99d9eef16175867f5.tar.gz
refinerycms-blog-a3de72ecb24c46a72ce46bd99d9eef16175867f5.tar.bz2
refinerycms-blog-a3de72ecb24c46a72ce46bd99d9eef16175867f5.zip
Remove Refinery.i18n_enabled? checks because refinerycms-i18n is now a hard dependency for refinerycms-core.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/refinery/blog/posts_controller.rb2
-rw-r--r--app/views/refinery/blog/admin/categories/_form.html.erb2
-rw-r--r--app/views/refinery/blog/admin/posts/_form.html.erb2
3 files changed, 3 insertions, 3 deletions
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] %>
<div class='field'>
<%= 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] %>
<div class='field'>
<%= f.label :title -%>