Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

(re) Allow accents in names

Browse Source
This commit is contained in:
Olivier PEREZ 2015-01-13 08:08:43 +01:00
parent 08a3fe1b69
commit e9b456ad6e
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adminstuds.php
View File

@ -165,7 +165,7 @@ if (!empty($_POST['save'])) { // Save edition of an old vote
$choices = $inputService->filterArray($_POST['choices'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => CHOICE_REGEX]]); $choices = $inputService->filterArray($_POST['choices'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => CHOICE_REGEX]]);
if (empty($name)) { if (empty($name)) {
$message = new Message('danger', _('Name is incorrect.')); $message = new Message('danger', _('The name is invalid.'));
} }
if (count($choices) != count($_POST['choices'])) { if (count($choices) != count($_POST['choices'])) {
$message = new Message('danger', _('There is a problem with your choices.')); $message = new Message('danger', _('There is a problem with your choices.'));
@ -223,7 +223,7 @@ if (isset($_POST['add_comment'])) {
$comment = strip_tags($_POST['comment']); $comment = strip_tags($_POST['comment']);
if (empty($name)) { if (empty($name)) {
$message = new Message('danger', _('Name is incorrect.')); $message = new Message('danger', _('The name is invalid.'));
} }
if ($message == null) { if ($message == null) {

2
app/inc/constants.php.template
View File

@ -58,7 +58,7 @@ $ALLOWED_LANGUAGES = [
// Regex // Regex
const POLL_REGEX = '/^[a-z0-9]+$/'; const POLL_REGEX = '/^[a-z0-9]+$/';
const CHOICE_REGEX = '/^[012]$/'; const CHOICE_REGEX = '/^[012]$/';
const NAME_REGEX = '/(*UTF8)^[[:alnum:]_ -]+$/i'; const NAME_REGEX = '/^[áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœa-z0-9_ -]+$/i';
// Path to logo // Path to logo
const LOGOBANDEAU = '<relative path to the logo file>'; const LOGOBANDEAU = '<relative path to the logo file>';

BIN
locale/en_GB/LC_MESSAGES/Studs.mo
View File

Binary file not shown.

3
locale/en_GB/LC_MESSAGES/Studs.po
View File

@ -265,6 +265,9 @@ msgstr "Save the new rules"
msgid "Cancel the rules edit" msgid "Cancel the rules edit"
msgstr "Cancel the rules edit" msgstr "Cancel the rules edit"
msgid "The name is invalid."
msgstr "Le nom n'est pas valide."
# Help text adminstuds.php # Help text adminstuds.php
msgid "As poll administrator, you can change all the lines of this poll with this button" msgid "As poll administrator, you can change all the lines of this poll with this button"
msgstr "As poll administrator, you can change all the lines of this poll with this button" msgstr "As poll administrator, you can change all the lines of this poll with this button"

BIN
locale/fr_FR/LC_MESSAGES/Studs.mo
View File

Binary file not shown.

5
locale/fr_FR/LC_MESSAGES/Studs.po
View File

@ -265,6 +265,9 @@ msgstr "Enregistrer les nouvelles permissions"
msgid "Cancel the rules edit" msgid "Cancel the rules edit"
msgstr "Annuler le changement de permissions" msgstr "Annuler le changement de permissions"
msgid "The name is invalid."
msgstr "Le nom n'est pas valide."
# Help text adminstuds.php # Help text adminstuds.php
msgid "As poll administrator, you can change all the lines of this poll with this button" msgid "As poll administrator, you can change all the lines of this poll with this button"
msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec ce bouton" msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec ce bouton"
@ -670,7 +673,7 @@ msgid ""
"has filled a line.\n" "has filled a line.\n"
"You can find your poll at the link" "You can find your poll at the link"
msgstr "" msgstr ""
" vient de remplir une ligne.\n" "vient de remplir une ligne.\n"
"Vous pouvez retrouver votre sondage avec le lien suivant" "Vous pouvez retrouver votre sondage avec le lien suivant"
msgid "Thanks for your confidence." msgid "Thanks for your confidence."