Merge branch 'thh-checkvotename' into next

* thh-checkvotename:
  Display current voting identifier in menu.
  Correctly find $votename.
  Add forgotten template.
  Fix regular expression.
  Check correct voting in ballot.
This commit is contained in:
Thomas Hochstein 2014-02-15 17:30:05 +01:00
commit d0fda3342c
9 changed files with 79 additions and 7 deletions

View file

@ -227,6 +227,10 @@ mailstart = "^From "
begin_divider = Alles vor dieser Zeile bitte loeschen
end_divider = Alles nach dieser Zeile bitte loeschen
# Ueberschrift fuer den Wahlschein
# Achtung, muss im Wahlschein genauso stehen!
ballotintro = WAHLSCHEIN fuer
# Text fuer die Namens-Angabe im Wahlschein. Achtung, muss im
# Wahlschein genauso stehen!
nametext = Dein Realname, falls nicht im FROM-Header:
@ -290,4 +294,5 @@ tpl_invalid_name = "invalid-name" # used by uvvote.pl
tpl_multiple_votes = "multiple-votes" # used by uvvote.pl
tpl_no_ballot = "no-ballot" # used by uvvote.pl
tpl_no_votes = "no-votes" # used by uvvote.pl
tpl_wrong_voting = "wrong-voting" # used by uvvote.pl
tpl_rule_violated = "rule-violated" # used by uvvote.pl (c.f. usevote.rul)