1.1 --- a/model/event.lua	Sat Mar 09 19:13:55 2013 +0100
     1.2 +++ b/model/event.lua	Sat Mar 09 19:19:44 2013 +0100
     1.3 @@ -45,20 +45,7 @@
     1.4  end
     1.5    
     1.6  function Event.object_get:state_name()
     1.7 -  return ({
     1.8 -    admission = _"New",
     1.9 -    discussion = _"Discussion",
    1.10 -    verification = _"Frozen",
    1.11 -    voting = _"Voting",
    1.12 -    canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)",
    1.13 -    canceled_issue_not_accepted = _"Cancelled (issue not accepted)",
    1.14 -    canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)",
    1.15 -    canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)",
    1.16 -    calculation = _"Calculation",
    1.17 -    canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)",
    1.18 -    finished_without_winner = _"Finished (without winner)",
    1.19 -    finished_with_winner = _"Finished (with winner)"
    1.20 -  })[self.state]
    1.21 +  return Issue:get_state_name_for_state(self.state)
    1.22  end
    1.23    
    1.24  function Event.object:send_notification()

     2.1 --- a/model/issue.lua	Sat Mar 09 19:13:55 2013 +0100
     2.2 +++ b/model/issue.lua	Sat Mar 09 19:19:44 2013 +0100
     2.3 @@ -185,18 +185,28 @@
     2.4    initiatives:load_everything_for_member_id(member_id)
     2.5  end
     2.6  
     2.7 +
     2.8 +
     2.9  function Issue:get_state_name_for_state(value)
    2.10    local state_name_table = {
    2.11 -    admission    = _"New",
    2.12 -    discussion   = _"Discussion",
    2.13 +    admission = _"New",
    2.14 +    discussion = _"Discussion",
    2.15      verification = _"Frozen",
    2.16 -    voting       = _"Voting",
    2.17 -    finished     = _"Finished",
    2.18 -    cancelled    = _"Cancelled"
    2.19 +    voting = _"Voting",
    2.20 +    canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)",
    2.21 +    canceled_issue_not_accepted = _"Cancelled (issue not accepted)",
    2.22 +    canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)",
    2.23 +    canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)",
    2.24 +    calculation = _"Calculation",
    2.25 +    canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)",
    2.26 +    finished_without_winner = _"Finished (without winner)",
    2.27 +    finished_with_winner = _"Finished (with winner)"
    2.28    }
    2.29    return state_name_table[value] or value or ''
    2.30  end
    2.31  
    2.32 +
    2.33 +
    2.34  function Issue:get_search_selector(search_string)
    2.35    return self:new_selector()
    2.36      :join('"initiative"', nil, '"initiative"."issue_id" = "issue"."id"')