diff options
| author | Philip Arndt <parndt@gmail.com> | 2011-05-31 14:39:31 +1200 |
|---|---|---|
| committer | Philip Arndt <parndt@gmail.com> | 2011-05-31 14:39:31 +1200 |
| commit | 8087ff51338bec661ad27082873c8abca8febc11 (patch) | |
| tree | 99f5ec8f07d7a5344eeb3e2a1f5f140fd42259c7 | |
| parent | 4f45963b9e2c3477ace8a48f5097fa50e9cdffa6 (diff) | |
| parent | 5c58ba20b052dd19efb30aff500dd3158496ca14 (diff) | |
| download | refinerycms-blog-8087ff51338bec661ad27082873c8abca8febc11.tar.gz refinerycms-blog-8087ff51338bec661ad27082873c8abca8febc11.tar.bz2 refinerycms-blog-8087ff51338bec661ad27082873c8abca8febc11.zip | |
Merged remote branch 'keram/master'.
| -rw-r--r-- | app/models/blog_category.rb | 5 | ||||
| -rw-r--r-- | app/models/blog_post.rb | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/blog_category.rb b/app/models/blog_category.rb index bc0165a..263982c 100644 --- a/app/models/blog_category.rb +++ b/app/models/blog_category.rb @@ -7,7 +7,10 @@ class BlogCategory < ActiveRecord::Base validates :title, :presence => true, :uniqueness => true - has_friendly_id :title, :use_slug => true + has_friendly_id :title, :use_slug => true, + :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en), + :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'), + :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog') def post_count posts.select(&:live?).count diff --git a/app/models/blog_post.rb b/app/models/blog_post.rb index e298bcf..c1b8973 100644 --- a/app/models/blog_post.rb +++ b/app/models/blog_post.rb @@ -21,8 +21,11 @@ class BlogPost < ActiveRecord::Base validates :title, :presence => true, :uniqueness => true validates :body, :presence => true - has_friendly_id :title, :use_slug => true - + has_friendly_id :title, :use_slug => true, + :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en), + :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'), + :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog') + attr_accessible :title, :body, :tag_list, :draft, :published_at, :browser_title, :meta_keywords, :meta_description, :user_id scope :by_archive, lambda { |archive_date| |