2017 refactor

app/views/user_mailer/contact.html.haml

@@ -1,5 +1,5 @@
-%h1 From
-%p=@from.is_a?(User) ? @from.named_email : @from
+%h1=_!'From'
+%p=_!(@from.is_a?(User) ? @from.named_email : @from)
 
-%h1 Message
-%blockquote=markdown(@message)
+%h1=_!'Message'
+%blockquote=_!markdown(@message)

app/views/user_mailer/contact_details.html.haml

@@ -1,46 +1,46 @@
-%h1 From
+%h1=_!('From')
 %table.error-report
   %tr
-    %th Key
-    %th Value
+    %th=_!'Key'
+    %th=_!'Value'
   %tr
-    %td User ID
-    %td=@from.is_a?(User) ? @from.id : ''
+    %td=_!'User ID'
+    %td=_!(@from.is_a?(User) ? @from.id : '')
   %tr
-    %td User Name
-    %td=@from.is_a?(User) ? @from.name : ''
+    %td=_!'User Name'
+    %td=_!(@from.is_a?(User) ? @from.name : '')
   %tr
-    %td User Email
-    %td=@from.is_a?(User) ? @from.email : @from
+    %td=_!'User Email'
+    %td=_!(@from.is_a?(User) ? @from.email : @from)
   %tr
-    %td IP Address
-    %td=@request['remote_ip']
+    %td=_!'IP Address'
+    %td=_!@request['remote_ip']
   %tr
-    %td UUID
-    %td=@request['uuid']
+    %td=_!'UUID'
+    %td=_!@request['uuid']
   %tr
-    %td URL
-    %td=@request['original_url'] 
+    %td=_!'URL'
+    %td=_!@request['original_url'] 
 
-%h1 Message
-%blockquote=markdown(@message)
+%h1=_!'Message'
+%blockquote=_!markdown(@message)
 
-%h1 Params
+%h1=_!'Params'
 %table.error-report
   %tr
-    %th Key
-    %th Value
+    %th=_!'Key'
+    %th=_!'Value'
   - @params.each do | key, value |
     %tr
-      %td=key
-      %td=value
+      %td=_!key
+      %td=_!value
 
-%h1 Request Environment
+%h1=_!'Request Environment'
 %table.error-report
   %tr
-    %th Key
-    %th Value
+    %th=_!'Key'
+    %th=_!'Value'
   - @request['env'].each do | key, value |
     %tr
-      %td=key
-      %td=value
+      %td=_!key
+      %td=_!value

app/views/user_mailer/email_confirmation.html.haml

@@ -1,6 +1,5 @@
 %p=_'email.confirmation.paragraph.please_confirm','Hello! To gain access to registration and other features of Bike!Bike!, please confirm your email address by clicking on following link:'
-- link = "#{@host}/confirm/#{@confirmation.token}"
 %p
   %h3
     %b
-      %a{href: link}=_'email.confirmation.link.please_confirm'
+      %a{href: confirm_url(@confirmation.token)}=_'email.confirmation.link.please_confirm'

app/views/user_mailer/workshop_comment.html.haml

@@ -11,5 +11,5 @@
 
 %p
   =_'email.workshop.paragraph.view_workshop'
-  - workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
-  %a{href: workshop_link}=workshop_link
+  - workshop_link = view_workshop_url(@workshop.conference.slug, @workshop.id)
+  %a{href: workshop_link}=_!(workshop_link)

app/views/user_mailer/workshop_facilitator_request.html.haml

@@ -1,10 +1,10 @@
 %p=_'email.workshop.paragraph.request_message',"Below is a message from #{@requester.firstname}:", :vars => {:workshop_title => @workshop.title, :user_name => @requester.name}
 
-%blockquote=CGI::escapeHTML(@message || '').gsub(/\n/, '<br>').html_safe
+%blockquote=_!(CGI::escapeHTML(@message || '').gsub(/\n/, '<br>'))
 
 %p
   =_'email.workshop.paragraph.request_instructions',"You can approve or deny this request on your workshop page: "
-  - workshop_link = @host + view_workshop_path(@conference.slug, @workshop.id)
-  %a{href: workshop_link}=workshop_link
+  - workshop_link = @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
+  %a{href: workshop_link}=_!(workshop_link)
 
 %p=_'email.workshop.paragraph.request_reply_instructions',"You can also reply directly to this email to ask follow-up questions."

app/views/user_mailer/workshop_facilitator_request_approved.html.haml

@@ -1,4 +1,4 @@
 %p
-	- workshop_link = link_to (_!@workshop.title), @host + view_workshop_path(@conference.slug, @workshop.id).html_safe
-	=_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link}.", :vars => {:workshop_title => workshop_link}
+  - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id)
+  =_'email.workshop.paragraph.request_approved',"You have been added as a facilitator of #{workshop_link.html_safe}.", vars: {workshop_title: workshop_link.html_safe}
 

app/views/user_mailer/workshop_facilitator_request_denied.html.haml

@@ -1,3 +1,3 @@
 %p
-	- workshop_link = link_to (_!@workshop.title), @host + view_workshop_path(@conference.slug, @workshop.id).html_safe
-	=_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", :vars => {:workshop_title => workshop_link}
+  - workshop_link = link_to (_!@workshop.title), @host + view_workshop_url(@conference.slug, @workshop.id).html_safe
+  =_'email.workshop.paragraph.request_denied',"Your request to become a facilitator of #{workshop_link} has been denied. If you think this was in error, you may contact the current facilitators by making another request to facilitate.", vars: {workshop_title: workshop_link.html_safe}

app/views/user_mailer/workshop_translated.html.haml

@@ -10,5 +10,5 @@
 
 %p
   =_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
-  - workshop_link = @host + view_workshop_path(@workshop.conference.slug, @workshop.id)
-  %a{href: workshop_link}=workshop_link
+  - workshop_link = @host + view_workshop_url(@workshop.conference.slug, @workshop.id)
+  %a{href: workshop_link}=_!(workshop_link)

app/views/user_mailer/workshop_translated.text.haml

@@ -1,25 +0,0 @@
-=_('email.translations.paragraph.workshop_translated', "#{@translator.firstname} has modified the #{@locale_name} translation for #{@workshop.title}.", vars: {user_name: @translator.firstname, language: @locale_name, workshop_title: @workshop.title})
-
-
-- @data.each do |field, values|
-  =(_!'** ') + (_"forms.labels.generic.#{field.to_s}")
-  =(_!' - ') + (_'email.translations.headings.new_value')
-  =(_!' ------------------------------ ')
-  =_!values[:new]
-  =(_!' ------------------------------ ')
-
-
-  =(_!' - ') + (_'email.translations.headings.old_value')
-  =(_!' ------------------------------ ')
-  =_!values[:old]
-  =(_!' ------------------------------ ')
-
-
-  =(_!' - ') + (_'email.translations.headings.diff')
-  =(_!' ------------------------------ ')
-  =(_!values[:diff][:text])
-  =(_!' ------------------------------ ')
-
-
-=_'email.workshop.paragraph.view_workshop',"You can view the workshop here: "
-= view_workshop_path(@workshop.conference.slug, @workshop.id)