Merge remote-tracking branch 'upstream/pull/2381'

[rails.git] / app / helpers / notifier_helper.rb

diff --git a/app/helpers/notifier_helper.rb b/app/helpers/notifier_helper.rb
index dbd2d245d0dbfbccafaaef5a9af7a33188076f0f..cc99898aa7b78ebe8e8121aec7e3aceaa86979bf 100644 (file)
--- a/app/helpers/notifier_helper.rb
+++ b/app/helpers/notifier_helper.rb
@@ -12,8 +12,9 @@ module NotifierHelper
         # the <a> but Outlook only on the <strong>
         :style => "text-decoration: none"
       ),
         # the <a> but Outlook only on the <strong>
         :style => "text-decoration: none"
       ),

-      user_url(display_name, :host => SERVER_URL),
+      user_url(display_name, :host => Settings.server_url),

       :target => "_blank",
       :target => "_blank",

+      :rel => "noopener",

       :style => "text-decoration: none; color: #222"
     )
   end
       :style => "text-decoration: none; color: #222"
     )
   end


@@ -29,6 +30,14 @@ module NotifierHelper
     # Because we can't use stylesheets in HTML emails, we need to inline the
     # styles. Rather than copy-paste the same string of CSS into every message,
     # we apply it once here, after the message has been composed.
     # Because we can't use stylesheets in HTML emails, we need to inline the
     # styles. Rather than copy-paste the same string of CSS into every message,
     # we apply it once here, after the message has been composed.

-    html.gsub /<p>/, '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">'
+    html.gsub(/<p>/, '<p style="color: black; margin: 0.75em 0; font-family: \'Helvetica Neue\', Arial, Sans-Serif">')
+  end
+
+  def style_left
+    I18n.t("html.dir") == "ltr" ? "left" : "right"
+  end
+
+  def style_right
+    I18n.t("html.dir") == "ltr" ? "right" : "left"

   end
 end
   end
 end