Wiking branch, master, updated. 5cef8510f00caac59cd055e20d59800182d3527f

[Boris Dusek]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  5cef8510f00caac59cd055e20d59800182d3527f (commit)
      from  6a0f73e06fb0bcb46a66d49f36c5b52865f16b73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5cef8510f00caac59cd055e20d59800182d3527f
Author: Boris Dusek <dusek at brailcom.org>
Date:   Sat Oct 16 10:52:26 2010 +0200

    Adjust registration messages.

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/users.py |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/wiking/cms/users.py b/lib/wiking/cms/users.py
index 28f3d04..662bfed 100644
--- a/lib/wiking/cms/users.py
+++ b/lib/wiking/cms/users.py
@@ -760,13 +760,8 @@ class Users(UserManagementModule):
         base_uri = req.server_uri() + (req.module_uri('Registration') or '/_wmi/'+ self.name())
         uri = req.make_uri(base_uri, action='confirm', uid=record['uid'].value(),
                            regcode=record['regcode'].value())
-        text = _("The first step of your registration at %(server_hostname)s "
-                 "was successfully completed.\n\n"
-                 "For the next step visit the following URL and follow the instructions there:\n"
-                 "%(uri)s\n\n"
-                 "If the above link fails, you will be prompted for your activation code when\n"
-                 "you attempt to log in.\n\n"
-                 "Your activation code is: %(code)s\n",
+        text = _("To finish your registration at %(server_hostname)s, click on the following link:\n"
+                 "%(uri)s\n\n",
                  server_hostname=req.server_hostname(),
                  uri=uri,
                  code=record['regcode'].value())
@@ -775,8 +770,9 @@ class Users(UserManagementModule):
 
     def _redirect_after_insert(self, req, record):
         if self._send_registration_email(req, record):
-            content = (lcg.p(_("Registration accepted.")),
-                       lcg.p(_("Please, check your mailbox for instructions how to proceed.")))
+            content = (lcg.p(_("To finish registration, please confirm the "
+                               "activation code that was sent to your email "
+                               "address.")),)
             
         else:
             self._data.delete(record['uid'])


hooks/post-receive
-- 
Wiking