Mercurial > kallithea

changeset 6067:38e418408c58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
login: have self-signup confirmation message respect site_name
author Søren Løvborg <sorenl@unity3d.com>
date Thu, 28 Jul 2016 15:38:30 +0200
parents e8565d50d064
children 37d251842780
files 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
diffstat 18 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/login.py	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/controllers/login.py	Thu Jul 28 15:38:30 2016 +0200
@@ -147,7 +147,7 @@
                                                  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'))
--- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -297,8 +297,8 @@
 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"
--- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -291,7 +291,7 @@
 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
--- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -298,8 +298,8 @@
 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
--- a/kallithea/i18n/el/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -304,8 +304,8 @@
 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"
--- a/kallithea/i18n/es/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/es/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -294,8 +294,8 @@
 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"
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -300,8 +300,8 @@
 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"
--- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -290,7 +290,7 @@
 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
--- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -297,8 +297,8 @@
 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"
--- a/kallithea/i18n/kallithea.pot	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/kallithea.pot	Thu Jul 28 15:38:30 2016 +0200
@@ -285,7 +285,7 @@
 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
--- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -291,7 +291,7 @@
 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
--- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -302,8 +302,8 @@
 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
--- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -296,8 +296,8 @@
 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
--- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -306,8 +306,8 @@
 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"
--- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -291,7 +291,7 @@
 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
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -293,8 +293,8 @@
 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"
--- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po	Thu Jul 28 15:38:30 2016 +0200
@@ -290,7 +290,7 @@
 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
--- a/kallithea/tests/functional/test_login.py	Thu Jul 28 15:25:42 2016 +0200
+++ b/kallithea/tests/functional/test_login.py	Thu Jul 28 15:38:30 2016 +0200
@@ -327,7 +327,7 @@
                                              '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