# HG changeset patch
# User bsw
# Date 1288645596 -3600
# Node ID 02197b85ca3bce0de79874ce2047137cd49be2bc
# Parent 24b61c3fd93397e92301944eb7fbef32d762e4d0
Better texts for new delegation dialog
diff -r 24b61c3fd933 -r 02197b85ca3b app/main/delegation/_show_box.lua
--- a/app/main/delegation/_show_box.lua Mon Nov 01 22:01:45 2010 +0100
+++ b/app/main/delegation/_show_box.lua Mon Nov 01 22:06:36 2010 +0100
@@ -124,7 +124,7 @@
if delegation.issue_id then
slot.put(_"Issue delegation active")
elseif delegation.area_id then
- slot.put(_"Area wide delegation active")
+ slot.put(_"Area delegation active")
else
slot.put(_"Global delegation active")
end
diff -r 24b61c3fd933 -r 02197b85ca3b app/main/delegation/new.lua
--- a/app/main/delegation/new.lua Mon Nov 01 22:01:45 2010 +0100
+++ b/app/main/delegation/new.lua Mon Nov 01 22:06:36 2010 +0100
@@ -79,26 +79,46 @@
local records
if issue then
+ local delegate_name = ""
+ local scope = "no delegation set"
+ local area_delegation = Delegation:by_pk(app.session.member_id, issue.area_id)
+ if area_delegation then
+ delegate_name = area_delegation.trustee.name
+ scope = _"area"
+ else
+ local global_delegation = Delegation:by_pk(app.session.member_id)
+ if global_delegation then
+ delegate_name = global_delegation.trustee.name
+ scope = _"global"
+ end
+ end
records = {
{
id = -1,
- name = _"Inherit delegation from area"
+ name = _("Apply global or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope })
},
{
id = 0,
- name = _"No delegation (override area delegation)"
+ name = _"Abandon global and area delegations for this issue"
},
}
elseif area then
+ local delegate_name = ""
+ local scope = "no delegation set"
+ local global_delegation = Delegation:by_pk(app.session.member_id)
+ if global_delegation then
+ delegate_name = global_delegation.trustee.name
+ scope = _"global"
+ end
records = {
{
id = -1,
- name = _"Inherit global delegation"
+ name = _("Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope })
},
{
id = 0,
- name = _"No delegation (override global delegation)"
+ name = _"Abandon global delegation for this area"
}
}
@@ -111,22 +131,22 @@
}
end
-
+ -- add saved members
+ records[#records+1] = {id="_", name= "--- " .. _"Saved contacts" .. " ---"}
for i, record in ipairs(contact_members) do
records[#records+1] = record
end
- disabled_records = {}
-- add initiative authors
if initiative then
- records[#records+1] = {id="_", name=_"--- Initiators ---"}
- disabled_records["_"] = true
+ records[#records+1] = {id="_", name= "--- " .. _"Initiators" .. " ---"}
for i,record in ipairs(initiative.initiators) do
- trace.debug(record)
- trace.debug(record.member.name)
records[#records+1] = record.member
end
end
+ disabled_records = {}
+ disabled_records["_"] = true
+
ui.field.select{
label = _"Trustee",
name = "trustee_id",
diff -r 24b61c3fd933 -r 02197b85ca3b app/main/member/_list.lua
--- a/app/main/member/_list.lua Mon Nov 01 22:01:45 2010 +0100
+++ b/app/main/member/_list.lua Mon Nov 01 22:06:36 2010 +0100
@@ -4,8 +4,8 @@
local trustee = param.get("trustee", "table")
local initiator = param.get("initiator", "table")
+
if initiative or issue then
- local issue_id = issue and issue.id or initiative.issue_id
members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id })
members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids")
end
diff -r 24b61c3fd933 -r 02197b85ca3b locale/translations.de.lua
--- a/locale/translations.de.lua Mon Nov 01 22:01:45 2010 +0100
+++ b/locale/translations.de.lua Mon Nov 01 22:06:36 2010 +0100
@@ -16,6 +16,8 @@
["API key"] = "API-Schlüssel";
["API key has been deleted"] = "API-Schlüssel wurde gelöscht";
["API key has been updated"] = "API-Schlüssel wurde aktualisiert";
+["Abandon global and area delegations for this issue"] = "Globale und Themenbereichs-Delegation für dieses Thema aussetzen";
+["Abandon global delegation for this area"] = "Globale Delegation für diesen Themenbereich aussetzen";
["About"] = "About";
["About / Impressum"] = false;
["About LiquidFeedback"] = "Über LiquidFeedback";
@@ -40,6 +42,8 @@
["Admitted"] = "zugelassen";
["Alternative initiatives"] = "Alternative Initiativen";
["Any"] = "Alle";
+["Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])"] = "Globale Delegation für dieses Themengebiet anwenden (Zur Zeit: #{delegate_name} [#{scope}])";
+["Apply global or area delegation for this issue (Currently: #{delegate_name} [#{scope}])"] = "Globale oder Themengebiets-Delegation für dieses Thema anwenden (Zur Zeit: #{delegate_name} [#{scope}])";
["Approval (#th preference) [many entries]"] = "Zustimmung (#.-Wünsche)";
["Approval (#th preference) [single entry]"] = "Zustimmung (#.-Wunsch)";
["Approval (first preference) [many entries]"] = "Zustimmung (Erstwünsche)";
@@ -55,9 +59,9 @@
["Area"] = "Themenbereich";
["Area '#{name}'"] = "Themenbereich '#{name}'";
["Area delegation"] = "Delegation für Themenbereich";
+["Area delegation active"] = "Delegation für Themenbereich aktiv";
["Area list"] = "Liste der Themenbereiche";
["Area successfully updated"] = "Themenbereich erfolgreich aktualisiert";
-["Area wide delegation active"] = "Delegation für Themenbereich aktiv";
["Areas"] = "Themenbereiche";
["Author"] = "Autor";
["Auto support is now disabled"] = false;
@@ -208,8 +212,6 @@
["Incoming delegations"] = "Eingehende Delegationen";
["Information about the available policies"] = "Informationen zu den verfügbaren Regelwerken";
["Inherit autoreject from area"] = "Auto-Ablehnen vom Themengebiet übernehmen";
-["Inherit delegation from area"] = "Delegation von Themengebiet übernehmen";
-["Inherit global delegation"] = "Globale Delegation übernehmen";
["Initiated"] = "Initiiert";
["Initiated initiatives"] = "Initiierte Initiativen";
["Initiative ##{id}"] = "Initiative ##{id}";
@@ -322,8 +324,6 @@
["No changes to your images were made"] = "An Deinen Bildern wurde nichts geändert";
["No default"] = "Kein Standard";
["No delegation"] = "Keine Delegation";
-["No delegation (override area delegation)"] = "Keine Delegation (überschreibe Themengebietsdelegation)";
-["No delegation (override global delegation)"] = "Keine Delegation (überschreibe globale)";
["No events selected to list"] = "Keine Ereignisse ausgewählt";
["No membership at all"] = "Gar keine Mitgliedschaft";
["No support at all"] = "Gar keine Unterstützung";
@@ -426,6 +426,7 @@
["Save current filter"] = "Aktuellen Filter speichern";
["Save timeline filters"] = "Zeitachsen-Filter speichern";
["Saved as contact"] = "Als Kontakt gespeichert";
+["Saved contacts"] = "Gespeicherte Kontakte";
["Search"] = "Suchen";
["Search initiatives"] = "Suche Initiativen";
["Search issues"] = "Suche Themen";
@@ -623,10 +624,12 @@
["a bit unsatisfied"] = "etwas unzufrieden";
["activated"] = "aktiviert";
["and #{count} more initiatives"] = "und #{count} weitere Initiativen";
+["area"] = "Themengebiet";
["deactivated"] = "deaktiviert";
["delete
"] = false;
["disabled"] = "ausgeschaltet";
["email"] = "E-Mail";
+["global"] = "Global";
["implemented"] = "umgesetzt";
["last 24 hours"] = "letzte 24 Stunden";
["login name"] = "Anmeldename";