diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
| commit | 7f0ae82d44873b53cc87c659b42415ce4866c7b4 (patch) | |
| tree | fdce14b0658bb05aef087dd4e09dc25c9a79ea8c /app/models/info_request_event.rb | |
| parent | 2926ee877bcf8974c529e1271ded42971fe0d632 (diff) | |
| parent | 96c4dd912083edcd0c9eda76bd2301bb4a1a6d53 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop, fix conflicts
Diffstat (limited to 'app/models/info_request_event.rb')
| -rw-r--r-- | app/models/info_request_event.rb | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 4003217b0..4ea89bf81 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -303,37 +303,7 @@ class InfoRequestEvent < ActiveRecord::Base def display_status if is_incoming_message? status = self.calculated_state - if !status.nil? - if status == 'waiting_response' - return _("Acknowledgement") - elsif status == 'waiting_clarification' - return _("Clarification required") - elsif status == 'gone_postal' - return _("Handled by post") - elsif status == 'deadline_extended' - return _("Deadline Extended") - elsif status == 'wrong_response' - return _("Wrong Response") - elsif status == 'not_held' - return _("Information not held") - elsif status == 'rejected' - return _("Refused") - elsif status == 'partially_successful' - return _("Some information sent") - elsif status == 'successful' - return _("All information sent") - elsif status == 'internal_review' - return _("Internal review acknowledgement") - elsif status == 'user_withdrawn' - return _("Withdrawn by requester") - elsif status == 'error_message' - return _("Delivery error") - elsif status == 'requires_admin' - return _("Unusual response") - end - raise "unknown status " + status - end - return "Response" + return status.nil? ? _("Response") : InfoRequest.get_status_description(status) end if is_outgoing_message? |