diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml index 02882abd3..1c175bf55 100644 --- a/app/views/likes/_likes_container.haml +++ b/app/views/likes/_likes_container.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - if likes_count > 0 - = image_tag('icons/pin.png') + = image_tag('icons/heart.png') - if target_type == "Comment" = link_to t('likes.likes.people_like_this_comment', :count => likes_count), comment_likes_path(target_id), :class => "expand_likes" - else diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index ee7a7c095..612ce783c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -369,13 +369,13 @@ en: likes: likes: - people_pin_this: - zero: "no pins" - one: "%{count} pin" - two: "%{count} pins" - few: "%{count} pins" - many: "%{count} pins" - other: "%{count} pins" + people_like_this: + zero: "no likes" + one: "%{count} like" + two: "%{count} likes" + few: "%{count} likes" + many: "%{count} likes" + other: "%{count} likes" people_like_this_comment: zero: "no likes" one: "%{count} like" @@ -428,12 +428,12 @@ en: many: "%{actors} have mentioned you in a %{post_link}." other: "%{actors} have mentioned you in a %{post_link}." liked: - zero: "%{actors} have pinned your %{post_link}." - one: "%{actors} has pinned your %{post_link}." - two: "%{actors} have pinned your %{post_link}." - few: "%{actors} have pinned your %{post_link}." - many: "%{actors} have pinned your %{post_link}." - other: "%{actors} have pinned your %{post_link}." + zero: "%{actors} have liked your %{post_link}." + one: "%{actors} has liked your %{post_link}." + two: "%{actors} have liked your %{post_link}." + few: "%{actors} have liked your %{post_link}." + many: "%{actors} have liked your %{post_link}." + other: "%{actors} have liked your %{post_link}." reshared: zero: "%{actors} have reshared your %{post_link}." one: "%{actors} has reshared your %{post_link}." @@ -450,12 +450,12 @@ en: many: "%{actors} commented on a deleted post." other: "%{actors} commented on a deleted post." liked_post_deleted: - zero: "%{actors} pinned your deleted post." - one: "%{actors} pinned your deleted post." - two: "%{actors} pinned your deleted post." - few: "%{actors} pinned your deleted post." - many: "%{actors} pinned your deleted post." - other: "%{actors} pinned your deleted post." + zero: "%{actors} liked your deleted post." + one: "%{actors} liked your deleted post." + two: "%{actors} liked your deleted post." + few: "%{actors} liked your deleted post." + many: "%{actors} liked your deleted post." + other: "%{actors} liked your deleted post." reshared_post_deleted: zero: "%{actors} reshared your deleted post." one: "%{actors} reshared your deleted post." @@ -512,7 +512,7 @@ en: private_message: reply_to_or_view: "Reply to or view this conversation >" liked: - liked: "%{name} pinned your post" + liked: "%{name} liked your post" view_post: "View post >" reshared: reshared: "%{name} reshared your post" @@ -820,8 +820,8 @@ en: ignore_user: "Ignore %{name}" ignore_user_description: "Ignore and remove user from all aspects?" hide_and_mute: "Hide and mute post" - pin: "Pin" - unpin: "Unpin" + like: "Like" + unlike: "Unlike" dislike: "Dislike" shared_with: "Shared with: %{aspect_names}" nsfw: "This post has been flagged as NSFW by its author. %{link}" @@ -908,8 +908,8 @@ en: contacts_title: "People whose posts you commented on" like_stream: - title: "Pin Stream" - contacts_title: "People whose posts you pinned" + title: "Like Stream" + contacts_title: "People whose posts you like" followed_tag: title: "#Followed Tags" @@ -963,7 +963,7 @@ en: mentioned: "...you are mentioned in a post?" started_sharing: "...someone starts sharing with you?" private_message: "...you receive a private message?" - liked: "...someone pins your post?" + liked: "...someone likes your post?" reshared: "...someone reshares your post?" change: "Change" email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}." diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index 4bcad79c6..6515cc4e5 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -53,7 +53,7 @@ en: many: "In <%= count %> aspects" other: "In <%= count %> aspects" show_more: "show more" - failed_to_like: "Failed to pin!" + failed_to_like: "Failed to like!" failed_to_post_message: "Failed to post message!" comments: show: "show all comments" @@ -78,20 +78,20 @@ en: hide: "Hide" public: "Public" limited: "Limited" - like: "Pin" - unlike: "Unpin" + like: "Like" + unlike: "Unlike" reshare: "Reshare" comment: "Comment" original_post_deleted: "Original post deleted by author." show_post: "Show post" likes: - zero: "<%= count %> Pins" - one: "<%= count %> Pin" - two: "<%= count %> Pins" - few: "<%= count %> Pins" - many: "<%= count %> Pins" - other: "<%= count %> Pins" + zero: "<%= count %> Likes" + one: "<%= count %> Like" + two: "<%= count %> Likes" + few: "<%= count %> Likes" + many: "<%= count %> Likes" + other: "<%= count %> Likes" reshares: zero: "<%= count %> Reshares" diff --git a/public/images/icons/pencil_mobile_grey.png b/public/images/icons/pencil_mobile_grey.png index 2a3c7ad79..da72cc3d4 100644 Binary files a/public/images/icons/pencil_mobile_grey.png and b/public/images/icons/pencil_mobile_grey.png differ diff --git a/public/images/icons/pencil_mobile_grey_active.png b/public/images/icons/pencil_mobile_grey_active.png index 5b3a6dd36..5d4147ea0 100644 Binary files a/public/images/icons/pencil_mobile_grey_active.png and b/public/images/icons/pencil_mobile_grey_active.png differ diff --git a/public/images/icons/pencil_mobile_grey_mobile.png b/public/images/icons/pencil_mobile_grey_mobile.png index 5b3a6dd36..5d4147ea0 100644 Binary files a/public/images/icons/pencil_mobile_grey_mobile.png and b/public/images/icons/pencil_mobile_grey_mobile.png differ diff --git a/public/images/icons/pin.png b/public/images/icons/pin.png deleted file mode 100644 index b4a20ba71..000000000 Binary files a/public/images/icons/pin.png and /dev/null differ diff --git a/public/images/icons/pin_mobile_grey.png b/public/images/icons/pin_mobile_grey.png deleted file mode 100644 index 5a1268d94..000000000 Binary files a/public/images/icons/pin_mobile_grey.png and /dev/null differ diff --git a/public/images/icons/pin_mobile_red.png b/public/images/icons/pin_mobile_red.png deleted file mode 100644 index 64cef63ce..000000000 Binary files a/public/images/icons/pin_mobile_red.png and /dev/null differ diff --git a/public/javascripts/app/templates/likes-info.handlebars b/public/javascripts/app/templates/likes-info.handlebars index 48d3c4f04..b9ef39b4b 100644 --- a/public/javascripts/app/templates/likes-info.handlebars +++ b/public/javascripts/app/templates/likes-info.handlebars @@ -2,7 +2,7 @@
- Heart + Heart
diff --git a/public/stylesheets/sass/mobile.scss b/public/stylesheets/sass/mobile.scss index c0b35d1bb..4dd46de06 100644 --- a/public/stylesheets/sass/mobile.scss +++ b/public/stylesheets/sass/mobile.scss @@ -429,9 +429,9 @@ footer { } .like_action { - background-image: url("/images/icons/pin_mobile_grey.png"); + background-image: url("/images/icons/heart_mobile_grey.png"); &.active { - background-image: url("/images/icons/pin_mobile_red.png"); + background-image: url("/images/icons/heart_mobile_red.png"); } }