nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5475 from svbergerem/tag-page-improve-wording

Browse source 
Improve wording for tagged people on tag page
This commit is contained in:
Jonne Haß 2014-12-17 16:46:09 +01:00
commit 3000d86d57
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/tag.css.scss
View file

@ -26,6 +26,7 @@ h1.tag {
#tags_show { #tags_show {
.span3 { .span3 {
border-right: 1px solid $border-grey; border-right: 1px solid $border-grey;
h4 { margin: 25px 0 15px; }
.side_stream #people_stream { .side_stream #people_stream {
.name { display: block; } .name { display: block; }
.name, .diaspora_handle, .tags { .name, .diaspora_handle, .tags {

4
app/views/tags/show.haml
View file

@ -11,8 +11,8 @@
.container-fluid#tags_show .container-fluid#tags_show
.row-fluid .row-fluid
.span3.offset1 .span3.offset1
%h3 %h4
= t('people', :count => @stream.tagged_people_count) = t('.tagged_people', :count => @stream.tagged_people_count, :tag => @stream.display_tag_name)
.side_stream.stream .side_stream.stream
= render :partial => 'people/index', :locals => {:people => @stream.tagged_people} = render :partial => 'people/index', :locals => {:people => @stream.tagged_people}

23
config/locales/diaspora/en.yml
View file

@ -173,9 +173,6 @@ en:
aspects: aspects:
zero: "no aspects" zero: "no aspects"
one: "1 aspect" one: "1 aspect"
two: "%{count} aspects"
few: "%{count} aspects"
many: "%{count} aspects"
other: "%{count} aspects" other: "%{count} aspects"
contacts_visible: "Contacts in this aspect will be able to see each other." contacts_visible: "Contacts in this aspect will be able to see each other."
contacts_not_visible: "Contacts in this aspect will not be able to see each other." contacts_not_visible: "Contacts in this aspect will not be able to see each other."
@ -308,9 +305,6 @@ en:
comments: comments:
zero: "no comments" zero: "no comments"
one: "1 comment" one: "1 comment"
two: "%{count} comments"
few: "%{count} comments"
many: "%{count} comments"
other: "%{count} comments" other: "%{count} comments"
new_comment: new_comment:
comment: "Comment" comment: "Comment"
@ -324,9 +318,6 @@ en:
contacts: contacts:
zero: "contacts" zero: "contacts"
one: "1 contact" one: "1 contact"
two: "%{count} contacts"
few: "%{count} contacts"
many: "%{count} contacts"
other: "%{count} contacts" other: "%{count} contacts"
create: create:
failure: "Failed to create contact" failure: "Failed to create contact"
@ -824,9 +815,6 @@ en:
people: people:
zero: "no people" zero: "no people"
one: "1 person" one: "1 person"
two: "%{count} people"
few: "%{count} people"
many: "%{count} people"
other: "%{count} people" other: "%{count} people"
person: person:
pending_request: "Pending request" pending_request: "Pending request"
@ -1193,16 +1181,13 @@ en:
tags: tags:
show: show:
posts_tagged_with: "Posts tagged with #%{tag}" tagged_people:
nobody_talking: "Nobody is talking about %{tag} yet." zero: "No one tagged with %{tag}"
people_tagged_with: "People tagged with %{tag}" one: "1 person tagged with %{tag}"
other: "%{count} people tagged with %{tag}"
follow: "Follow #%{tag}" follow: "Follow #%{tag}"
following: "Following #%{tag}" following: "Following #%{tag}"
stop_following: "Stop Following #%{tag}" stop_following: "Stop Following #%{tag}"
followed_by_people:
zero: "followed by nobody"
one: "followed by one person"
other: "followed by %{count} people"
none: "The empty tag does not exist!" none: "The empty tag does not exist!"
tag_followings: tag_followings:
create: create: