Commit 7c1dde222999784b465c2b62699aa007acde33b9
1 parent
41bbd3c5
Exists in
master
and in
29 other branches
ActionItem1155: better wording
Showing
2 changed files
with
10 additions
and
9 deletions
Show diff stats
app/models/published_article.rb
@@ -28,6 +28,6 @@ class PublishedArticle < Article | @@ -28,6 +28,6 @@ class PublishedArticle < Article | ||
28 | end | 28 | end |
29 | 29 | ||
30 | def to_html(options={}) | 30 | def to_html(options={}) |
31 | - reference_article ? reference_article.to_html : _('Original text was removed.') | 31 | + reference_article ? reference_article.to_html : ('<em>' + _('The original text was removed.') + '</em>') |
32 | end | 32 | end |
33 | end | 33 | end |
db/schema.rb
@@ -89,15 +89,16 @@ ActiveRecord::Schema.define(:version => 69) do | @@ -89,15 +89,16 @@ ActiveRecord::Schema.define(:version => 69) do | ||
89 | t.boolean "virtual", :default => false | 89 | t.boolean "virtual", :default => false |
90 | end | 90 | end |
91 | 91 | ||
92 | - add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id" | ||
93 | add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id" | 92 | add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id" |
93 | + add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id" | ||
94 | 94 | ||
95 | create_table "blocks", :force => true do |t| | 95 | create_table "blocks", :force => true do |t| |
96 | - t.string "title" | ||
97 | - t.integer "box_id" | ||
98 | - t.string "type" | ||
99 | - t.text "settings" | ||
100 | - t.integer "position" | 96 | + t.string "title" |
97 | + t.integer "box_id" | ||
98 | + t.string "type" | ||
99 | + t.text "settings" | ||
100 | + t.integer "position" | ||
101 | + t.datetime "last_updated" | ||
101 | end | 102 | end |
102 | 103 | ||
103 | add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id" | 104 | add_index "blocks", ["box_id"], :name => "index_blocks_on_box_id" |
@@ -169,13 +170,13 @@ ActiveRecord::Schema.define(:version => 69) do | @@ -169,13 +170,13 @@ ActiveRecord::Schema.define(:version => 69) do | ||
169 | 170 | ||
170 | create_table "external_feeds", :force => true do |t| | 171 | create_table "external_feeds", :force => true do |t| |
171 | t.string "feed_title" | 172 | t.string "feed_title" |
172 | - t.date "fetched_at" | ||
173 | t.string "address" | 173 | t.string "address" |
174 | t.integer "blog_id", :null => false | 174 | t.integer "blog_id", :null => false |
175 | t.boolean "enabled", :default => true, :null => false | 175 | t.boolean "enabled", :default => true, :null => false |
176 | t.boolean "only_once", :default => true, :null => false | 176 | t.boolean "only_once", :default => true, :null => false |
177 | t.datetime "created_at" | 177 | t.datetime "created_at" |
178 | t.datetime "updated_at" | 178 | t.datetime "updated_at" |
179 | + t.datetime "fetched_at" | ||
179 | end | 180 | end |
180 | 181 | ||
181 | create_table "favorite_enteprises_people", :id => false, :force => true do |t| | 182 | create_table "favorite_enteprises_people", :id => false, :force => true do |t| |
@@ -290,8 +291,8 @@ ActiveRecord::Schema.define(:version => 69) do | @@ -290,8 +291,8 @@ ActiveRecord::Schema.define(:version => 69) do | ||
290 | t.datetime "created_at" | 291 | t.datetime "created_at" |
291 | end | 292 | end |
292 | 293 | ||
293 | - add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" | ||
294 | add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" | 294 | add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type" |
295 | + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" | ||
295 | 296 | ||
296 | create_table "tags", :force => true do |t| | 297 | create_table "tags", :force => true do |t| |
297 | t.string "name" | 298 | t.string "name" |