# HG changeset patch # User bsw # Date 1266757751 -3600 # Node ID 81586ea68d57d5d06fd590a84a88e6bf371d5eaf # Parent e04122245a4434f77b407a10dd6db9ace777e859 Minor bugfixes app/main/initiative/_list.lua: Replaced single by optional object mode locale/translations.de.lua: Consistent translation app/main/initiative/_show.lua: Added missing case "not approved" in voting info box app/main/initiative/_show_voting.lua: Added link to initiative app/main/initiative/_show_voting.lua: Added missing argument for link app/main/member/show_tab.lua: Added outgoing argument to show outgoing delegations correctly diff -r e04122245a44 -r 81586ea68d57 app/main/initiative/_list.lua --- a/app/main/initiative/_list.lua Sun Feb 21 13:09:00 2010 +0100 +++ b/app/main/initiative/_list.lua Sun Feb 21 14:09:11 2010 +0100 @@ -30,7 +30,7 @@ winning_initiative = Initiative:new_selector() :add_where{ "issue_id = ?", issue.id } :add_where("rank = 1") - :single_object_mode() + :optional_object_mode() :exec() if winning_initiative then show_for_initiative = winning_initiative diff -r e04122245a44 -r 81586ea68d57 app/main/initiative/_show.lua --- a/app/main/initiative/_show.lua Sun Feb 21 13:09:00 2010 +0100 +++ b/app/main/initiative/_show.lua Sun Feb 21 14:09:11 2010 +0100 @@ -23,6 +23,8 @@ slot.put(_"Approved") elseif initiative.rank then slot.put(_("Not approved (rank #{rank})", { rank = initiative.rank })) + else + slot.put(_"Not approved") end slot.put("") end diff -r e04122245a44 -r 81586ea68d57 app/main/initiative/_show_voting.lua --- a/app/main/initiative/_show_voting.lua Sun Feb 21 13:09:00 2010 +0100 +++ b/app/main/initiative/_show_voting.lua Sun Feb 21 14:09:11 2010 +0100 @@ -86,7 +86,14 @@ end }, { - name = "name" + content = function(record) + ui.link{ + module = "initiative", + view = "show", + id = record.id, + text = record.name + } + end } } } diff -r e04122245a44 -r 81586ea68d57 app/main/member/show_tab.lua --- a/app/main/member/show_tab.lua Sun Feb 21 13:09:00 2010 +0100 +++ b/app/main/member/show_tab.lua Sun Feb 21 14:09:11 2010 +0100 @@ -76,7 +76,7 @@ icon = { static = "icons/16/table_go.png" }, module = "delegation", view = "_list", - params = { delegations_selector = outgoing_delegations_selector }, + params = { delegations_selector = outgoing_delegations_selector, outgoing = true }, }, { name = "contacts", diff -r e04122245a44 -r 81586ea68d57 locale/translations.de.lua --- a/locale/translations.de.lua Sun Feb 21 13:09:00 2010 +0100 +++ b/locale/translations.de.lua Sun Feb 21 14:09:11 2010 +0100 @@ -78,7 +78,7 @@ ["Change name"] = "Name ändern"; ["Change order"] = "Sortierung ändern"; ["Change password"] = "Kennwort ändern"; -["Change vote"] = "Wahl ändern"; +["Change vote"] = "Abstimmung ändern"; ["Change your login"] = "Deinen Anmeldenamen ändern"; ["Change your name"] = "Deinen Namen ändern"; ["Change your password"] = "Dein Kennwort ändern";