Fix new rubocop warnings

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

diff --git a/app/helpers/notifier_helper.rb b/app/helpers/notifier_helper.rb
index dbd2d245d0dbfbccafaaef5a9af7a33188076f0f..c18f79903ab52d2155a0a4550f6f1b4742461e05 100644 (file)
--- a/app/helpers/notifier_helper.rb
+++ b/app/helpers/notifier_helper.rb
@@ -5,15 +5,15 @@ module NotifierHelper
 
   def link_to_user(display_name)
     link_to(
 
   def link_to_user(display_name)
     link_to(

-      content_tag(
-        "strong",
+      tag.strong(

         display_name,
         # NB we need "text-decoration: none" twice: GMail only honours it on
         # the <a> but Outlook only on the <strong>
         :style => "text-decoration: none"
       ),
         display_name,
         # NB we need "text-decoration: none" twice: GMail only honours it on
         # 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 +29,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