diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
| commit | ecb3abf84c8b6e868a523b8e721484cb7a4e0f63 (patch) | |
| tree | c27d9b8c427e0e64b0cabe9419c640ac8b382c3b /actions/register.php | |
| parent | a180658a3bfcf2b7b312058e3aa76e0e2467c2f8 (diff) | |
| parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) | |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'actions/register.php')
| -rw-r--r-- | actions/register.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/register.php b/actions/register.php index 57f8e7bdf..698137346 100644 --- a/actions/register.php +++ b/actions/register.php @@ -259,6 +259,7 @@ class RegisterAction extends Action // Re-init language env in case it changed (not yet, but soon) common_init_language(); + $this->showSuccess(); } else { $this->showForm(_('Invalid username or password.')); @@ -534,9 +535,9 @@ class RegisterAction extends Action array('nickname' => $nickname)); $this->elementStart('div', 'success'); - $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '. + $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '. 'From here, you may want to...'. "\n\n" . - '* Go to [your profile](%s) '. + '* Go to [your profile](%2$s) '. 'and post your first message.' . "\n" . '* Add a [Jabber/GTalk address]'. '(%%%%action.imsettings%%%%) '. |