Some other bits of EIR text.

3 files changed, 11 insertions, 7 deletions

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index c13f7d08f..d2db89d62 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -21,7 +21,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: public_body.rb,v 1.73 2008-05-27 01:19:45 francis Exp $
+# $Id: public_body.rb,v 1.74 2008-05-27 01:25:09 francis Exp $
 
 require 'csv'
 require 'set'
@@ -160,6 +160,13 @@ class PublicBody < ActiveRecord::Base
     def eir_only?
         return self.has_tag?('eir_only')
     end
+    def law_only_short
+        if self.eir_only?
+            return "EIR"
+        else
+            return "FOI"
+        end
+    end
 
 
     class ImportCSVDryRun < StandardError
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index c63886071..3d4e782af 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -21,7 +21,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: track_thing.rb,v 1.23 2008-05-21 10:51:24 francis Exp $
+# $Id: track_thing.rb,v 1.24 2008-05-27 01:25:09 francis Exp $
 
 class TrackThing < ActiveRecord::Base
     belongs_to :tracking_user, :class_name => 'User'
@@ -159,8 +159,8 @@ class TrackThing < ActiveRecord::Base
                     :verb_on_page => "Be told about new requests to this public authority",
                     :verb_on_page_already => "being told about new requests to this public authority",
                     # Email
-                    :title_in_email => "New FOI requests to '" + self.public_body.name + "'",
-                    :title_in_rss => "New FOI requests to '" + self.public_body.name + "'",
+                    :title_in_email => "New " + self.public_body.law_only_short + " requests to '" + self.public_body.name + "'",
+                    :title_in_rss => "New " + self.public_body.law_only_short + " requests to '" + self.public_body.name + "'",
                     # Authentication
                     :web => "To be told about new requests to the public authority '" + CGI.escapeHTML(self.public_body.name) + "'",
                     :email => "Then you will be emailed whenever someone requests something from '" + CGI.escapeHTML(self.public_body.name) + "'.",
diff --git a/todo.txt b/todo.txt
index bd697d8c4..23b9d5a00 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,3 @@
-EIR:
-app/models/track_thing.rb:
-
 FOI requests to use to test it
 ==============================