1.1 --- a/app/main/member/settings_notification.lua	Wed Mar 14 18:41:56 2012 +0100
     1.2 +++ b/app/main/member/settings_notification.lua	Wed Mar 14 18:54:55 2012 +0100
     1.3 @@ -26,92 +26,93 @@
     1.4      }
     1.5    },
     1.6    content = function()
     1.7 -    ui.tag{ tag = "p", _"Send me notifications about issues in following phases:" }
     1.8 +    ui.tag{ tag = "p", content = _"I like to receive notifications about events in my areas and issues:" }
     1.9    
    1.10      ui.container{ content = function()
    1.11        ui.tag{
    1.12          tag = "input", 
    1.13          attr = {
    1.14 -          type = "radio", name = "notify_level", value = "voting",
    1.15 -          checked = app.session.member.notify_level == 'voting' and "checked" or nil
    1.16 +          id = "notify_level_none",
    1.17 +          type = "radio", name = "notify_level", value = "none",
    1.18 +          checked = app.session.member.notify_level == 'none' and "checked" or nil
    1.19          }
    1.20        }
    1.21 -      ui.tag{ content = _"Voting phase" }
    1.22 -      ui.tag{ tag = "ul", content = function()
    1.23 -        ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
    1.24 -      end }
    1.25 +      ui.tag{
    1.26 +        tag = "label", attr = { ['for'] = "notify_level_none" },
    1.27 +        content = _"No notifications at all"
    1.28 +      }
    1.29      end }
    1.30 -
    1.31 +     
    1.32 +    slot.put("<br />")
    1.33 +  
    1.34      ui.container{ content = function()
    1.35        ui.tag{
    1.36          tag = "input", 
    1.37          attr = {
    1.38 -          type = "radio", name = "notify_level", value = "verification",
    1.39 -          checked = app.session.member.notify_level == 'verification' and "checked" or nil
    1.40 +          id = "notify_level_all",
    1.41 +          type = "radio", name = "notify_level", value = "all",
    1.42 +          checked = app.session.member.notify_level == 'all' and "checked" or nil
    1.43          }
    1.44        }
    1.45 -      ui.tag{ content = _"Frozen and voting phase" }
    1.46 -      ui.tag{ tag = "ul", content = function()
    1.47 -        ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
    1.48 -        ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
    1.49 -        ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
    1.50 -      end }
    1.51 +      ui.tag{
    1.52 +        tag = "label", attr = { ['for'] = "notify_level_all" },
    1.53 +        content = _"All of them"
    1.54 +      }
    1.55      end }
    1.56 +    
    1.57 +    slot.put("<br />")
    1.58  
    1.59      ui.container{ content = function()
    1.60        ui.tag{
    1.61          tag = "input", 
    1.62          attr = {
    1.63 +          id = "notify_level_discussion",
    1.64            type = "radio", name = "notify_level", value = "discussion",
    1.65            checked = app.session.member.notify_level == 'discussion' and "checked" or nil
    1.66          }
    1.67        }
    1.68 -      ui.tag{ content = _"Discussion, frozen and voting phase" }
    1.69 -      ui.tag{ tag = "ul", content = function()
    1.70 -        ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'discussion'" }
    1.71 -        ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
    1.72 -        ui.tag{ tag = "li", content = _"The draft of an initiative I'm supporting is updated" }
    1.73 -        ui.tag{ tag = "li", content = _"An initiative I was supporting is revoked" }
    1.74 -        ui.tag{ tag = "li", content = _"A new suggestion is created in an initiative I'm supporting" }
    1.75 -        ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
    1.76 -        ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
    1.77 -      end }
    1.78 +      ui.tag{
    1.79 +        tag = "label", attr = { ['for'] = "notify_level_discussion" },
    1.80 +        content = _"Only for issues reaching the discussion phase"
    1.81 +      }
    1.82      end }
    1.83  
    1.84 +    slot.put("<br />")
    1.85 +
    1.86      ui.container{ content = function()
    1.87        ui.tag{
    1.88          tag = "input", 
    1.89          attr = {
    1.90 -          type = "radio", name = "notify_level", value = "all",
    1.91 -          checked = app.session.member.notify_level == 'all' and "checked" or nil
    1.92 +          id = "notify_level_verification",
    1.93 +          type = "radio", name = "notify_level", value = "verification",
    1.94 +          checked = app.session.member.notify_level == 'verification' and "checked" or nil
    1.95          }
    1.96        }
    1.97 -      ui.tag{ content = _"Any phase" }
    1.98 -      ui.tag{ tag = "ul", content = function()
    1.99 -        ui.tag{ tag = "li", content = _"A new issue is created in one of my areas" }
   1.100 -        ui.tag{ tag = "li", content = _"An issue in one of my areas or i'm interested in enters phase 'discussion'" }
   1.101 -        ui.tag{ tag = "li", content = _"A new initiative is created in an issue I'm interested in" }
   1.102 -        ui.tag{ tag = "li", content = _"The draft of an initiative I'm supporting is updated" }
   1.103 -        ui.tag{ tag = "li", content = _"An initiative I was supporting is revoked" }
   1.104 -        ui.tag{ tag = "li", content = _"A new suggestion is created in an initiative I'm supporting" }
   1.105 -        ui.tag{ tag = "li", content = _"An issue in one of my areas or I'm interested in enters phase 'frozen'" }
   1.106 -        ui.tag{ tag = "li", content = _"Voting of an issue in one of my areas or I'm interested in starts" }
   1.107 -      end }
   1.108 +      ui.tag{
   1.109 +        tag = "label", attr = { ['for'] = "notify_level_verification" },
   1.110 +        content = _"Only for issues reaching the frozen phase"
   1.111 +      }
   1.112      end }
   1.113 +    
   1.114 +    slot.put("<br />")
   1.115  
   1.116      ui.container{ content = function()
   1.117        ui.tag{
   1.118          tag = "input", 
   1.119          attr = {
   1.120 -          type = "radio", name = "notify_level", value = "none",
   1.121 -          checked = app.session.member.notify_level == 'none' and "checked" or nil
   1.122 +          id = "notify_level_voting",
   1.123 +          type = "radio", name = "notify_level", value = "voting",
   1.124 +          checked = app.session.member.notify_level == 'voting' and "checked" or nil
   1.125          }
   1.126        }
   1.127 -      ui.tag{ content = _"No notifications at all" }
   1.128 +      ui.tag{
   1.129 +        tag = "label", attr = { ['for'] = "notify_level_voting" },
   1.130 +        content = _"Only for issues reaching the voting phase"
   1.131 +      }
   1.132      end }
   1.133  
   1.134 +    slot.put("<br />")
   1.135  
   1.136 -    
   1.137      ui.submit{ value = _"Change notification settings" }
   1.138    end
   1.139  }

     2.1 --- a/locale/translations.de.lua	Wed Mar 14 18:41:56 2012 +0100
     2.2 +++ b/locale/translations.de.lua	Wed Mar 14 18:54:55 2012 +0100
     2.3 @@ -12,9 +12,6 @@
     2.4  ["(new window)"] = "(neues Fenster)";
     2.5  ["+ #{weight}"] = "+ #{weight}";
     2.6  ["+getElementById("] = false;
     2.7 -["A new initiative is created in an issue I'm interested in"] = "Neue Initiative in einem Thema, das mich interessiert";
     2.8 -["A new issue is created in one of my areas"] = "Neues Thema in einem Themenbereich, in dem ich Mitglied bin";
     2.9 -["A new suggestion is created in an initiative I'm supporting"] = "Neue Anregung zu einer Initiative, die ich unterstütze";
    2.10  ["A-Z"] = "A-Z";
    2.11  ["API key"] = "API-Schlüssel";
    2.12  ["API key has been deleted"] = "API-Schlüssel wurde gelöscht";
    2.13 @@ -41,11 +38,8 @@
    2.14  ["Admitted"] = "zugelassen";
    2.15  ["All areas"] = "Alle Themenbereiche";
    2.16  ["All issues"] = "Alle Themen";
    2.17 +["All of them"] = "Alle Benachrichtigungen";
    2.18  ["All units"] = "Alle Gliederungen";
    2.19 -["An initiative I was supporting is revoked"] = "Eine von mir unterstützte Initiative wird zurückgezogen";
    2.20 -["An issue in one of my areas or I'm interested in enters phase 'discussion'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Diskussion'";
    2.21 -["An issue in one of my areas or I'm interested in enters phase 'frozen'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Eingefroren'";
    2.22 -["An issue in one of my areas or i'm interested in enters phase 'discussion'"] = "Ein Thema, das in einem meiner Themenbereiche ist oder das mich interessiert, wechselt in die Phase 'Diskussion'";
    2.23  ["Any"] = "Alle";
    2.24  ["Any phase"] = "Alle Phasen";
    2.25  ["Any state"] = "Alle Zustände";
    2.26 @@ -183,7 +177,6 @@
    2.27  ["Discussion starts soon"] = "Diskussion startet in Kürze";
    2.28  ["Discussion time"] = "Zeit für die Diskussion";
    2.29  ["Discussion with initiators"] = "Diskussion mit den Initiatoren";
    2.30 -["Discussion, frozen and voting phase"] = "Diskussions-, Eingefroren- und Abstimmphase";
    2.31  ["Display settings"] = "Anzeige-Einstellungen";
    2.32  ["Download"] = "Download";
    2.33  ["Download database export"] = "Datenbankexport herunterladen";
    2.34 @@ -219,7 +212,6 @@
    2.35  ["Finished without winner"] = "Abgeschlossen ohne Gewinner";
    2.36  ["Friday"] = "Freitag";
    2.37  ["Frozen"] = "Eingefroren";
    2.38 -["Frozen and voting phase"] = "Eingefroren- und Abstimmphase";
    2.39  ["Fully frozen at"] = "Ganz eingefroren am/um";
    2.40  ["Generate / change API key"] = "API-Schlüssel erzeugen/ändern";
    2.41  ["Generate API key"] = "API-Schlüssel erzeugen";
    2.42 @@ -238,6 +230,7 @@
    2.43  ["History"] = "Historie";
    2.44  ["Home"] = "Startseite";
    2.45  ["I consider suggestion as"] = "Ich halte die Anregung für";
    2.46 +["I like to receive notifications about events in my areas and issues:"] = "Ich möchte Benachrichtigungen über Ereignisse in meinen Themenbereichen und Themen erhalten:";
    2.47  ["Id"] = "Id";
    2.48  ["Ident number"] = "Ident-Nummer";
    2.49  ["Identification"] = "Identifikation";
    2.50 @@ -397,6 +390,9 @@
    2.51  ["One issue"] = "Ein Thema";
    2.52  ["One issue you are interested in"] = "Ein Thema, das Dich interessiert";
    2.53  ["One step back"] = "Ein Schritt zurück";
    2.54 +["Only for issues reaching the discussion phase"] = "Nur für Themen, die die Diskussion erreichen.";
    2.55 +["Only for issues reaching the frozen phase"] = "Nur für Themen, die die Phase Eingefroren erreichen.";
    2.56 +["Only for issues reaching the voting phase"] = "Nur für Themen, die die Abstimmung erreichen.";
    2.57  ["Open"] = "Offen";
    2.58  ["Open initiatives you are supporting which has been updated their draft:"] = "Offene, von dir unterstützte Initiativen, deren Antragstext aktualisiert wurde:";
    2.59  ["Open issues"] = "Offene Themen";
    2.60 @@ -484,7 +480,6 @@
    2.61  ["Search results for: '#{search}'"] = "Suchergebnisse für: '#{search}'";
    2.62  ["Select language \"#{langcode}\""] = "Sprache \"#{langcode}\" wählen";
    2.63  ["Send invite?"] = "Einladung schicken?";
    2.64 -["Send me notifications about issues in following phases:"] = "Ich möchte in folgenden Phasen Benachrichtigungen erhalten:";
    2.65  ["Set URL"] = "URL setzen";
    2.66  ["Set area delegation"] = "Delegation für Themenbereich festlegen";
    2.67  ["Set delegation for Area '#{name}'"] = "Delegation für Themenbereich '#{name}' festlegen";
    2.68 @@ -548,7 +543,6 @@
    2.69  ["Terms of use"] = "Nutzungsbedingungen";
    2.70  ["The API key has been changed too fast."] = "Der API-Schlüssel wurde zu schnell geändert.";
    2.71  ["The code you've entered is invalid"] = "Der Code, den Du eingeben hast, ist nicht gültig!";
    2.72 -["The draft of an initiative I'm supporting is updated"] = "Der Antragstext einer von dir unterstützten Initiative wurde aktualisiert";
    2.73  ["The draft of this initiative has been updated!"] = "Der Entwurfstext der Initiative wurde aktualisiert!";
    2.74  ["The drafts do not differ"] = "Die Entwürfe unterscheiden sich nicht";
    2.75  ["The initiators suggest to support the following initiative:"] = "Die Initiatoren empfehlen folgende Initiative zu unterstützen:";
    2.76 @@ -617,8 +611,6 @@
    2.77  ["Voting for this issue has already begun."] = "Die Abstimmung für dieses Thema hat schon begonnen.";
    2.78  ["Voting for this issue is currently running!"] = "Über dieses Thema wird gerade abgestimmt!";
    2.79  ["Voting has not started yet."] = "Die Abstimmung hat noch nicht begonnen.";
    2.80 -["Voting of an issue in one of my areas or I'm interested in starts"] = "Für ein Thema, das in meinen Themenbereichen ist oder das mich interessiert, beginnt die Abstimmung";
    2.81 -["Voting phase"] = "Abstimmungsphase";
    2.82  ["Voting privileges"] = "Abstimmberechtigung";
    2.83  ["Voting proposal"] = "Abstimmungsvorlage";
    2.84  ["Voting started"] = "Abstimmung begonnen";