Merge branch 'release/0.5' into wdtk

Conflicts:
	.gitignore

1 files changed, 14 insertions, 13 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 92322f74f..cfef6ebd8 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,3 +1,4 @@
+
 # == Schema Information
 # Schema version: 95
 #
@@ -240,19 +241,19 @@ public
         # into some sort of separate jurisdiction dependent file
         if self.public_body.url_name == 'general_register_office'
             # without GQ in the subject, you just get an auto response
-            self.law_used_full + ' request GQ - ' + self.title
+            _('{{law_used_full}} request GQ - {{title}}',:law_used_full=>self.law_used_full,:title=>self.title)
         else
-            self.law_used_full + ' request - ' + self.title
+            _('{{law_used_full}} request - {{title}}',:law_used_full=>self.law_used_full,:title=>self.title)
         end
     end
     def email_subject_followup(incoming_message = nil)
         if incoming_message.nil? || !incoming_message.valid_to_reply_to?
             'Re: ' + self.email_subject_request
         else
-            if incoming_message.mail.subject.match(/^Re:/i)
-                incoming_message.mail.subject
+            if incoming_message.subject.match(/^Re:/i)
+                incoming_message.subject
             else
-                'Re: ' + incoming_message.mail.subject
+                'Re: ' + incoming_message.subject
             end
         end
     end
@@ -260,36 +261,36 @@ public
     # Two sorts of laws for requests, FOI or EIR 
     def law_used_full
         if self.law_used == 'foi'
-            return "Freedom of Information"
+            return _("Freedom of Information")
         elsif self.law_used == 'eir'
-            return "Environmental Information Regulations"
+            return _("Environmental Information Regulations")
         else
             raise "Unknown law used '" + self.law_used + "'"
         end
     end
     def law_used_short
         if self.law_used == 'foi'
-            return "FOI"
+            return _("FOI")
         elsif self.law_used == 'eir'
-            return "EIR"
+            return _("EIR")
         else
             raise "Unknown law used '" + self.law_used + "'"
         end
     end
     def law_used_act
         if self.law_used == 'foi'
-            return "Freedom of Information Act"
+            return _("Freedom of Information Act")
         elsif self.law_used == 'eir'
-            return "Environmental Information Regulations"
+            return _("Environmental Information Regulations")
         else
             raise "Unknown law used '" + self.law_used + "'"
         end
     end
     def law_used_with_a
         if self.law_used == 'foi'
-            return "A Freedom of Information request"
+            return _("A Freedom of Information request")
         elsif self.law_used == 'eir'
-            return "An Environmental Information Regulations request"
+            return _("An Environmental Information Regulations request")
         else
             raise "Unknown law used '" + self.law_used + "'"
         end