taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #563 from taigaio/Fixng-error-messages-when-creating-membership-for-existing-user-in-the-project 

Fixing error message when creating membership for existing user in th…
remotes/origin/logger
David Barragán Merino 2016-01-07 11:13:25 +01:00
parent 13e1d65e44 9d26fa86ff
commit 7c8763cf5c
13 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taiga/auth/services.py
View File

@ -141,7 +141,7 @@ def private_register_for_existing_user(token:str, username:str, password:str):
membership.user = user membership.user = user
membership.save(update_fields=["user"]) membership.save(update_fields=["user"])
except IntegrityError: except IntegrityError:
raise exc.IntegrityError(_("Membership with user is already exists.")) raise exc.IntegrityError(_("This user is already a member of the project."))
send_register_email(user) send_register_email(user)
return user return user

8
taiga/locale/ca/LC_MESSAGES/django.po
View File

@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 13:35+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Catalan (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/ca/)\n" "language/ca/)\n"
@ -58,8 +58,8 @@ msgid "User is already registered."
msgstr "Aquest usuari ja està registrat" msgstr "Aquest usuari ja està registrat"
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Aquest usuari ja es membre" msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

10
taiga/locale/de/LC_MESSAGES/django.po
View File

@ -17,9 +17,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-11 09:45+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Guido Brand\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: German (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/de/)\n" "language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -68,8 +68,8 @@ msgid "User is already registered."
msgstr "Der Benutzer ist schon registriert." msgstr "Der Benutzer ist schon registriert."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Der Benutzer für diese Mitgliedschaft existiert bereits." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

4
taiga/locale/en/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-03-25 20:09+0100\n" "PO-Revision-Date: 2015-03-25 20:09+0100\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Taiga Dev Team <support@taiga.io>\n" "Language-Team: Taiga Dev Team <support@taiga.io>\n"
@ -54,7 +54,7 @@ msgid "User is already registered."
msgstr "" msgstr ""
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "" msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170

10
taiga/locale/es/LC_MESSAGES/django.po
View File

@ -13,9 +13,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 21:24+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Jesus Marin <contacto@jesusmg.org>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Spanish (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/es/)\n" "language/es/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -62,8 +62,8 @@ msgid "User is already registered."
msgstr "Este usuario ya está registrado." msgstr "Este usuario ya está registrado."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Ya existe una membresía asociada a este usuario." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

8
taiga/locale/fi/LC_MESSAGES/django.po
View File

@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 08:25+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Finnish (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/fi/)\n" "language/fi/)\n"
@ -59,8 +59,8 @@ msgid "User is already registered."
msgstr "Käyttäjä on jo rekisteröitynyt." msgstr "Käyttäjä on jo rekisteröitynyt."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Jäsenyys on jo olemassa." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

10
taiga/locale/fr/LC_MESSAGES/django.po
View File

@ -18,9 +18,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-17 20:48+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Regis TEDONE <regis.tedone@gmail.com>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: French (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/fr/)\n" "language/fr/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -68,8 +68,8 @@ msgid "User is already registered."
msgstr "Cet utilisateur est déjà inscrit." msgstr "Cet utilisateur est déjà inscrit."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Cet utilisateur est déjà membre." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

10
taiga/locale/it/LC_MESSAGES/django.po
View File

@ -13,9 +13,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-10 14:10+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Andrea Raimondi <raimondi.and@gmail.com>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Italian (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/it/)\n" "language/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -64,8 +64,8 @@ msgid "User is already registered."
msgstr "L'Utente è già registrato." msgstr "L'Utente è già registrato."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "L'utente risulta già associato." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

8
taiga/locale/nl/LC_MESSAGES/django.po
View File

@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 13:41+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Dutch (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/nl/)\n" "language/nl/)\n"
@ -58,8 +58,8 @@ msgid "User is already registered."
msgstr "Gebruiker is al geregistreerd." msgstr "Gebruiker is al geregistreerd."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Lidmaatschap met gebruiker bestaat al." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

8
taiga/locale/pl/LC_MESSAGES/django.po
View File

@ -10,8 +10,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 08:25+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Polish (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/pl/)\n" "language/pl/)\n"
@ -60,8 +60,8 @@ msgid "User is already registered."
msgstr "Użytkownik już zarejestrowany" msgstr "Użytkownik już zarejestrowany"
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Członkowstwo z użytkownikiem już istnieje." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

8
taiga/locale/pt_BR/LC_MESSAGES/django.po
View File

@ -18,8 +18,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 08:25+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/taiga-agile-llc/"
"taiga-back/language/pt_BR/)\n" "taiga-back/language/pt_BR/)\n"
@ -67,8 +67,8 @@ msgid "User is already registered."
msgstr "Este usuário já está registrado." msgstr "Este usuário já está registrado."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Esse usuário já é membro." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

10
taiga/locale/ru/LC_MESSAGES/django.po
View File

@ -12,9 +12,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-07 12:59+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Dmitriy Volkov <wldhx+reg+transifex@wldhx.me>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/" "Language-Team: Russian (http://www.transifex.com/taiga-agile-llc/taiga-back/"
"language/ru/)\n" "language/ru/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -63,8 +63,8 @@ msgid "User is already registered."
msgstr "Пользователь уже зарегистрирован." msgstr "Пользователь уже зарегистрирован."
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "Членство с этим пользователем уже существует." msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."

8
taiga/locale/zh-Hant/LC_MESSAGES/django.po
View File

@ -11,8 +11,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: taiga-back\n" "Project-Id-Version: taiga-back\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-05 11:11+0100\n" "POT-Creation-Date: 2016-01-07 11:11+0100\n"
"PO-Revision-Date: 2015-11-02 08:25+0000\n" "PO-Revision-Date: 2016-01-07 10:12+0000\n"
"Last-Translator: Taiga Dev Team <support@taiga.io>\n" "Last-Translator: Taiga Dev Team <support@taiga.io>\n"
"Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/" "Language-Team: Chinese Traditional (http://www.transifex.com/taiga-agile-llc/"
"taiga-back/language/zh-Hant/)\n" "taiga-back/language/zh-Hant/)\n"
@ -60,8 +60,8 @@ msgid "User is already registered."
msgstr "使用者已被註冊。" msgstr "使用者已被註冊。"
#: taiga/auth/services.py:144 #: taiga/auth/services.py:144
msgid "Membership with user is already exists." msgid "This user is already a member of the project."
msgstr "使用者的成員資格已存在。" msgstr ""
#: taiga/auth/services.py:170 #: taiga/auth/services.py:170
msgid "Error on creating new user." msgid "Error on creating new user."