diff --git a/app/models/post.rb b/app/models/post.rb index 8c9e3d11fba..d042d456996 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -281,10 +281,6 @@ class Post < ActiveRecord::Base end end - def author_readable - user.readable_name - end - def revise(updated_by, new_raw, opts = {}) PostRevisor.new(self).revise!(updated_by, new_raw, opts) end diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb index 8c6a1979a92..a9c949c1498 100644 --- a/app/views/list/list.rss.erb +++ b/app/views/list/list.rss.erb @@ -1,22 +1,34 @@ + <% lang = SiteSetting.find_by_name('default_locale').try(:value) %> <%= @title %> <%= @link %> <%= @description %> + <% if lang %> + <%= lang %> + <% end %> + <%= @topic_list.topics.first.created_at.rfc2822 %> <% @topic_list.topics.each do |topic| %> + <% topic_url = Discourse.base_url + topic.relative_url -%> <%= topic.title %> + <%= "@#{topic.user.username} (#{topic.user.name})" -%> + <%= topic.category.name %> <%= pluralize(topic.posts_count, 'post') %>

-

<%= t 'author_wrote', author: topic.posts.first.author_readable %>

- <%= topic.posts.first.cooked.html_safe %> +

<%= t('author_wrote', author: link_to(topic.user.name, topic.user)).html_safe %>

+
+ <%= topic.posts.first.cooked.html_safe %> +
+

<%= t 'num_posts' %> <%= topic.posts_count %>

+

<%= t 'num_participants' %> <%= topic.participant_count %>

+

<%= link_to t('read_full_topic'), topic_url %>

]]> - <%= Discourse.base_url %><%= topic.relative_url %> + <%= topic_url %> <%= topic.created_at.rfc2822 %> - <%= Discourse.base_url %><%= topic.relative_url %> - <%= topic.title %> + <%= topic_url %> + <%= topic.title %> <% end %> diff --git a/app/views/topics/show.rss.erb b/app/views/topics/show.rss.erb index 613a290d1a8..85d1e2e5750 100644 --- a/app/views/topics/show.rss.erb +++ b/app/views/topics/show.rss.erb @@ -1,24 +1,35 @@ + <% topic_url = Discourse.base_url + @topic_view.relative_url %> + <% lang = SiteSetting.find_by_name('default_locale').try(:value) %> <%= @topic_view.title %> - <%= Discourse.base_url %><%= @topic_view.relative_url %> + <%= topic_url %> <%= @topic_view.posts.first.raw %> - + <% if lang %> + <%= lang %> + <% end %> + <%= @topic_view.topic.created_at.rfc2822 %> + <%= @topic_view.topic.category.name %> + <% @topic_view.recent_posts.each do |post| %> - <% if post.user %> - - <%= @topic_view.title %> at <%= post.created_at %> - <%= post.author_readable %> wrote:

+ <% next unless post.user %> + + <%= @topic_view.title %> at <%= post.created_at %> + <%= "@#{post.user.username} (#{post.user.name})" -%> + +

<%= t('author_wrote', author: link_to(post.user.name, post.user)).html_safe %>

+
<%= post.cooked.html_safe %> - ]]> - <%= Discourse.base_url %><%= post.url %> - <%= post.created_at.rfc2822 %> - <%= Discourse.base_url %><%= post.url %> - <%= @topic_view.title %> - - <% end %> +
+

<%= link_to t('read_full_topic'), post_url %>

+ ]]> + <%= post_url %> + <%= post.created_at.rfc2822 %> + <%= post_url %> + <%= @topic_view.title %> + <% end %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index cdc212383f7..a5ae2b3feaf 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -59,6 +59,9 @@ en: rss_posts_in_topic: "RSS feed of '%{topic}'" rss_topics_in_category: "RSS feed of topics in the '%{category}' category" author_wrote: "%{author} wrote:" + num_posts: "Posts:" + num_participants: "Participants:" + read_full_topic: "Read full topic" private_message_abbrev: "PM" rss_description: latest: "Latest topics" diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index c7e259d0fa6..1f143588518 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -742,13 +742,6 @@ describe Post do end - describe '#readable_author' do - it 'delegates to the associated user' do - User.any_instance.expects(:readable_name) - Fabricate(:post).author_readable - end - end - describe 'urls' do it 'no-ops for empty list' do Post.urls([]).should == {}