# HG changeset patch
# User bsw
# Date 1266955750 -3600
# Node ID a6caaff472051e090ed9d1301c91da2c3518fd22
# Parent abcac05b10912ba163a3f73424141dda58a8f0d5
Report view for all closed issues added
diff -r abcac05b1091 -r a6caaff47205 app/main/_layout/report.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/_layout/report.html Tue Feb 23 21:09:10 2010 +0100
@@ -0,0 +1,65 @@
+
+
+
+ <!-- WEBMCP SLOTNODIV app_name -->
+
+
+
+
+
+
+
+
+
+
+
diff -r abcac05b1091 -r a6caaff47205 app/main/initiative/_battles.lua
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/initiative/_battles.lua Tue Feb 23 21:09:10 2010 +0100
@@ -0,0 +1,99 @@
+local initiative = param.get("initiative", "table")
+
+if not initiative.issue.closed then
+ return
+end
+
+local battled_initiatives = Initiative:new_selector()
+ :add_field("winning_battle.count", "winning_count")
+ :add_field("losing_battle.count", "losing_count")
+ :join("battle", "winning_battle", { "winning_battle.winning_initiative_id = ? AND winning_battle.losing_initiative_id = initiative.id", initiative.id })
+ :join("battle", "losing_battle", { "losing_battle.losing_initiative_id = ? AND losing_battle.winning_initiative_id = initiative.id", initiative.id })
+ :add_order_by("rank")
+ :exec()
+
+
+local number_of_initiatives = Initiative:new_selector()
+ :add_where{ "issue_id = ?", initiative.issue_id }
+ :add_where("admitted")
+ :count()
+
+if number_of_initiatives > 1 then
+ ui.container{
+ attr = { class = "heading first" },
+ content = _"This initiative compared to alternative initiatives"
+ }
+
+ ui.list{
+ records = battled_initiatives,
+ columns = {
+ {
+ content = function()
+ slot.put(_"This initiative")
+ end
+ },
+ {
+ content = function(record)
+ local population = initiative.issue.voter_count
+ local value = record.winning_count
+ ui.bargraph{
+ class = "bargraph bargraph50",
+ max_value = population,
+ width = 50,
+ bars = {
+ { color = "#aaa", value = population - value },
+ { color = "#444", value = value },
+ }
+ }
+ end
+ },
+ {
+ content = function(record)
+ slot.put(record.winning_count)
+ end
+ },
+ {
+ content = function(record)
+ if record.winning_count == record.losing_count then
+ ui.image{ static = "icons/16/bullet_blue.png" }
+ elseif record.winning_count > record.losing_count then
+ ui.image{ static = "icons/16/resultset_previous.png" }
+ else
+ ui.image{ static = "icons/16/resultset_next.png" }
+ end
+ end
+ },
+ {
+ field_attr = { style = "text-align: right;" },
+ content = function(record)
+ slot.put(record.losing_count)
+ end
+ },
+ {
+ content = function(record)
+ local population = initiative.issue.voter_count
+ local value = record.losing_count
+ ui.bargraph{
+ class = "bargraph bargraph50",
+ max_value = population,
+ width = 50,
+ bars = {
+ { color = "#444", value = value },
+ { color = "#aaa", value = population - value },
+ }
+ }
+ end
+ },
+ {
+ content = function(record)
+ ui.link{
+ module = "initiative",
+ view = "show",
+ id = record.id,
+ text = record.name
+ }
+ end
+ }
+ }
+ }
+end
diff -r abcac05b1091 -r a6caaff47205 app/main/initiative/_show_voting.lua
--- a/app/main/initiative/_show_voting.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/app/main/initiative/_show_voting.lua Tue Feb 23 21:09:10 2010 +0100
@@ -1,103 +1,16 @@
local initiative = param.get("initiative", "table")
-
-local battled_initiatives = Initiative:new_selector()
- :add_field("winning_battle.count", "winning_count")
- :add_field("losing_battle.count", "losing_count")
- :join("battle", "winning_battle", { "winning_battle.winning_initiative_id = ? AND winning_battle.losing_initiative_id = initiative.id", initiative.id })
- :join("battle", "losing_battle", { "losing_battle.losing_initiative_id = ? AND losing_battle.winning_initiative_id = initiative.id", initiative.id })
- :add_order_by("rank")
- :exec()
-
-local number_of_initiatives = Initiative:new_selector()
- :add_where{ "issue_id = ?", initiative.issue_id }
- :add_where("admitted")
- :count()
-
if initiative.revoked then
slot.put(_"Not voted (revoked from initiator)")
elseif initiative.admitted == false then
slot.put(_"Not voted (not admitted)")
else
- if number_of_initiatives > 1 then
- ui.container{
- attr = { class = "heading first" },
- content = _"This initiative compared to alternative initiatives"
- }
- ui.list{
- records = battled_initiatives,
- columns = {
- {
- content = function()
- slot.put(_"This initiative")
- end
- },
- {
- content = function(record)
- local population = initiative.issue.voter_count
- local value = record.winning_count
- ui.bargraph{
- class = "bargraph bargraph50",
- max_value = population,
- width = 50,
- bars = {
- { color = "#aaa", value = population - value },
- { color = "#444", value = value },
- }
- }
- end
- },
- {
- content = function(record)
- slot.put(record.winning_count)
- end
- },
- {
- content = function(record)
- if record.winning_count == record.losing_count then
- ui.image{ static = "icons/16/bullet_blue.png" }
- elseif record.winning_count > record.losing_count then
- ui.image{ static = "icons/16/resultset_previous.png" }
- else
- ui.image{ static = "icons/16/resultset_next.png" }
- end
- end
- },
- {
- field_attr = { style = "text-align: right;" },
- content = function(record)
- slot.put(record.losing_count)
- end
- },
- {
- content = function(record)
- local population = initiative.issue.voter_count
- local value = record.losing_count
- ui.bargraph{
- class = "bargraph bargraph50",
- max_value = population,
- width = 50,
- bars = {
- { color = "#444", value = value },
- { color = "#aaa", value = population - value },
- }
- }
- end
- },
- {
- content = function(record)
- ui.link{
- module = "initiative",
- view = "show",
- id = record.id,
- text = record.name
- }
- end
- }
- }
- }
- end
+ execute.view{
+ module = "initiative",
+ view = "_battles",
+ params = { initiative = initiative }
+ }
ui.container{
attr = { class = "heading" },
diff -r abcac05b1091 -r a6caaff47205 app/main/initiative/show_static.lua
--- a/app/main/initiative/show_static.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/app/main/initiative/show_static.lua Tue Feb 23 21:09:10 2010 +0100
@@ -38,7 +38,7 @@
end
end)
-slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.shortened_name) ))
+slot.put_into("sub_title", encode.html(_"Initiative: '#{name}'":gsub("#{name}", initiative.name) ))
execute.view{
module = "initiative",
@@ -47,4 +47,4 @@
initiative = initiative,
expanded = true
}
-}
\ No newline at end of file
+}
diff -r abcac05b1091 -r a6caaff47205 app/main/report/area.lua
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/report/area.lua Tue Feb 23 21:09:10 2010 +0100
@@ -0,0 +1,220 @@
+function show_issue(issue, initiatives_selector)
+ ui.list{
+ records = initiatives_selector:exec(),
+ columns = {
+ {
+ label = _"Date",
+ label_attr = { style = "width: 7.5em;" },
+ content = function(initiative)
+ slot.put(format.date(issue.closed))
+ end
+ },
+ {
+ label_attr = { style = "width: 8em;" },
+ label = _"Id",
+ content = function(initiative)
+ ui.link{
+ external = "",
+ text = "#" .. tostring(issue.id) .. "." .. tostring(initiative.id),
+ attr = {
+ onclick =
+ "openEl('initiative_" .. tostring(initiative.id) .. "');" ..
+ "return(false);"
+ }
+ }
+ end
+ },
+ {
+ label = _"Rank",
+ label_attr = { style = "width: 3em;" },
+ field_attr = { style = "text-align: right;" },
+ content = function(initiative)
+ ui.field.rank{ value = initiative.rank }
+ end
+ },
+ {
+ label = _"Name",
+ content = function(initiative)
+ if initiative.rank and initiative.rank == 1 then
+ slot.put("")
+ end
+ ui.field.text{ value = initiative.name }
+ if initiative.rank and initiative.rank == 1 then
+ slot.put("")
+ end
+ end
+ }
+ }
+ }
+end
+
+function link_issue(issue)
+ ui.link{
+ external = "",
+ attr = {
+ style = "text-decoration: none;",
+ name = "issue_" .. tostring(issue.id),
+ onclick =
+ "openEl('issue_" .. tostring(issue.id) .. "');" ..
+ "return(false);"
+ },
+ content = function()
+ ui.heading{
+ attr = { style = "background-color: #ddd; color: #000;" },
+ content = _("##{id}", { id = issue.id })
+ }
+ end
+ }
+end
+
+
+local area = param.get("area", "table")
+
+local issue_selector = Issue:new_selector()
+issue_selector:add_where{ "area_id = ?", area.id }
+issue_selector:add_where("closed NOTNULL")
+issue_selector:add_order_by("id")
+
+
+local issues = issue_selector:exec()
+
+ui.container{
+ attr = {
+ id = "area_" .. tostring(area.id)
+ },
+ content = function()
+
+ link_area(area)
+
+ for i, issue in ipairs(issues) do
+
+ link_issue(issue)
+
+ local initiatives_selector = issue:get_reference_selector("initiatives")
+
+ local initiatives_count = initiatives_selector:count()
+
+ initiatives_selector:add_order_by("rank")
+ initiatives_selector:limit(3)
+
+ show_issue(issue, initiatives_selector)
+
+ if initiatives_count > 3 then
+ ui.link{
+ attr = {
+ style = "margin-left: 8em; font-style: italic;",
+ onclick = "openEl('issue_" .. tostring(issue.id) .. "'); return(false);"
+ },
+ content = _("and #{count} more initiatives", { count = initiatives_count - 3 }),
+ external = ""
+ }
+ end
+
+ slot.put("
")
+
+ end
+
+ end
+}
+
+local next_issue = issues[1]
+if next_issue then
+ ui.script{ script = "next_issues['area_" .. tostring(area.id) .. "'] = 'issue_" .. tostring(next_issue.id) .. "';" }
+end
+
+if next_issue then
+ local next_initiative = next_issue.initiatives[1]
+ if next_initiative then
+ ui.script{ script = "next_initiatives['area_" .. tostring(area.id) .. "'] = 'initiative_" .. tostring(next_initiative.id) .. "';" }
+ end
+end
+
+
+for i, issue in ipairs(issues) do
+ local initiatives_selector = issue:get_reference_selector("initiatives")
+ :add_order_by("rank")
+
+ local initiatives = initiatives_selector:exec()
+
+ ui.container{
+ attr = {
+ id = "issue_" .. tostring(issue.id)
+ },
+ content = function()
+ link_area(area)
+ link_issue(issue)
+ show_issue(issue, initiatives_selector)
+ end
+ }
+
+ local previous_issue = issues[i-1]
+ if previous_issue then
+ ui.script{ script = "prev_issues['issue_" .. tostring(issue.id) .. "'] = 'issue_" .. tostring(previous_issue.id) .. "';" }
+ end
+
+ local next_initiative = initiatives[1]
+ if next_initiative then
+ ui.script{ script = "next_initiatives['issue_" .. tostring(issue.id) .. "'] = 'initiative_" .. tostring(next_initiative.id) .. "';" }
+ end
+
+ local next_issue = issues[i+1]
+ if next_issue then
+ ui.script{ script = "next_issues['issue_" .. tostring(issue.id) .. "'] = 'issue_" .. tostring(next_issue.id) .. "';" }
+ end
+
+ ui.script{
+ script = "document.getElementById('issue_" .. tostring(issue.id) .. "').style.display = 'none';"
+ }
+
+
+ for j, initiative in ipairs(initiatives) do
+
+ ui.container{
+ attr = {
+ id = "initiative_" .. tostring(initiative.id)
+ },
+ content = function()
+ execute.view{
+ module = "report",
+ view = "initiative",
+ params = { initiative = initiative }
+ }
+ slot.put("
")
+ slot.put("
")
+ slot.put("
")
+ slot.put("
")
+ slot.put("
")
+ end
+ }
+
+ local previous_issue = issues[i-1]
+ if previous_issue then
+ ui.script{ script = "prev_issues['initiative_" .. tostring(initiative.id) .. "'] = 'issue_" .. tostring(previous_issue.id) .. "';" }
+ end
+
+ local previous_initiative = initiatives[j-1]
+ if previous_initiative then
+ ui.script{ script = "prev_initiatives['initiative_" .. tostring(initiative.id) .. "'] = 'initiative_" .. tostring(previous_initiative.id) .. "';" }
+ end
+
+ local next_initiative = initiatives[j+1]
+ if next_initiative then
+ ui.script{ script = "next_initiatives['initiative_" .. tostring(initiative.id) .. "'] = 'initiative_" .. tostring(next_initiative.id) .. "';" }
+ end
+
+ local next_issue = issues[i+1]
+ if next_issue then
+ ui.script{ script = "next_issues['initiative_" .. tostring(initiative.id) .. "'] = 'issue_" .. tostring(next_issue.id) .. "';" }
+ end
+
+ ui.script{
+ script = "document.getElementById('initiative_" .. tostring(initiative.id) .. "').style.display = 'none';"
+ }
+
+ end
+end
+
+ui.script{
+ script = "document.getElementById('area_" .. tostring(area.id) .. "').style.display = 'none';"
+}
+
diff -r abcac05b1091 -r a6caaff47205 app/main/report/index.lua
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/report/index.lua Tue Feb 23 21:09:10 2010 +0100
@@ -0,0 +1,130 @@
+function link_area(area)
+ ui.link{
+ external = "",
+ attr = {
+ onclick =
+ "openEl('area_" .. tostring(area.id) .. "');" ..
+ "return(false);"
+ },
+ content = function()
+ ui.heading{
+ attr = { style = "background-color: #000; color: #fff;" },
+ content = area.name
+ }
+ end
+ }
+end
+
+slot.set_layout("report")
+
+ui.form{
+ attr = {
+ style = " float: right;",
+ onsubmit = "openElDirect(); return(false);"
+ },
+ content = function()
+ slot.put("#")
+ ui.tag{
+ tag = "input",
+ attr = {
+ id = "input_issue",
+ type = "text",
+ style = "width: 4em;"
+ }
+ }
+ slot.put(".")
+ ui.tag{
+ tag = "input",
+ attr = {
+ id = "input_initiative",
+ type = "text",
+ style = "width: 4em;"
+ }
+ }
+ slot.put(" ")
+ ui.tag{
+ tag = "input",
+ attr = {
+ type = "submit",
+ value = "OK",
+ }
+ }
+ end
+}
+
+ui.link{
+ external = "",
+ attr = {
+ onclick = "undo(); return(false);"
+ },
+ text = _"Back"
+}
+
+slot.put(" ")
+
+ui.link{
+ external = "",
+ text = _"Areas"
+}
+
+slot.put(" ")
+
+ui.link{
+ external = "",
+ attr = {
+ onclick = "openPrevIssue(); return(false);"
+ },
+ text = "<< " .. _"Previous issue"
+}
+
+slot.put(" ")
+
+ui.link{
+ external = "",
+ attr = {
+ onclick = "openPrevInitiative(); return(false);"
+ },
+ text = "< " .. _"Previous initiative"
+}
+
+slot.put(" ")
+
+ui.link{
+ external = "",
+ attr = {
+ onclick = "openNextInitiative(); return(false);"
+ },
+ text = _"Next initiative" .. " >"
+}
+
+slot.put(" ")
+
+ui.link{
+ external = "",
+ attr = {
+ onclick = "openNextIssue(); return(false);"
+ },
+ text = _"Next issue" .. " >>"
+}
+
+local areas = Area:new_selector():exec()
+
+
+ui.container{
+ attr = { id = "areas" },
+ content = function()
+ for i, area in ipairs(areas) do
+ link_area(area)
+ end
+ end
+}
+
+ui.script{ script = "openEl('areas')" }
+
+for i, area in ipairs(areas) do
+ execute.view{
+ module = "report",
+ view = "area",
+ params = { area = area }
+ }
+end
\ No newline at end of file
diff -r abcac05b1091 -r a6caaff47205 app/main/report/initiative.lua
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/app/main/report/initiative.lua Tue Feb 23 21:09:10 2010 +0100
@@ -0,0 +1,86 @@
+local initiative = param.get("initiative", "table")
+
+link_area(initiative.issue.area)
+
+link_issue(initiative.issue)
+
+ui.link{
+ external = "",
+ attr = {
+ style = "display: block; text-decoration: none;",
+ name = "initiative_" .. tostring(initiative.id),
+ },
+ content = function()
+ ui.heading{
+ content = _("##{issue_id}.#{id} #{name}", { issue_id = initiative.issue.id, id = initiative.id, name = initiative.shortened_name })
+ }
+ end
+}
+
+slot.put("
")
+
+if initiative.issue.ranks_available and initiative.admitted then
+ local class = initiative.rank == 1 and "admitted_info" or "not_admitted_info"
+ ui.container{
+ attr = { class = class },
+ content = function()
+ local max_value = initiative.issue.voter_count
+ slot.put(" ")
+ local positive_votes = initiative.positive_votes
+ local negative_votes = initiative.negative_votes
+ slot.put(_"Yes" .. ": " .. tostring(positive_votes) .. "")
+ slot.put(" · ")
+ slot.put(_"Abstention" .. ": " .. tostring(max_value - initiative.negative_votes - initiative.positive_votes) .. "")
+ slot.put(" · ")
+ slot.put(_"No" .. ": " .. tostring(initiative.negative_votes) .. "")
+ slot.put(" · ")
+ slot.put("")
+ if initiative.rank == 1 then
+ 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
+ }
+end
+
+if initiative.issue.state == "cancelled" then
+ local policy = initiative.issue.policy
+ ui.container{
+ attr = { class = "not_admitted_info" },
+ content = _("This issue has been cancelled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) })
+ }
+elseif initiative.admitted == false then
+ local policy = initiative.issue.policy
+ ui.container{
+ attr = { class = "not_admitted_info" },
+ content = _("This initiative has not been admitted! It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.initiative_quorum_num / policy.initiative_quorum_den) })
+ }
+end
+
+if initiative.revoked then
+ ui.container{
+ attr = { class = "revoked_info" },
+ content = function()
+ slot.put(_("This initiative has been revoked at #{revoked}", { revoked = format.timestamp(initiative.revoked) }))
+ end
+ }
+end
+
+
+ui.container{
+ attr = { class = "draft_content wiki" },
+ content = function()
+ slot.put(format.wiki_text(initiative.current_draft.content, initiative.current_draft.formatting_engine))
+ end
+}
+
+execute.view{
+ module = "initiative",
+ view = "_battles",
+ params = { initiative = initiative }
+}
+
diff -r abcac05b1091 -r a6caaff47205 config/default.lua
--- a/config/default.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/config/default.lua Tue Feb 23 21:09:10 2010 +0100
@@ -1,5 +1,5 @@
config.app_name = "LiquidFeedback"
-config.app_version = "beta11"
+config.app_version = "beta12"
config.app_title = config.app_name .. " (" .. request.get_config_name() .. " environment)"
diff -r abcac05b1091 -r a6caaff47205 env/ui/field/negative_votes.lua
--- a/env/ui/field/negative_votes.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/env/ui/field/negative_votes.lua Tue Feb 23 21:09:10 2010 +0100
@@ -8,9 +8,6 @@
attr = { class = "value" },
content = function()
slot.put(tostring(value) .. ' ')
- ui.image{
- static = "icons/16/delete.png"
- }
end
}
end
diff -r abcac05b1091 -r a6caaff47205 env/ui/field/positive_votes.lua
--- a/env/ui/field/positive_votes.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/env/ui/field/positive_votes.lua Tue Feb 23 21:09:10 2010 +0100
@@ -8,9 +8,6 @@
attr = { class = "value" },
content = function()
slot.put(tostring(value) .. ' ')
- ui.image{
- static = "icons/16/add.png"
- }
end
}
end
diff -r abcac05b1091 -r a6caaff47205 locale/translations.de.lua
--- a/locale/translations.de.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/locale/translations.de.lua Tue Feb 23 21:09:10 2010 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/env lua
return {
+["##{id}"] = false;
+["##{issue_id}.#{id} #{name}"] = false;
["#{interested_issues_to_vote_count} issue(s) you are interested in"] = "#{interested_issues_to_vote_count} Themen, die Dich interessieren";
["#{issues_to_vote_count} issue(s)"] = "#{issues_to_vote_count} Themen";
["#{number} Image(s) has been deleted"] = "Es wurde(n) #{number} Bild(er) gelöscht";
@@ -101,6 +103,7 @@
["Created at"] = "Erzeugt am/um";
["Current draft"] = "Aktueller Entwurf";
["Current votings in areas you are member of and issues you are interested in:"] = "Jetzt laufende Abstimmungen zu Themen aus Deinen Themenbereichen oder solchen an denen Du interessiert bist:";
+["Date"] = "Datum";
["Degree"] = "Grad";
["Delegations"] = "Delegationen";
["Delete filter"] = "Filter löschen";
@@ -238,7 +241,7 @@
["Member page"] = "Mitgliederseite";
["Member successfully registered"] = "Mitglied erfolgreich registriert";
["Member successfully updated"] = "Mitglied erfolgreich aktualisert";
-["Member voting"] = false;
+["Member voting"] = "Abstimmungsverhalten";
["Member: '#{login}' (#{name})"] = "Mitlied: '#{login}' (#{name})";
["Members"] = "Mitglieder";
["Membership by delegation"] = "Mitgliedschaft durch Delegation";
@@ -264,6 +267,8 @@
["New passwords is too short."] = "Das neue Kennwort ist zu kurz";
["New suggestion"] = "Neue Anregung";
["Newest"] = "Neueste";
+["Next initiative"] = "Nächste Initiative";
+["Next issue"] = "Nächstes Thema";
["Next state"] = "Nächster Zustand";
["No"] = "Nein";
["No changes to your images were made"] = "An Deinen Bildern wurde nichts geändert";
@@ -322,6 +327,8 @@
["Potential support"] = "Potentielle Unterstützung";
["Potential supported"] = "Potentiell unterstützt";
["Potential supporter"] = "Potentielle Unterstützer";
+["Previous initiative"] = "Vorherige Initiative";
+["Previous issue"] = "Vorheriges Thema";
["Profession"] = "Beruf";
["Profile"] = "Profil";
["Publish"] = "Veröffentlichen";
diff -r abcac05b1091 -r a6caaff47205 locale/translations.en.lua
--- a/locale/translations.en.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/locale/translations.en.lua Tue Feb 23 21:09:10 2010 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/env lua
return {
+["##{id}"] = false;
+["##{issue_id}.#{id} #{name}"] = false;
["#{interested_issues_to_vote_count} issue(s) you are interested in"] = false;
["#{issues_to_vote_count} issue(s)"] = false;
["#{number} Image(s) has been deleted"] = false;
@@ -10,6 +12,7 @@
["+ #{weight}"] = false;
["A-Z"] = false;
["About"] = false;
+["About / Impressum"] = false;
["About LiquidFeedback"] = false;
["Abstention"] = false;
["Abstention [many entries]"] = "Abstention";
@@ -20,9 +23,8 @@
["Accordion (first expanded)"] = false;
["Accordion (none expanded)"] = false;
["Active?"] = false;
+["Add alternative initiative to issue"] = false;
["Add my interest"] = false;
-["Add new initiative"] = false;
-["Add new initiative to issue"] = false;
["Add new suggestion"] = false;
["Add to my contacts"] = false;
["Address"] = false;
@@ -32,6 +34,7 @@
["Administrator"] = false;
["Admission time"] = false;
["Admitted"] = false;
+["Alternative initiatives"] = false;
["Any"] = false;
["Approval (#th preference) [many entries]"] = "Approval (#th preference)";
["Approval (#th preference) [single entry]"] = "Approval (#th preference)";
@@ -43,6 +46,7 @@
["Approval (third preference) [single entry]"] = "Approval (third preference)";
["Approval [many entries]"] = "Approval";
["Approval [single entry]"] = "Approval";
+["Approved"] = false;
["Are you sure?"] = false;
["Area"] = false;
["Area '#{name}'"] = false;
@@ -57,6 +61,7 @@
["Avatar"] = false;
["Back"] = false;
["Back to timeline"] = false;
+["Ballot of '#{member_name}' for issue ##{issue_id}"] = false;
["Become a member"] = false;
["Birthday"] = false;
["Can't remove last initiator"] = false;
@@ -68,10 +73,12 @@
["Cancelled"] = false;
["Change area delegation"] = false;
["Change display settings"] = false;
+["Change filters and order"] = false;
["Change global delegation"] = false;
["Change issue delegation"] = false;
["Change login"] = false;
["Change name"] = false;
+["Change order"] = false;
["Change password"] = false;
["Change vote"] = false;
["Change your login"] = false;
@@ -80,7 +87,6 @@
["Choose initiator"] = false;
["Choose member"] = false;
["Click for details"] = false;
-["Close"] = false;
["Closed"] = false;
["Collective opinion"] = false;
["Commit suggestion"] = false;
@@ -97,6 +103,7 @@
["Created at"] = false;
["Current draft"] = false;
["Current votings in areas you are member of and issues you are interested in:"] = false;
+["Date"] = false;
["Degree"] = false;
["Delegations"] = false;
["Delete filter"] = false;
@@ -114,17 +121,18 @@
["Disapproval (prefer to lower blocks) [single entry]"] = "Disapproval (prefer to lower blocks)";
["Disapproval [many entries]"] = "Disapproval";
["Disapproval [single entry]"] = "Disapproval";
+["Discard voting"] = false;
["Discussion"] = false;
["Discussion URL"] = false;
["Discussion on issue"] = false;
["Discussion time"] = false;
["Discussion with initiators"] = false;
["Display settings"] = false;
-["Display starting from"] = false;
["Download"] = false;
["Download database export"] = false;
["Draft"] = false;
["Draft history"] = false;
+["EXPERIMENTAL FEATURE"] = false;
["Edit"] = false;
["Edit draft"] = false;
["Edit initiative"] = false;
@@ -188,7 +196,6 @@
["Invited"] = false;
["Issue"] = false;
["Issue ##{id}"] = false;
-["Issue ##{id} (#{policy_name})"] = false;
["Issue accepted"] = false;
["Issue canceled"] = false;
["Issue delegation"] = false;
@@ -223,6 +230,7 @@
["Member '#{member}'"] = false;
["Member has been removed from initiators"] = false;
["Member has been removed from your contacts"] = false;
+["Member has not approved latest draft"] = false;
["Member is administrator"] = false;
["Member is already saved in your contacts!"] = false;
["Member is now invited to be initiator"] = false;
@@ -233,6 +241,7 @@
["Member page"] = false;
["Member successfully registered"] = false;
["Member successfully updated"] = false;
+["Member voting"] = false;
["Member: '#{login}' (#{name})"] = false;
["Members"] = false;
["Membership by delegation"] = false;
@@ -243,6 +252,8 @@
["Missing help text: #{id}.#{lang}.txt"] = false;
["Mobile phone"] = false;
["Monday"] = false;
+["Move down"] = false;
+["Move up"] = false;
["My opinion"] = false;
["Name"] = false;
["New"] = false;
@@ -256,6 +267,8 @@
["New passwords is too short."] = false;
["New suggestion"] = false;
["Newest"] = false;
+["Next initiative"] = false;
+["Next issue"] = false;
["Next state"] = false;
["No"] = false;
["No changes to your images were made"] = false;
@@ -264,7 +277,11 @@
["No membership at all"] = false;
["No support at all"] = false;
["Not a member"] = false;
+["Not approved"] = false;
+["Not approved (rank #{rank})"] = false;
["Not voted"] = false;
+["Not voted (not admitted)"] = false;
+["Not voted (revoked from initiator)"] = false;
["Not yet voted"] = false;
["Number of incoming delegations, follow link to see more details"] = false;
["Number of initiatives to preview"] = false;
@@ -279,6 +296,7 @@
["One issue you are interested in"] = false;
["One step back"] = false;
["Open"] = false;
+["Opinions"] = false;
["Order by"] = false;
["Organizational unit"] = false;
["Outgoing delegations"] = false;
@@ -309,11 +327,12 @@
["Potential support"] = false;
["Potential supported"] = false;
["Potential supporter"] = false;
+["Previous initiative"] = false;
+["Previous issue"] = false;
["Profession"] = false;
["Profile"] = false;
["Publish"] = false;
["Published"] = false;
-["Published contacts"] = false;
["Rank"] = false;
["Real name"] = false;
["Refresh support to current draft"] = false;
@@ -350,6 +369,7 @@
["Search issues"] = false;
["Search members"] = false;
["Search results for: '#{search}'"] = false;
+["Select language \"#{langcode}\""] = false;
["Set URL"] = false;
["Set area delegation"] = false;
["Set autoreject"] = false;
@@ -361,11 +381,13 @@
["Settings"] = false;
["Show"] = false;
["Show active members"] = false;
-["Show all initiatives"] = false;
+["Show alternative initiatives"] = false;
["Show areas in use"] = false;
["Show areas not in use"] = false;
["Show diff"] = false;
+["Show filter"] = false;
["Show filter details"] = false;
+["Show help text"] = false;
["Show locked members"] = false;
["Show member"] = false;
["Show name history"] = false;
@@ -400,14 +422,22 @@
["Supporter"] = false;
["Tabs"] = false;
["Terms accepted"] = false;
+["Terms of use"] = false;
["The code you've entered is invalid"] = false;
["The draft of this initiative has been updated!"] = false;
["The drafts do not differ"] = false;
["The initiators suggest to support the following initiative:"] = false;
+["There are no more alternative initiatives currently."] = false;
+["There were no more alternative initiatives."] = false;
+["This initiative"] = false;
+["This initiative compared to alternative initiatives"] = false;
["This initiative has been revoked at #{revoked}"] = false;
["This initiative has not been admitted! It failed the quorum of #{quorum}."] = false;
["This initiative is already revoked"] = false;
["This initiative is revoked"] = false;
+["This issue has been cancelled. It failed the quorum of #{quorum}."] = false;
+["This issue has been finished with the following winning initiative:"] = false;
+["This issue has been finished without any winning initiative."] = false;
["This issue is already closed."] = false;
["This issue is already frozen."] = false;
["This login is already taken, please choose another one!"] = false;
@@ -416,6 +446,7 @@
["This member has rejected to become initiator of this initiative"] = false;
["This member is already initiator of this initiative"] = false;
["This member is already invited to become initiator of this initiative"] = false;
+["This member is participating, the rest of delegation chain is suspended while discussing"] = false;
["This name is already taken, please choose another one!"] = false;
["This name is really too short!"] = false;
["This name is too short!"] = false;
@@ -425,6 +456,7 @@
["Thursday"] = false;
["Time left"] = false;
["Timeline"] = false;
+["Title"] = false;
["Title (80 chars max)"] = false;
["Traditional wiki syntax"] = false;
["Trustee"] = false;
@@ -442,8 +474,8 @@
["Voted no"] = false;
["Voted proposal"] = false;
["Voted yes"] = false;
-["Voter"] = false;
["Voting"] = false;
+["Voting details"] = false;
["Voting for this issue has already begun."] = false;
["Voting for this issue is currently running!"] = false;
["Voting has not started yet."] = false;
@@ -495,21 +527,21 @@
["Your support has been added to this initiative"] = false;
["Your support has been removed from this initiative"] = false;
["Your support has been updated to the latest draft"] = false;
+["Your vote has been discarded. Delegation rules apply if set."] = false;
["Your web browser is not fully supported yet."] = false;
["Z-A"] = false;
-["all"] = false;
["and #{count} more initiatives"] = false;
["continuing"] = false;
["delete
"] = false;
["email"] = false;
+["last 24 hours"] = false;
["login name"] = false;
["must"] = false;
["must not"] = false;
["must/should"] = false;
["must/should not"] = false;
["neutral"] = false;
-["not implemented"] = false;
-["now"] = false;
+["requested"] = false;
["should"] = false;
["should not"] = false;
["to reset your password please click on the following link:\n\n"] = false;
diff -r abcac05b1091 -r a6caaff47205 locale/translations.eo.lua
--- a/locale/translations.eo.lua Sun Feb 21 17:34:37 2010 +0100
+++ b/locale/translations.eo.lua Tue Feb 23 21:09:10 2010 +0100
@@ -1,5 +1,7 @@
#!/usr/bin/env lua
return {
+["##{id}"] = false;
+["##{issue_id}.#{id} #{name}"] = false;
["#{interested_issues_to_vote_count} issue(s) you are interested in"] = "#{interested_issues_to_vote_count} temoj, kiujn vi interesi";
["#{issues_to_vote_count} issue(s)"] = "#{issues_to_vote_count} temoj";
["#{number} Image(s) has been deleted"] = "Estas viŝita(j) #{number} bildo(j)";
@@ -101,6 +103,7 @@
["Created at"] = "Kreita je";
["Current draft"] = "Aktuala skizo";
["Current votings in areas you are member of and issues you are interested in:"] = "Aktualaj voĉdonoj pri temoj en kiuj vi membraa kaj kiuj vin interesas:";
+["Date"] = false;
["Degree"] = "Grado";
["Delegations"] = "Delegacioj";
["Delete filter"] = "Forvisi filtron";
@@ -264,6 +267,8 @@
["New passwords is too short."] = "La nova pasvorto estas tro mallonga";
["New suggestion"] = "Nova sugesto";
["Newest"] = "Plej nova";
+["Next initiative"] = false;
+["Next issue"] = false;
["Next state"] = "Sekva stato";
["No"] = "Ne";
["No changes to your images were made"] = "Viaj bildoj ne estas ŝanĝitaj";
@@ -322,6 +327,8 @@
["Potential support"] = "Eventuala subteno";
["Potential supported"] = "Eble subtenota";
["Potential supporter"] = "Eventuala subtenanto";
+["Previous initiative"] = false;
+["Previous issue"] = false;
["Profession"] = "Profesio";
["Profile"] = "Profilo";
["Publish"] = "Publikigi";