kallithea Changeset - 38e418408c58

Changeset - 38e418408c58

Parent rev.

Child rev.

[Not reviewed]

default

0 18 0

Søren Løvborg - 9 years ago 2016-07-28 15:38:30
sorenl@unity3d.com

18 files changed with 28 insertions and 28 deletions:

kallithea/controllers/login.py

kallithea/i18n/be/LC_MESSAGES/kallithea.po

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

kallithea/i18n/de/LC_MESSAGES/kallithea.po

kallithea/i18n/el/LC_MESSAGES/kallithea.po

kallithea/i18n/es/LC_MESSAGES/kallithea.po

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/kallithea.pot

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/tests/functional/test_login.py

0 comments (0 inline, 0 general)

kallithea/controllers/login.py

➞

Show inline comments

@@ @@ -138,25 +138,25 @@ class LoginController(BaseController): @@
                     response = submit(request.POST.get('recaptcha_challenge_field'),
                                       request.POST.get('recaptcha_response_field'),
                                       private_key=captcha_private_key,
                                       remoteip=self.ip_addr)
                     if c.captcha_active and not response.is_valid:
                         _value = form_result
                         _msg = _('Bad captcha')
                         error_dict = {'recaptcha_field': _msg}
                         raise formencode.Invalid(_msg, _value, None,
                                                  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'))
             except formencode.Invalid as errors:
                 return htmlfill.render(
                     render('/register.html'),
                     defaults=errors.value,
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8",
                     force_defaults=False)

kallithea/i18n/be/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -288,26 +288,26 @@ msgstr "Публічны журнал" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Журнал"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "Код для скідання пароля адпраўлены"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "Няслушны код скідання пароля"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/cs/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -282,25 +282,25 @@ msgstr "" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167

kallithea/i18n/de/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -289,26 +289,26 @@ msgstr "Öffentliches Logbuch" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Logbuch"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet"
 #: kallithea/controllers/login.py:244
 #, fuzzy
 msgid "Invalid password reset token"
 msgstr "Link zum Zurücksetzen des Passworts"
 #: kallithea/controllers/login.py:249

kallithea/i18n/el/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -295,26 +295,26 @@ msgstr "Δημόσιο Ημερολόγιο" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Ημερολόγιο"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/es/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -285,26 +285,26 @@ msgstr "Registro público" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Registro"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "Se ha enviado una confirmación de restauración de contraseña"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "Señal de restauración de contraseña inválida"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/fr/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -291,26 +291,26 @@ msgstr "Journal public" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Historique"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "Clé de réinitialisation de mot de passe invalide"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/hu/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -281,25 +281,25 @@ msgstr "" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -288,26 +288,26 @@ msgstr "公開ジャーナル" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "ジャーナル"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "パスワードリセットの確認コードが送信されました"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "無効なパスワードリセットトークン"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/kallithea.pot

➞

Show inline comments

@@ @@ -276,25 +276,25 @@ msgstr "" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167

kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -282,25 +282,25 @@ msgstr "" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167

kallithea/i18n/pl/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -293,26 +293,26 @@ msgstr "Dziennik Publiczny" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Dziennik"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr "Twój link zresetowania hasła został wysłany"
 #: kallithea/controllers/login.py:244
 #, fuzzy
 msgid "Invalid password reset token"
 msgstr "łącze resetowania hasła"
 #: kallithea/controllers/login.py:249

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -287,26 +287,26 @@ msgstr "Diário Público" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Diário"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 msgid "A password reset confirmation code has been sent"
 msgstr "Seu link de reinicialização de senha foi enviado"
 #: kallithea/controllers/login.py:244
 #, fuzzy
 msgid "Invalid password reset token"
 msgstr "Link para trocar senha"
 #: kallithea/controllers/login.py:249

kallithea/i18n/ru/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -297,26 +297,26 @@ msgstr "Публичный журнал" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "Журнал"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "Код для сброса пароля отправлен"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "Неверный код для сброса пароля"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/sk/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -282,25 +282,25 @@ msgstr "" @@
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr ""
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 #, fuzzy
 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
 msgid "A password reset confirmation code has been sent"
 msgstr ""
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr ""
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167

kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -284,26 +284,26 @@ msgstr "公共日志" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "日志"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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"
 msgstr "密码重置确认码已经发送"
 #: kallithea/controllers/login.py:244
 msgid "Invalid password reset token"
 msgstr "无效的密码重置令牌"
 #: kallithea/controllers/login.py:249
 #: kallithea/controllers/admin/my_account.py:167
 msgid "Successfully updated password"

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

@@ @@ -281,25 +281,25 @@ msgstr "開放日誌" @@
 #: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157
 #: kallithea/templates/base/base.html:306
 #: kallithea/templates/journal/journal.html:4
 #: kallithea/templates/journal/journal.html:12
 msgid "Journal"
 msgstr "日誌"
 #: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190
 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
 #, fuzzy
 msgid "A password reset confirmation code has been sent"
 msgstr "您的密碼重設連結已寄出"
 #: kallithea/controllers/login.py:244
 #, fuzzy
 msgid "Invalid password reset token"
 msgstr "您的密碼重設連結已寄出"

kallithea/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -318,25 +318,25 @@ class TestLoginController(TestController @@
         name = 'testname'
         lastname = 'testlastname'
         response = self.app.post(url(controller='login', action='register'),
                                             {'username': username,
                                              'password': password,
                                              'password_confirmation': password,
                                              'email': email,
                                              'firstname': name,
                                              '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
         assert check_password(password, ret.password) == True
         assert ret.email == email
         assert ret.name == name
         assert ret.lastname == lastname
         assert ret.api_key != None
         assert ret.admin == False
     #==========================================================================
     # PASSWORD RESET

0 comments (0 inline, 0 general)