@@ -3,6 +3,7 @@ Edge * Replaced own sharing code by acts_as_shareable plugin. Please, install acts_as_shareable and it's migration before running plugins migrations. * Acts_as_state_machine code replaced by AASM gem +* Better messages for bidirectional friendships 0.5.4 ---- CHANGELOG.md @@ -4,12 +4,12 @@ class Member::FriendshipsController < Member::BaseController def add_friend if @friend.add_follower(current_user.profile) - flash[:ok]=I18n.t("tog_social.friendships.member.friend.added", :friend_name => @friend.full_name) + flash[:ok]=I18n.t("tog_social.friendships.member.friend.request", :friend_name => @friend.full_name) Message.new( :from => current_user, :to => @friend.user, - :subject => I18n.t("tog_social.friendships.member.mail.add_friend.subject", :user_name => current_user.profile.full_name), - :content => I18n.t("tog_social.friendships.member.mail.add_friend.content", + :subject => I18n.t("tog_social.friendships.member.mail.request_friend.subject", :user_name => current_user.profile.full_name), + :content => I18n.t("tog_social.friendships.member.mail.request_friend.content", :user_name => current_user.profile.full_name, :friend_name => @friend.full_name, :user_profile_url => profile_url(current_user.profile) , app/controllers/member/friendships_controller.rb @@ -169,7 +169,7 @@ en: followed: You are now following '{{user_name}}' unfollowed: You aren't following '{{user_name}}' anymore friend: - added: "You have added {{friend_name}} as your contact" + request: "You have requested {{friend_name}} to be your contact." confirmed: "You have confirmed your friendship with {{friend_name}}" mail: follow: @@ -178,9 +178,9 @@ en: unfollow: subject: "{{user_name}} isn't following you anymore!" content: "Hi {{friend_name}}, {{user_name}} has stopped to following you. Check out {{user_name}}'s profile here: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" - add_friend: - subject: "You are the newest contact of {{user_name}}!" - content: "Hi {{friend_name}}, {{user_name}} has marked you as a contact. Check out {{user_name}}'s profile here: <a href='{{user_profile_url}}'>{{user_profile_url}}</a> To confirm yours friendship you can visit: <a href='{{confirm_url}}'>{{confirm_url}}</a>" + request_friend: + subject: "{{user_name}} has requested to be your contact!" + content: "Hi {{friend_name}}, {{user_name}} has add you as a contact. Check out {{user_name}}'s profile here: <a href='{{user_profile_url}}'>{{user_profile_url}}</a> To confirm yours friendship you can visit: <a href='{{confirm_url}}'>{{confirm_url}}</a>Just ignore this message if you are not interested" confirm_friend: - subject: "{{user_name}} has confirmed yours friendship!" - content: "Hi {{friend_name}}, {{user_name}} has marked you as a contact too. Check out {{user_name}}'s profile here: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" \ No newline at end of file + subject: "{{user_name}} has confirmed your friendship!" + content: "Hi {{friend_name}}, {{user_name}} has confirmed you as his/her contact. Check out {{user_name}}'s profile here: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" \ No newline at end of file locale/tog_social.yml @@ -169,7 +169,7 @@ es: followed: Ahora sigues a '{{user_name}}' unfollowed: Has dejado de seguir a '{{user_name}}' friend: - added: "Has añadido a {{friend_name}} como tu contacto" + request: "Has solicitado a {{friend_name}} ser tu contacto" confirmed: "Has confirmado a {{friend_name}} como tu contacto" mail: follow: @@ -178,9 +178,9 @@ es: unfollow: subject: "¡{{user_name}} ha dejado de seguirte!" content: "Hola {{friend_name}}, {{user_name}} ha dejado de seguirte. Consulta el perfil de {{user_name}} aquí: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" - add_friend: - subject: "¡Eres el contacto más reciente de {{user_name}}!" - content: "Hola {{friend_name}}, {{user_name}} te ha añadido como contacto. Puedes ver el perfil de {{user_name}} aquí: <a href='{{user_profile_url}}'>{{user_profile_url}}</a> Para añadirlo como contacto visita: <a href='{{confirm_url}}'>{{confirm_url}}</a>" + request_friend: + subject: "¡{{user_name}} ha solicitado ser tu contacto!" + content: "Hola {{friend_name}}, {{user_name}} ha solicitad ser tu contacto. Puedes ver el perfil de {{user_name}} aquí: <a href='{{user_profile_url}}'>{{user_profile_url}}</a> Para añadirlo como contacto visita: <a href='{{confirm_url}}'>{{confirm_url}}</a>Si no estas interesado simplemente ignora este mensaje" confirm_friend: subject: "¡{{user_name}} te ha confirmado como contacto!" - content: "Hola {{friend_name}}, {{user_name}} también te ha añadido como contacto. Puedes ver el perfil de {{user_name}} aquí: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" + content: "Hola {{friend_name}}, {{user_name}} te ha confirmado como contacto. Puedes ver el perfil de {{user_name}} aquí: <a href='{{user_profile_url}}'>{{user_profile_url}}</a>" locale/tog_social_es.yml @@ -24,10 +24,10 @@ class Member::FriendshipsControllerTest < ActionController::TestCase should "send an info message" do assert_equal 1, @chavez.inbox.messages.count - assert_equal I18n.t("tog_social.friendships.member.mail.add_friend.subject", :user_name => @berlusconi.profile.full_name), @chavez.inbox.messages.first.subject + assert_equal I18n.t("tog_social.friendships.member.mail.request_friend.subject", :user_name => @berlusconi.profile.full_name), @chavez.inbox.messages.first.subject end - should_set_the_flash_to I18n.t("tog_social.friendships.member.friend.added", :friend_name => "chavez") + should_set_the_flash_to I18n.t("tog_social.friendships.member.friend.request", :friend_name => "chavez") end context "on POST to :confirm_friend" do test/functional/member/friendships_controller_test.rb a1a3223dcc3a75f5a61674f7dab75cb51c39b5bc molpe alberto.molpeceres@gmail.com http://github.com/tog/tog_social/commit/4daa7af26f91ed3b1ca206bf031c6182e26bef1b 4daa7af26f91ed3b1ca206bf031c6182e26bef1b

2009-11-02T04:43:30-08:00

Better messages for bidirectional friendships 977cf36996577bd0a0cc71faadf51937aa149d94 molpe alberto.molpeceres@gmail.com