X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Femailsettings.php;h=08608348cdae1f79f077df2dc9b70581996485ed;hb=d5f86f7a8a113991f050425e411287da4f738ca2;hp=715457eab2426d26be5bd7789b14ab7ffe03113b;hpb=ec6a38a62786c85e8ee30c5726ea81f82465b39d;p=quix0rs-gnu-social.git

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 715457eab2..08608348cd 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');
     }
 
     /**
@@ -95,7 +95,7 @@ class EmailsettingsAction extends AccountSettingsAction
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-
+        $this->elementStart('fieldset');
         $this->elementStart('fieldset', array('id' => 'settings_email_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
@@ -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');
@@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
        if (common_config('emailpost', 'enabled') && $user->email) {
             $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
-            $this->element('legend',_('Incoming email'));
+            $this->element('legend', null, _('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -194,6 +194,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
         $this->elementEnd('fieldset');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -327,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.'));
@@ -452,7 +453,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Could not update user record."));
+            $this->serverError(_("Couldn't update user record."));
         }
 
         $this->showForm(_('Incoming email address removed.'), true);
@@ -474,7 +475,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Could not update user record."));
+            $this->serverError(_("Couldn't update user record."));
         }
 
         $this->showForm(_('New incoming email address added.'), true);