# HG changeset patch # User Søren Løvborg # Date 2016-07-28 15:38:30 # Node ID 38e418408c58da1acd02c280d9e855a3690455e7 # Parent e8565d50d064e80cca9c3a6e70eab23746f90eef login: have self-signup confirmation message respect site_name diff --git a/kallithea/controllers/login.py b/kallithea/controllers/login.py --- a/kallithea/controllers/login.py +++ b/kallithea/controllers/login.py @@ -147,7 +147,7 @@ class LoginController(BaseController): error_dict=error_dict) UserModel().create_registration(form_result) - h.flash(_('You have successfully registered into Kallithea'), + h.flash(_('You have successfully registered with %s') % (c.site_name or 'Kallithea'), category='success') Session().commit() raise HTTPFound(location=url('login_home')) diff --git a/kallithea/i18n/be/LC_MESSAGES/kallithea.po b/kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po @@ -297,8 +297,8 @@ msgid "Bad captcha" msgstr "Няслушная капча" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" +msgid "You have successfully registered with %s" +msgstr "Рэгістрацыя ў %s прайшла паспяхова" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po @@ -291,7 +291,7 @@ msgid "Bad captcha" msgstr "Špatná captcha" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -298,8 +298,8 @@ msgid "Bad captcha" msgstr "Falsches Captcha" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Sie haben sich erfolgreich bei Kallithea registriert" +msgid "You have successfully registered with %s" +msgstr "Sie haben sich erfolgreich bei %s registriert" #: kallithea/controllers/login.py:195 #, fuzzy diff --git a/kallithea/i18n/el/LC_MESSAGES/kallithea.po b/kallithea/i18n/el/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po @@ -304,8 +304,8 @@ msgid "Bad captcha" msgstr "Λάθος captcha" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Εγγραφήκατε επιτυχώς στο Kallithea" +msgid "You have successfully registered with %s" +msgstr "Εγγραφήκατε επιτυχώς στο %s" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/es/LC_MESSAGES/kallithea.po b/kallithea/i18n/es/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po @@ -294,8 +294,8 @@ msgid "Bad captcha" msgstr "CAPTCHA erróneo" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "El registro en Kallithea se ha efectuado correctamente" +msgid "You have successfully registered with %s" +msgstr "El registro en %s se ha efectuado correctamente" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -300,8 +300,8 @@ msgid "Bad captcha" msgstr "Mauvais captcha" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Vous vous êtes inscrits avec succès à Kallithea" +msgid "You have successfully registered with %s" +msgstr "Vous vous êtes inscrits avec succès à %s" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po @@ -290,7 +290,7 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -297,8 +297,8 @@ msgid "Bad captcha" msgstr "キャプチャが一致しません" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Kallitheaへの登録を受け付けました" +msgid "You have successfully registered with %s" +msgstr "%sへの登録を受け付けました" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot +++ b/kallithea/i18n/kallithea.pot @@ -285,7 +285,7 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po @@ -291,7 +291,7 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po @@ -302,8 +302,8 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Udało Ci się zarejestrować na stronie" +msgid "You have successfully registered with %s" +msgstr "Udało Ci się zarejestrować w %s" #: kallithea/controllers/login.py:195 #, fuzzy diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po @@ -296,8 +296,8 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Você foi registrado no Kallithea com sucesso" +msgid "You have successfully registered with %s" +msgstr "Você foi registrado no %s com sucesso" #: kallithea/controllers/login.py:195 #, fuzzy diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -306,8 +306,8 @@ msgid "Bad captcha" msgstr "Неверная капча" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "Регистрация в Kallithea прошла успешно" +msgid "You have successfully registered with %s" +msgstr "Регистрация в %s прошла успешно" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po @@ -291,7 +291,7 @@ msgid "Bad captcha" msgstr "zlá captcha" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po @@ -293,8 +293,8 @@ msgid "Bad captcha" msgstr "验证码错误" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" -msgstr "您已成功注册 Kallithea" +msgid "You have successfully registered with %s" +msgstr "您已成功注册 %s" #: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po @@ -290,7 +290,7 @@ msgid "Bad captcha" msgstr "" #: kallithea/controllers/login.py:150 -msgid "You have successfully registered into Kallithea" +msgid "You have successfully registered with %s" msgstr "" #: kallithea/controllers/login.py:195 diff --git a/kallithea/tests/functional/test_login.py b/kallithea/tests/functional/test_login.py --- a/kallithea/tests/functional/test_login.py +++ b/kallithea/tests/functional/test_login.py @@ -327,7 +327,7 @@ class TestLoginController(TestController 'lastname': lastname, 'admin': True}) # This should be overridden assert response.status == '302 Found' - self.checkSessionFlash(response, 'You have successfully registered into Kallithea') + self.checkSessionFlash(response, 'You have successfully registered with Kallithea') ret = Session().query(User).filter(User.username == 'test_regular4').one() assert ret.username == username