liquid_feedback_frontend
changeset 251:cb2380e08bb5
Show currently active delegation in delegation boxes
author | Ingo Bormuth <mail@ibormuth.de> |
---|---|
date | Fri Dec 30 03:59:04 2011 +0100 (2011-12-30) |
parents | 272193cc190e |
children | eb6d04201f81 |
files | app/main/delegation/_show_box.lua locale/translations.de.lua locale/translations.en.lua locale/translations.eo.lua locale/translations.fr.lua |
line diff
1.1 --- a/app/main/delegation/_show_box.lua Fri Dec 30 03:15:54 2011 +0100 1.2 +++ b/app/main/delegation/_show_box.lua Fri Dec 30 03:59:04 2011 +0100 1.3 @@ -125,13 +125,20 @@ 1.4 ui.image{ 1.5 static = "icons/16/table_go.png" 1.6 } 1.7 + local member = Member:new_selector() 1.8 + :reset_fields() 1.9 + :add_field("name", "delegation_name") 1.10 + :add_where({ "id = ?", delegation.trustee_id }) 1.11 + :single_object_mode() 1.12 + :exec() 1.13 if delegation.issue_id then 1.14 - slot.put(_"Issue delegation active") 1.15 + slot.put( _("Issue delegated to '#{name}'", { name = member.delegation_name }) ) 1.16 elseif delegation.area_id then 1.17 - slot.put(_"Area delegation active") 1.18 + slot.put( _("Area delegated to '#{name}'", { name = member.delegation_name }) ) 1.19 else 1.20 - slot.put(_"Unit delegation active") 1.21 + slot.put( _("Unit delegated to '#{name}'", { name = member.delegation_name }) ) 1.22 end 1.23 + 1.24 else 1.25 ui.image{ 1.26 static = "icons/16/table_go_crossed.png"
2.1 --- a/locale/translations.de.lua Fri Dec 30 03:15:54 2011 +0100 2.2 +++ b/locale/translations.de.lua Fri Dec 30 03:59:04 2011 +0100 2.3 @@ -1,4 +1,4 @@ 2.4 -#!/usr/bin/env lua 2.5 +#!/usr/bin/env lua 2.6 return { 2.7 ["##{id}"] = "##{id}"; 2.8 ["##{issue_id}.#{id} #{name}"] = "##{issue_id}.#{id} #{name}"; 2.9 @@ -60,7 +60,7 @@ 2.10 ["Area delegated"] = "Themenbereich delegiert"; 2.11 ["Area delegated to '#{name}'"] = "Themenbereich an '#{name}' delegiert"; 2.12 ["Area delegation"] = "Delegation für Themenbereich"; 2.13 -["Area delegation active"] = "Delegation für Themenbereich aktiv"; 2.14 +["Area delegated to '#{name}'"] = "Themenbereich an '#{name} delegiert"; 2.15 ["Area list"] = "Liste der Themenbereiche"; 2.16 ["Area successfully updated"] = "Themenbereich erfolgreich aktualisiert"; 2.17 ["Areas"] = "Themenbereiche"; 2.18 @@ -196,7 +196,7 @@ 2.19 ["Generate / change API key"] = "API-Schlüssel erzeugen/ändern"; 2.20 ["Generate API key"] = "API-Schlüssel erzeugen"; 2.21 ["Global delegation"] = "Globale Delegation"; 2.22 -["Global delegation active"] = "Globale Delegation aktiv"; 2.23 +["Globally delegated to '#{name}'"] = "Global an '#{name}' delegiert"; 2.24 ["Go up"] = "Nach oben"; 2.25 ["Half frozen at"] = "Halb eingefroren am/um"; 2.26 ["Hello "] = "Hallo "; 2.27 @@ -260,7 +260,7 @@ 2.28 ["Issue accepted"] = "Thema akzeptiert"; 2.29 ["Issue canceled"] = "Thema abgebrochen"; 2.30 ["Issue delegation"] = "Issue-Delegation"; 2.31 -["Issue delegation active"] = "Delegation für Thema aktiv"; 2.32 +["Issue delegated to '#{name}'"] = "Thema an '{name}' delegiert"; 2.33 ["Issue events"] = "Themen-Ereignisse"; 2.34 ["Issue finished"] = "Thema abgeschlossen"; 2.35 ["Issue finished without voting"] = "Thema ohne Abstimmung abgeschlossen";
3.1 --- a/locale/translations.en.lua Fri Dec 30 03:15:54 2011 +0100 3.2 +++ b/locale/translations.en.lua Fri Dec 30 03:59:04 2011 +0100 3.3 @@ -60,7 +60,6 @@ 3.4 ["Area delegated"] = false; 3.5 ["Area delegated to '#{name}'"] = false; 3.6 ["Area delegation"] = false; 3.7 -["Area delegation active"] = false; 3.8 ["Area list"] = false; 3.9 ["Area successfully updated"] = false; 3.10 ["Areas"] = false; 3.11 @@ -193,7 +192,7 @@ 3.12 ["Generate / change API key"] = false; 3.13 ["Generate API key"] = false; 3.14 ["Global delegation"] = false; 3.15 -["Global delegation active"] = false; 3.16 +["Globally delegated to '#{name}'"] = false; 3.17 ["Go up"] = false; 3.18 ["Half frozen at"] = false; 3.19 ["Hello "] = false; 3.20 @@ -252,7 +251,7 @@ 3.21 ["Issue accepted"] = false; 3.22 ["Issue canceled"] = false; 3.23 ["Issue delegation"] = false; 3.24 -["Issue delegation active"] = false; 3.25 +["Issue delegated to '#{name}'"] = false; 3.26 ["Issue events"] = false; 3.27 ["Issue finished"] = false; 3.28 ["Issue finished without voting"] = false;
4.1 --- a/locale/translations.eo.lua Fri Dec 30 03:15:54 2011 +0100 4.2 +++ b/locale/translations.eo.lua Fri Dec 30 03:59:04 2011 +0100 4.3 @@ -60,7 +60,6 @@ 4.4 ["Area delegated"] = "Temarodelegacio"; -- FIXME 4.5 ["Area delegated to '#{name}'"] = "Temarodelegacio '#{name}'"; -- FIXME 4.6 ["Area delegation"] = "Temarodelegacio"; 4.7 -["Area delegation active"] = "Temarodlegacio aplikita"; 4.8 ["Area list"] = "Temarolisto"; 4.9 ["Area successfully updated"] = "Temaro sukcese ĝisdatigita"; 4.10 ["Areas"] = "Temaroj"; 4.11 @@ -196,7 +195,7 @@ 4.12 ["Generate / change API key"] = "Krei/ŝanĝi API-ŝlosilon"; 4.13 ["Generate API key"] = "Krei API-ŝlosilon"; 4.14 ["Global delegation"] = "Ĝenerala delegacio"; 4.15 -["Global delegation active"] = "Ĝenerala delegacio estas aktiva"; 4.16 +["Globalla delegated to"] = "Ĝenerala delegacio '#{name}'"; --FIXME 4.17 ["Go up"] = "Movi supren"; 4.18 ["Half frozen at"] = "Duone ĝelita je"; 4.19 ["Hello "] = "Saluton "; 4.20 @@ -260,7 +259,7 @@ 4.21 ["Issue accepted"] = "Temo akceptita"; 4.22 ["Issue canceled"] = "Temo nuligita"; 4.23 ["Issue delegation"] = "Temodelegacio"; 4.24 -["Issue delegation active"] = "Delegacio por temo aktiva"; 4.25 +["Issue delegated to '#{name}'"] = "Delegacio por temo '#{name}'"; --FIXME 4.26 ["Issue events"] = "Temoeventoj"; 4.27 ["Issue finished"] = "Temo finita"; 4.28 ["Issue finished without voting"] = "Temo finita sen voĉdono";
5.1 --- a/locale/translations.fr.lua Fri Dec 30 03:15:54 2011 +0100 5.2 +++ b/locale/translations.fr.lua Fri Dec 30 03:59:04 2011 +0100 5.3 @@ -60,7 +60,6 @@ 5.4 ["Area delegated"] = false; 5.5 ["Area delegated to '#{name}'"] = false; 5.6 ["Area delegation"] = false; 5.7 -["Area delegation active"] = false; 5.8 ["Area list"] = false; 5.9 ["Area successfully updated"] = false; 5.10 ["Areas"] = false; 5.11 @@ -193,7 +192,7 @@ 5.12 ["Generate / change API key"] = false; 5.13 ["Generate API key"] = false; 5.14 ["Global delegation"] = false; 5.15 -["Global delegation active"] = false; 5.16 +["Globally delegated to '#{name}'"] = false; 5.17 ["Go up"] = false; 5.18 ["Half frozen at"] = false; 5.19 ["Hello "] = false; 5.20 @@ -252,7 +251,7 @@ 5.21 ["Issue accepted"] = false; 5.22 ["Issue canceled"] = false; 5.23 ["Issue delegation"] = false; 5.24 -["Issue delegation active"] = false; 5.25 +["Issue delegated to '#{name}'"] = false; 5.26 ["Issue events"] = false; 5.27 ["Issue finished"] = false; 5.28 ["Issue finished without voting"] = false;