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

Merge pull request #1614 from ticho/1603-likes-i18n-fix

Browse source 
Fix for issue #1603 - use different i18n string for comment likes count
This commit is contained in:
Jonne Hass 2011-07-25 07:20:24 -07:00
commit 384a71bdc4
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/comments/_comment.html.haml
View file

@ -21,7 +21,7 @@
= comment.created_at ? timeago(comment.created_at) : timeago(Time.now) = comment.created_at ? timeago(comment.created_at) : timeago(Time.now)
.likes .likes
= render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count, :target_type => "Comment"
- unless (defined?(@commenting_disabled) && @commenting_disabled) - unless (defined?(@commenting_disabled) && @commenting_disabled)
%span.like_action %span.like_action

10
app/views/likes/_likes_container.haml
View file

@ -6,9 +6,15 @@
- if likes_count > 0 - if likes_count > 0
= image_tag('icons/heart.svg') = image_tag('icons/heart.svg')
- if defined?(likes_index_link) && likes_index_link - if defined?(likes_index_link) && likes_index_link
= link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" - if target_type == "Comment"
= link_to t('likes.likes.people_like_this_comment', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
- else
= link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
- else - else
= t('likes.likes.people_like_this', :count => likes_count) - if target_type == "Comment"
= t('likes.likes.people_like_this_comment', :count => likes_count)
- else
= t('likes.likes.people_like_this', :count => likes_count)
%span.hidden.likes_list %span.hidden.likes_list
/= render 'likes/likes', :likes => likes /= render 'likes/likes', :likes => likes

2
app/views/shared/_stream_element.html.haml
View file

@ -67,6 +67,6 @@
= link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea' = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
.likes.on_post .likes.on_post
= render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true, :target_type => "Post"
= render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled) = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)

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

@ -318,6 +318,12 @@ en:
few: "%{count} likes" few: "%{count} likes"
many: "%{count} likes" many: "%{count} likes"
other: "%{count} likes" other: "%{count} likes"
people_like_this_comment:
zero: "no likes"
one: "%{count} like"
few: "%{count} likes"
many: "%{count} likes"
other: "%{count} likes"
people_dislike_this: people_dislike_this:
zero: "no dislikes" zero: "no dislikes"
one: "%{count} dislike" one: "%{count} dislike"