From 10e21c1f971a4f207dd284508891c0d8127461ed Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sun, 16 Feb 2014 13:24:02 +0100 Subject: [PATCH 1/2] Add "bdsg_confirm" to UVconf.pm Set default for "bdsg_confirm". Picked from upstream. Signed-off-by: Thomas Hochstein --- UVconfig.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/UVconfig.pm b/UVconfig.pm index a12aa56..aa3b883 100644 --- a/UVconfig.pm +++ b/UVconfig.pm @@ -90,6 +90,7 @@ sub read_config { nein_stimme => '(N\s*E\s*I\s*N|N|(D\s*A\s*)?G\s*E\s*G\s*E\s*N)', enth_stimme => '(E|E\s*N\s*T\s*H\s*A\s*L\s*T\s*U\s*N\s*G)', ann_stimme => 'A\s*N\s*N\s*U\s*L\s*L\s*I\s*E\s*R\s*U\s*N\s*G', + bdsg_confirm => 'JA', condition1 => '$yes>=2*$no', # twice as many yes as no condition2 => '$yes>=60', # min 60 yes votes prop_formula => '$yes/$no', From e54a12d6183340adcd96e6e4afd25656321de3fc Mon Sep 17 00:00:00 2001 From: Thomas Hochstein Date: Sun, 16 Feb 2014 13:26:55 +0100 Subject: [PATCH 2/2] Update UVconf.pm Change default for "condition2" to a minimum of 50 votes and add "ballotintro". Signed-off-by: Thomas Hochstein --- UVconfig.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UVconfig.pm b/UVconfig.pm index aa3b883..4cad06f 100644 --- a/UVconfig.pm +++ b/UVconfig.pm @@ -92,7 +92,7 @@ sub read_config { ann_stimme => 'A\s*N\s*N\s*U\s*L\s*L\s*I\s*E\s*R\s*U\s*N\s*G', bdsg_confirm => 'JA', condition1 => '$yes>=2*$no', # twice as many yes as no - condition2 => '$yes>=60', # min 60 yes votes + condition2 => '$yes>=50', # min 50 yes votes prop_formula => '$yes/$no', tpl_ack_mail => 'ack-mail', tpl_bouncelist => 'bouncelist', @@ -119,6 +119,7 @@ sub read_config { tpl_rule_violated => 'rule-violated', begin_divider => 'Alles vor dieser Zeile bitte loeschen', end_divider => 'Alles nach dieser Zeile bitte loeschen', + ballotintro => 'WAHLSCHEIN fuer', nametext => 'Dein Realname, falls nicht im FROM-Header:', nametext2 => 'Waehlername:', addresstext => 'Waehleradresse:',