Rename friendship_notification to follow_notification

diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index 09a98f98f92314fbaf892a2049c12660dd1afefc..0d8ee272a77a78c8d499e093e632715611827fa6 100644 (file)
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -26,7 +26,7 @@ class FollowsController < ApplicationController
       flash[:error] = t ".limit_exceeded"
     elsif follow.save
       flash[:notice] = t ".success", :name => @friend.display_name
       flash[:error] = t ".limit_exceeded"
     elsif follow.save
       flash[:notice] = t ".success", :name => @friend.display_name

-      UserMailer.friendship_notification(follow).deliver_later
+      UserMailer.follow_notification(follow).deliver_later

     else
       follow.add_error(t(".failed", :name => @friend.display_name))
     end
     else
       follow.add_error(t(".failed", :name => @friend.display_name))
     end

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index fea73c710cdaf1057526d653cfad4d6844fff972..6098162852039a0078c927b7fce5b717e681196c 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -119,7 +119,7 @@ class UserMailer < ApplicationMailer
     end
   end
 
     end
   end
 

-  def friendship_notification(follow)
+  def follow_notification(follow)

     with_recipient_locale follow.following do
       @follow = follow
       @viewurl = user_url(@follow.follower)
     with_recipient_locale follow.following do
       @follow = follow
       @viewurl = user_url(@follow.follower)

diff --git a/app/views/user_mailer/friendship_notification.html.erb b/app/views/user_mailer/follow_notification.html.erb
similarity index 100%
rename from app/views/user_mailer/friendship_notification.html.erb
rename to app/views/user_mailer/follow_notification.html.erb

diff --git a/app/views/user_mailer/friendship_notification.text.erb b/app/views/user_mailer/follow_notification.text.erb
similarity index 100%
rename from app/views/user_mailer/friendship_notification.text.erb
rename to app/views/user_mailer/follow_notification.text.erb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e887a71aadf2c4748a18a9ad2fc432d91d604721..510ee218c0acdc4fe924a55e43fe0dd75a7b339b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1661,7 +1661,7 @@ en:
       header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"

-    friendship_notification:
+    follow_notification:

       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} followed you"
       followed_you: "%{user} is now following you on OpenStreetMap."
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} followed you"
       followed_you: "%{user} is now following you on OpenStreetMap."