diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 5157b92c8..be51e5f36 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -24,6 +24,7 @@ class PostsController < ApplicationController profiles = Profile.tagged_with(params[:tag]).where(:searchable => true).select('profiles.id, profiles.person_id') @people = Person.where(:id => profiles.map{|p| p.person_id}).limit(15) + @people_count = Person.where(:id => profiles.map{|p| p.person_id}).count @fakes = PostsFake.new(@posts) @commenting_disabled = true @@ -40,11 +41,11 @@ class PostsController < ApplicationController I18n.locale = @person.owner.language render "posts/#{@post.class.to_s.underscore}", :layout => true else - flash[:error] = "that post does not exsist!" + flash[:error] = "that post does not exist!" redirect_to root_url end else - flash[:error] = "that post does not exsist!" + flash[:error] = "that post does not exist!" redirect_to root_url end end diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 222a7a3e0..24697e818 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -31,8 +31,6 @@ %h4 = new_request_link(@request_count) - %hr - - if @invites > 0 .section.invite_friends %h4= t('shared.invitations.invite_your_friends') diff --git a/app/views/posts/index.html.haml b/app/views/posts/index.html.haml index faaa6f59e..1c3b0a0bc 100644 --- a/app/views/posts/index.html.haml +++ b/app/views/posts/index.html.haml @@ -33,7 +33,13 @@ .prepend-2.span-7.last %h3 - = t('.people_tagged_with', :tag => "##{params[:tag]}") + = @people_count + %span{:style => "font-weight:normal"} + - if @people_count == 1 + = t('.person') + - else + = t('.people') + .side_stream.stream - for person in @people .stream_element{:id => person.id} @@ -43,3 +49,6 @@ =person_link(person) .info = person.diaspora_handle + + - if @people_count > 15 + \... diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 25b4404f8..19607d700 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -404,6 +404,8 @@ en: posts_tagged_with: "Posts tagged with #%{tag}" nobody_talking: "Nobody is talking about %{tag} yet." people_tagged_with: "People tagged with %{tag}" + people: "people" + person: "person" profiles: edit: