# HG changeset patch # User bsw # Date 1362853184 -3600 # Node ID 9fbbd04ea8891a10b720e751d362d85b0c01837b # Parent a8c6e80cdf5de23c559638e6ab871a026302daa9 Fixed not translated state strings diff -r a8c6e80cdf5d -r 9fbbd04ea889 model/event.lua --- a/model/event.lua Sat Mar 09 19:13:55 2013 +0100 +++ b/model/event.lua Sat Mar 09 19:19:44 2013 +0100 @@ -45,20 +45,7 @@ end function Event.object_get:state_name() - return ({ - admission = _"New", - discussion = _"Discussion", - verification = _"Frozen", - voting = _"Voting", - canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)", - canceled_issue_not_accepted = _"Cancelled (issue not accepted)", - canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)", - canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)", - calculation = _"Calculation", - canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)", - finished_without_winner = _"Finished (without winner)", - finished_with_winner = _"Finished (with winner)" - })[self.state] + return Issue:get_state_name_for_state(self.state) end function Event.object:send_notification() diff -r a8c6e80cdf5d -r 9fbbd04ea889 model/issue.lua --- a/model/issue.lua Sat Mar 09 19:13:55 2013 +0100 +++ b/model/issue.lua Sat Mar 09 19:19:44 2013 +0100 @@ -185,18 +185,28 @@ initiatives:load_everything_for_member_id(member_id) end + + function Issue:get_state_name_for_state(value) local state_name_table = { - admission = _"New", - discussion = _"Discussion", + admission = _"New", + discussion = _"Discussion", verification = _"Frozen", - voting = _"Voting", - finished = _"Finished", - cancelled = _"Cancelled" + voting = _"Voting", + canceled_revoked_before_accepted = _"Cancelled (before accepted due to revocation)", + canceled_issue_not_accepted = _"Cancelled (issue not accepted)", + canceled_after_revocation_during_discussion = _"Cancelled (during discussion due to revocation)", + canceled_after_revocation_during_verification = _"Cancelled (during verification due to revocation)", + calculation = _"Calculation", + canceled_no_initiative_admitted = _"Cancelled (no initiative admitted)", + finished_without_winner = _"Finished (without winner)", + finished_with_winner = _"Finished (with winner)" } return state_name_table[value] or value or '' end + + function Issue:get_search_selector(search_string) return self:new_selector() :join('"initiative"', nil, '"initiative"."issue_id" = "issue"."id"')