aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-11-03 21:48:01 +0000
committerfrancis <francis>2008-11-03 21:48:01 +0000
commitb288061a94ecadfd8c4a73da70b37f15b529184d (patch)
tree801768848eb6d82b52a90fb05cfb09b73b447579
parent9baeea85ce25fca200e68d095651f54bb368043f (diff)
Whoops - don't use and if not more than 1!
-rw-r--r--app/models/public_body.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 806fbea6f..032af9820 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -24,7 +24,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.119 2008-11-03 21:34:52 francis Exp $
+# $Id: public_body.rb,v 1.120 2008-11-03 21:48:01 francis Exp $
require 'csv'
require 'set'
@@ -260,7 +260,10 @@ class PublicBody < ActiveRecord::Base
end
if types.size > 0
ret = types[0, types.size - 1].join(", ")
- ret = ret + " and " + types[-1]
+ if types.size > 1
+ ret = ret + " and "
+ end
+ ret = ret + types[-1]
return ret
else
return "A public authority"