From 4270b709aff820ee4d83d9760ec05357a9e13e9a Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Sat, 18 Apr 2015 16:52:12 +0200 Subject: [PATCH 1/2] Allow logins with - --- lib/Act/Handler/User/Create.pm | 2 +- lib/Act/Handler/User/Register.pm | 2 +- po/be.po | 2 +- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pt.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/uk.po | 2 +- po/zh.po | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/Act/Handler/User/Create.pm b/lib/Act/Handler/User/Create.pm index 2d6f90ada..7b5f89cae 100644 --- a/lib/Act/Handler/User/Create.pm +++ b/lib/Act/Handler/User/Create.pm @@ -19,7 +19,7 @@ my $form = Act::Form->new( tshirt => sub { uc shift }, }, constraints => { - login => sub { $_[0] =~ /^[A-Za-z0-9_]{3,}$/ }, + login => sub { $_[0] =~ /^[-A-Za-z0-9_]{3,}$/ }, email => 'email', tshirt => sub { $_[0] =~ /^(?:X?S|M|[456]?X{0,3}LT?)(?: \(W\))?$/ }, } diff --git a/lib/Act/Handler/User/Register.pm b/lib/Act/Handler/User/Register.pm index 35d6d27d8..237d0bd19 100644 --- a/lib/Act/Handler/User/Register.pm +++ b/lib/Act/Handler/User/Register.pm @@ -33,7 +33,7 @@ my $form = Act::Form->new( tshirt => sub { uc shift }, }, constraints => { - login => sub { $_[0] =~ /^[A-Za-z0-9_]{3,}$/ }, + login => sub { $_[0] =~ /^[-A-Za-z0-9_]{3,}$/ }, email => 'email', tshirt => sub { $_[0] =~ /^(?:X?S|M|[456]?X{0,3}LT?)(?: \(W\))?$/ }, } diff --git a/po/be.po b/po/be.po index ba197f667..72c5182da 100644 --- a/po/be.po +++ b/po/be.po @@ -218,7 +218,7 @@ msgid "The address is already registered." msgstr "Адрас %1 ужо зарэгістраваны." msgid "Your identifier must contain at least 3 characters" -msgstr "Ваш ідэнтыфікатар павінен складацца як мінімум з трох сімвалаў і змяшчаць только лацінскія літары і лічбы ([a-zA-Z0-9_])" +msgstr "Ваш ідэнтыфікатар павінен складацца як мінімум з трох сімвалаў і змяшчаць только лацінскія літары і лічбы ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Неабходна ўвесці імя" diff --git a/po/de.po b/po/de.po index 9609db67f..a6fc35fcd 100644 --- a/po/de.po +++ b/po/de.po @@ -178,7 +178,7 @@ msgid "The address is already registered." msgstr "Die Adresse %1 ist bereits registriert." msgid "Your identifier must contain at least 3 characters" -msgstr "Die Benutzer-ID muss mindestens 3 Zeichen enthalten und darf nur aus alphanumerischen Zeichen bestehen ([a-zA-Z0-9_])" +msgstr "Die Benutzer-ID muss mindestens 3 Zeichen enthalten und darf nur aus alphanumerischen Zeichen bestehen ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Bitte Vornamen eingeben" diff --git a/po/en.po b/po/en.po index 09e5fb903..f5b5d8594 100644 --- a/po/en.po +++ b/po/en.po @@ -227,7 +227,7 @@ msgid "The address is already registered." msgstr "The address %1 is already registered." msgid "Your identifier must contain at least 3 characters" -msgstr "Your identifier must contain at least 3 characters and only contain alphanumeric characters ([a-zA-Z0-9_])" +msgstr "Your identifier must contain at least 3 characters and only contain alphanumeric characters ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "You must enter your first name" diff --git a/po/es.po b/po/es.po index 66e80b86c..e33da36c9 100644 --- a/po/es.po +++ b/po/es.po @@ -224,7 +224,7 @@ msgid "The address is already registered." msgstr "La dirección %1 ya está registrada." msgid "Your identifier must contain at least 3 characters" -msgstr "El identificador debe contener al menos 3 caracteres y sólo puede contener caracteres alfanuméricos ([a-zA-Z0-9_])" +msgstr "El identificador debe contener al menos 3 caracteres y sólo puede contener caracteres alfanuméricos ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Debe escribir su nombre" diff --git a/po/fr.po b/po/fr.po index e2f3dc649..77bfa20d6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -227,7 +227,7 @@ msgid "The address is already registered." msgstr "L'adresse %1 est déjà enregistrée." msgid "Your identifier must contain at least 3 characters" -msgstr "Votre identifiant doit contenir au moins 3 caractères alphanumériques ([a-zA-Z0-9_])" +msgstr "Votre identifiant doit contenir au moins 3 caractères alphanumériques ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Le prénom est obligatoire" diff --git a/po/he.po b/po/he.po index b0d969c81..4267cad3d 100644 --- a/po/he.po +++ b/po/he.po @@ -217,7 +217,7 @@ msgid "The address is already registered." msgstr "התכובת %1 כבר רשומה." msgid "Your identifier must contain at least 3 characters" -msgstr "השם המזהה חייב להכיל לפחות 3 תווים ועל כולם להיות תווים אלפאנומריים ([a-zA-Z0-9_])" +msgstr "השם המזהה חייב להכיל לפחות 3 תווים ועל כולם להיות תווים אלפאנומריים ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "יש להזין את השם הפרטי" diff --git a/po/hr.po b/po/hr.po index bc59c7ffe..87ca3b778 100644 --- a/po/hr.po +++ b/po/hr.po @@ -221,7 +221,7 @@ msgid "The address is already registered." msgstr "Adresa %1 je već registrirana" msgid "Your identifier must contain at least 3 characters" -msgstr "Vaša oznaka mora sadržavati najmanje tri slova i može sadržavati samo alfanumerike ([a-zA-Z0-9_])" +msgstr "Vaša oznaka mora sadržavati najmanje tri slova i može sadržavati samo alfanumerike ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Morate unijeti vaše ime" diff --git a/po/hu.po b/po/hu.po index 969c3c1a4..5028b2283 100644 --- a/po/hu.po +++ b/po/hu.po @@ -165,7 +165,7 @@ msgid "The address is already registered." msgstr "%1 email cím már foglalt." msgid "Your identifier must contain at least 3 characters" -msgstr "Az azonosítónak legalább 3 betûbõl kell állnia és csak alfanumerikus karaktereket tartalmazhat ([a-zA-Z0-9_])." +msgstr "Az azonosítónak legalább 3 betûbõl kell állnia és csak alfanumerikus karaktereket tartalmazhat ([-a-zA-Z0-9_])." msgid "You must enter your first name" msgstr "A keresztnév megadása kötelezõ." diff --git a/po/it.po b/po/it.po index 9c755aa36..c63469a74 100644 --- a/po/it.po +++ b/po/it.po @@ -228,7 +228,7 @@ msgstr "L'indirizzo %1 è già iscritto." msgid "Your identifier must contain at least 3 characters" msgstr "" "L'identificativo deve essere composto da almeno 3 caratteri alfanumerici\n" -"([a-zA-Z0-9_])\n" +"([-a-zA-Z0-9_])\n" msgid "You must enter your first name" msgstr "Il nome è obbligatorio" diff --git a/po/ja.po b/po/ja.po index 445d88143..88e93e6d9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -223,7 +223,7 @@ msgid "The address is already registered." msgstr "アドレス %1 はすでに登録されています。" msgid "Your identifier must contain at least 3 characters" -msgstr "ID は3文字以上の半角英数字でお願いします。 ([a-zA-Z0-9_])" +msgstr "ID は3文字以上の半角英数字でお願いします。 ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "ファーストネーム(名)を入力してください" diff --git a/po/nb.po b/po/nb.po index d22e253c9..025c58035 100644 --- a/po/nb.po +++ b/po/nb.po @@ -226,7 +226,7 @@ msgid "The address is already registered." msgstr "Adressen %1 er allerede registrert." msgid "Your identifier must contain at least 3 characters" -msgstr "Brukernavnet ditt må inneholde minst tre tegn og bestå av alfanumeriske tegn ([a-zA-Z0-9_])" +msgstr "Brukernavnet ditt må inneholde minst tre tegn og bestå av alfanumeriske tegn ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Du må oppgi ditt fornavn" diff --git a/po/nl.po b/po/nl.po index fa884e475..42bc29c26 100644 --- a/po/nl.po +++ b/po/nl.po @@ -223,7 +223,7 @@ msgid "The address is already registered." msgstr "Het adres %1 is al geregistreerd." msgid "Your identifier must contain at least 3 characters" -msgstr "Uw naam dient minimaal uit 3 tekens te bestaan en uitsluitend alfanumerieke tekens ([a-zA-Z0-9_]) zijn toegestaan" +msgstr "Uw naam dient minimaal uit 3 tekens te bestaan en uitsluitend alfanumerieke tekens ([-a-zA-Z0-9_]) zijn toegestaan" msgid "You must enter your first name" msgstr "Gelieve uw voornaam in te geven" diff --git a/po/pt.po b/po/pt.po index cbfb2754e..151ea5f5c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -223,7 +223,7 @@ msgid "The address is already registered." msgstr "O endereço %1 já está registado." msgid "Your identifier must contain at least 3 characters" -msgstr "O seu identificador deve conter pelo menos 3 caracteres, e apenas caracteres alfanuméricos ([a-zA-Z0-9_])" +msgstr "O seu identificador deve conter pelo menos 3 caracteres, e apenas caracteres alfanuméricos ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "O seu nome é obrigatório" diff --git a/po/ru.po b/po/ru.po index a5a8d47dc..00a0caf4a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -224,7 +224,7 @@ msgid "The address is already registered." msgstr "Адрес %1 уже зарегистрирован." msgid "Your identifier must contain at least 3 characters" -msgstr "Ваш идентификатор должен состоять как минимум из трех символов и содержать только латинские буквы и цифры ([a-zA-Z0-9_])" +msgstr "Ваш идентификатор должен состоять как минимум из трех символов и содержать только латинские буквы и цифры ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Необходимо ввести имя" diff --git a/po/sk.po b/po/sk.po index f3597d9f3..a2bdca4b8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -224,7 +224,7 @@ msgid "The address is already registered." msgstr "Táto adresa %1 je už zaregistrovaná." msgid "Your identifier must contain at least 3 characters" -msgstr "Tvoja identifikácia musí obsahovať aspoň 3 a iba alfanumerické znaky ([a-zA-Z0-9_]{3,})" +msgstr "Tvoja identifikácia musí obsahovať aspoň 3 a iba alfanumerické znaky ([-a-zA-Z0-9_]{3,})" msgid "You must enter your first name" msgstr "Musíš zadať svoje meno" diff --git a/po/uk.po b/po/uk.po index feaa2c867..6a81e52b7 100644 --- a/po/uk.po +++ b/po/uk.po @@ -224,7 +224,7 @@ msgid "The address is already registered." msgstr "Адреса %1 вже зареєстрована." msgid "Your identifier must contain at least 3 characters" -msgstr "Ваш ідентифікатор повинен складатися як мінімум з трьох символів і містити тільки латинські літери та цифри ([a-zA-Z0-9_])" +msgstr "Ваш ідентифікатор повинен складатися як мінімум з трьох символів і містити тільки латинські літери та цифри ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "Необхідно ввести ім'я" diff --git a/po/zh.po b/po/zh.po index b2abfe250..b173e3277 100644 --- a/po/zh.po +++ b/po/zh.po @@ -223,7 +223,7 @@ msgid "The address is already registered." msgstr "该地址 %1 已注册。" msgid "Your identifier must contain at least 3 characters" -msgstr "ID 必须是3个以上半角英文字符。 ([a-zA-Z0-9_])" +msgstr "ID 必须是3个以上半角英文字符。 ([-a-zA-Z0-9_])" msgid "You must enter your first name" msgstr "您必须输入您的名" From 1af37b45ac112221eb780efffd4ea98908ba3554 Mon Sep 17 00:00:00 2001 From: "Salve J. Nilsen" Date: Sat, 18 Apr 2015 16:52:47 +0200 Subject: [PATCH 2/2] Ignore *~ backup files --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b25c15b81 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~