aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-09-19 11:19:09 +0100
committerGareth Rees <gareth@mysociety.org>2014-09-19 17:24:37 +0100
commit01d8002fdac72d70dd027ea7e0fa2260763752c3 (patch)
treed2e7c450e5a17546c4aecf444b575b064765eae8
parent131c8d01834c07337ec5a10cafe4663e33165c26 (diff)
Group class methods before instance methods
-rw-r--r--app/models/outgoing_message.rb24
1 files changed, 12 insertions, 12 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 649f395b6..4ca94e7d4 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -59,6 +59,18 @@ class OutgoingMessage < ActiveRecord::Base
self.default_url_options[:protocol] = "https"
end
+ def self.default_salutation(public_body)
+ _("Dear {{public_body_name}},", :public_body_name => public_body.name)
+ end
+
+ def self.placeholder_salutation
+ _("Dear [Authority name],")
+ end
+
+ def self.fill_in_salutation(body, public_body)
+ body.gsub(placeholder_salutation, default_salutation(public_body))
+ end
+
# How the default letter starts and ends
def get_salutation
if info_request.is_batch_request_template?
@@ -78,18 +90,6 @@ class OutgoingMessage < ActiveRecord::Base
salutation = _("Dear {{public_body_name}},", :public_body_name => ret)
end
- def OutgoingMessage.default_salutation(public_body)
- _("Dear {{public_body_name}},", :public_body_name => public_body.name)
- end
-
- def OutgoingMessage.placeholder_salutation
- _("Dear [Authority name],")
- end
-
- def OutgoingMessage.fill_in_salutation(body, public_body)
- body.gsub(placeholder_salutation, default_salutation(public_body))
- end
-
def get_signoff
if message_type == 'followup' &&
!incoming_message_followup.nil? &&