1.1 --- a/app/main/delegation/_show_box.lua	Mon Nov 01 22:01:45 2010 +0100
     1.2 +++ b/app/main/delegation/_show_box.lua	Mon Nov 01 22:06:36 2010 +0100
     1.3 @@ -124,7 +124,7 @@
     1.4                if delegation.issue_id then
     1.5                  slot.put(_"Issue delegation active")
     1.6                elseif delegation.area_id then
     1.7 -                slot.put(_"Area wide delegation active")
     1.8 +                slot.put(_"Area delegation active")
     1.9                else
    1.10                  slot.put(_"Global delegation active")
    1.11                end

     2.1 --- a/app/main/delegation/new.lua	Mon Nov 01 22:01:45 2010 +0100
     2.2 +++ b/app/main/delegation/new.lua	Mon Nov 01 22:06:36 2010 +0100
     2.3 @@ -79,26 +79,46 @@
     2.4      local records
     2.5  
     2.6      if issue then
     2.7 +      local delegate_name = ""
     2.8 +      local scope = "no delegation set"
     2.9 +      local area_delegation = Delegation:by_pk(app.session.member_id, issue.area_id)
    2.10 +      if area_delegation then
    2.11 +        delegate_name = area_delegation.trustee.name
    2.12 +        scope = _"area"
    2.13 +      else
    2.14 +      local global_delegation = Delegation:by_pk(app.session.member_id)
    2.15 +      if global_delegation then
    2.16 +        delegate_name = global_delegation.trustee.name
    2.17 +        scope = _"global"
    2.18 +      end
    2.19 +    end
    2.20        records = {
    2.21          {
    2.22            id = -1,
    2.23 -          name = _"Inherit delegation from area"
    2.24 +          name = _("Apply global or area delegation for this issue (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope })
    2.25          },
    2.26          {
    2.27            id = 0,
    2.28 -          name = _"No delegation (override area delegation)"
    2.29 +          name = _"Abandon global and area delegations for this issue"
    2.30          },
    2.31  
    2.32        }
    2.33      elseif area then
    2.34 +      local delegate_name = ""
    2.35 +      local scope = "no delegation set"
    2.36 +      local global_delegation = Delegation:by_pk(app.session.member_id)
    2.37 +      if global_delegation then
    2.38 +        delegate_name = global_delegation.trustee.name
    2.39 +        scope = _"global"
    2.40 +      end
    2.41        records = {
    2.42          {
    2.43            id = -1,
    2.44 -          name = _"Inherit global delegation"
    2.45 +          name = _("Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])", { delegate_name = delegate_name, scope = scope })
    2.46          },
    2.47          {
    2.48            id = 0,
    2.49 -          name = _"No delegation (override global delegation)"
    2.50 +          name = _"Abandon global delegation for this area"
    2.51          }
    2.52        }
    2.53  
    2.54 @@ -111,22 +131,22 @@
    2.55        }
    2.56  
    2.57      end
    2.58 -
    2.59 +    -- add saved members
    2.60 +    records[#records+1] = {id="_", name= "--- " .. _"Saved contacts" .. " ---"}
    2.61      for i, record in ipairs(contact_members) do
    2.62        records[#records+1] = record
    2.63      end
    2.64 -    disabled_records = {}
    2.65      -- add initiative authors
    2.66      if initiative then
    2.67 -      records[#records+1] = {id="_", name=_"--- Initiators ---"}
    2.68 -      disabled_records["_"] = true
    2.69 +      records[#records+1] = {id="_", name= "--- " .. _"Initiators" .. " ---"}
    2.70        for i,record in ipairs(initiative.initiators) do
    2.71 -        trace.debug(record)
    2.72 -        trace.debug(record.member.name)
    2.73          records[#records+1] = record.member
    2.74        end
    2.75      end
    2.76  
    2.77 +    disabled_records = {}
    2.78 +    disabled_records["_"] = true
    2.79 +
    2.80      ui.field.select{
    2.81        label = _"Trustee",
    2.82        name = "trustee_id",

     3.1 --- a/app/main/member/_list.lua	Mon Nov 01 22:01:45 2010 +0100
     3.2 +++ b/app/main/member/_list.lua	Mon Nov 01 22:06:36 2010 +0100
     3.3 @@ -4,8 +4,8 @@
     3.4  local trustee = param.get("trustee", "table")
     3.5  local initiator = param.get("initiator", "table")
     3.6  
     3.7 +
     3.8  if initiative or issue then
     3.9 -  local issue_id = issue and issue.id or initiative.issue_id
    3.10    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 })
    3.11    members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids")
    3.12  end

     4.1 --- a/locale/translations.de.lua	Mon Nov 01 22:01:45 2010 +0100
     4.2 +++ b/locale/translations.de.lua	Mon Nov 01 22:06:36 2010 +0100
     4.3 @@ -16,6 +16,8 @@
     4.4  ["API key"] = "API-Schlüssel";
     4.5  ["API key has been deleted"] = "API-Schlüssel wurde gelöscht";
     4.6  ["API key has been updated"] = "API-Schlüssel wurde aktualisiert";
     4.7 +["Abandon global and area delegations for this issue"] = "Globale und Themenbereichs-Delegation für dieses Thema aussetzen";
     4.8 +["Abandon global delegation for this area"] = "Globale Delegation für diesen Themenbereich aussetzen";
     4.9  ["About"] = "About";
    4.10  ["About / Impressum"] = false;
    4.11  ["About LiquidFeedback"] = "Über LiquidFeedback";
    4.12 @@ -40,6 +42,8 @@
    4.13  ["Admitted"] = "zugelassen";
    4.14  ["Alternative initiatives"] = "Alternative Initiativen";
    4.15  ["Any"] = "Alle";
    4.16 +["Apply global delegation for this area (Currently: #{delegate_name} [#{scope}])"] = "Globale Delegation für dieses Themengebiet anwenden (Zur Zeit: #{delegate_name} [#{scope}])";
    4.17 +["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}])";
    4.18  ["Approval (#th preference) [many entries]"] = "Zustimmung (#.-Wünsche)";
    4.19  ["Approval (#th preference) [single entry]"] = "Zustimmung (#.-Wunsch)";
    4.20  ["Approval (first preference) [many entries]"] = "Zustimmung (Erstwünsche)";
    4.21 @@ -55,9 +59,9 @@
    4.22  ["Area"] = "Themenbereich";
    4.23  ["Area '#{name}'"] = "Themenbereich '#{name}'";
    4.24  ["Area delegation"] = "Delegation für Themenbereich";
    4.25 +["Area delegation active"] = "Delegation für Themenbereich aktiv";
    4.26  ["Area list"] = "Liste der Themenbereiche";
    4.27  ["Area successfully updated"] = "Themenbereich erfolgreich aktualisiert";
    4.28 -["Area wide delegation active"] = "Delegation für Themenbereich aktiv";
    4.29  ["Areas"] = "Themenbereiche";
    4.30  ["Author"] = "Autor";
    4.31  ["Auto support is now disabled"] = false;
    4.32 @@ -208,8 +212,6 @@
    4.33  ["Incoming delegations"] = "Eingehende Delegationen";
    4.34  ["Information about the available policies"] = "Informationen zu den verfügbaren Regelwerken";
    4.35  ["Inherit autoreject from area"] = "Auto-Ablehnen vom Themengebiet übernehmen";
    4.36 -["Inherit delegation from area"] = "Delegation von Themengebiet übernehmen";
    4.37 -["Inherit global delegation"] = "Globale Delegation übernehmen";
    4.38  ["Initiated"] = "Initiiert";
    4.39  ["Initiated initiatives"] = "Initiierte Initiativen";
    4.40  ["Initiative ##{id}"] = "Initiative ##{id}";
    4.41 @@ -322,8 +324,6 @@
    4.42  ["No changes to your images were made"] = "An Deinen Bildern wurde nichts geändert";
    4.43  ["No default"] = "Kein Standard";
    4.44  ["No delegation"] = "Keine Delegation";
    4.45 -["No delegation (override area delegation)"] = "Keine Delegation (überschreibe Themengebietsdelegation)";
    4.46 -["No delegation (override global delegation)"] = "Keine Delegation (überschreibe globale)";
    4.47  ["No events selected to list"] = "Keine Ereignisse ausgewählt";
    4.48  ["No membership at all"] = "Gar keine Mitgliedschaft";
    4.49  ["No support at all"] = "Gar keine Unterstützung";
    4.50 @@ -426,6 +426,7 @@
    4.51  ["Save current filter"] = "Aktuellen Filter speichern";
    4.52  ["Save timeline filters"] = "Zeitachsen-Filter speichern";
    4.53  ["Saved as contact"] = "Als Kontakt gespeichert";
    4.54 +["Saved contacts"] = "Gespeicherte Kontakte";
    4.55  ["Search"] = "Suchen";
    4.56  ["Search initiatives"] = "Suche Initiativen";
    4.57  ["Search issues"] = "Suche Themen";
    4.58 @@ -623,10 +624,12 @@
    4.59  ["a bit unsatisfied"] = "etwas unzufrieden";
    4.60  ["activated"] = "aktiviert";
    4.61  ["and #{count} more initiatives"] = "und #{count} weitere Initiativen";
    4.62 +["area"] = "Themengebiet";
    4.63  ["deactivated"] = "deaktiviert";
    4.64  ["delete<br /><br />"] = false;
    4.65  ["disabled"] = "ausgeschaltet";
    4.66  ["email"] = "E-Mail";
    4.67 +["global"] = "Global";
    4.68  ["implemented"] = "umgesetzt";
    4.69  ["last 24 hours"] = "letzte 24 Stunden";
    4.70  ["login name"] = "Anmeldename";