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/emailsettings.php | |
parent | a180658a3bfcf2b7b312058e3aa76e0e2467c2f8 (diff) | |
parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'actions/emailsettings.php')
-rw-r--r-- | actions/emailsettings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 761aaa8f3..bfef2970d 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction function title() { - return _('Email Settings'); + return _('Email settings'); } /** @@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('email', _('Email Address'), + $this->input('email', _('Email address'), ($this->arg('email')) ? $this->arg('email') : null, _('Email address, like "UserName@example.org"')); $this->elementEnd('li'); @@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction return; } if (!Validate::email($email, common_config('email', 'check_domain'))) { - $this->showForm(_('Not a valid email address')); + $this->showForm(_('Not a valid email address.')); return; } else if ($user->email == $email) { $this->showForm(_('That is already your email address.')); |