summaryrefslogtreecommitdiff
path: root/lib/adminpanelaction.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
committerCraig Andrews <candrews@integralblue.com>2010-04-18 19:21:15 -0400
commit39392e03a71d94d6b984033b994b417edfc2d8d6 (patch)
treecb3ae36fc9a20a4cd884e271ef36dcce28f109c8 /lib/adminpanelaction.php
parent727ea5a5163249eb40fa0c4b2c63054fc997473b (diff)
parent23bad16bba52a09f0cea3d2c40e6cf91e2945e37 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: actions/confirmaddress.php actions/imsettings.php
Diffstat (limited to 'lib/adminpanelaction.php')
-rw-r--r--lib/adminpanelaction.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index d87981b6a..6c9947608 100644
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -69,7 +69,7 @@ class AdminPanelAction extends Action
// User must be logged in.
if (!common_logged_in()) {
- // TRANS: Client error message
+ // TRANS: Client error message thrown when trying to access the admin panel while not logged in.
$this->clientError(_('Not logged in.'));
return false;
}
@@ -94,7 +94,7 @@ class AdminPanelAction extends Action
// User must have the right to change admin settings
if (!$user->hasRight(Right::CONFIGURESITE)) {
- // TRANS: Client error message
+ // TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
$this->clientError(_('You cannot make changes to this site.'));
return false;
}
@@ -106,7 +106,7 @@ class AdminPanelAction extends Action
$name = mb_substr($name, 0, -10);
if (!self::canAdmin($name)) {
- // TRANS: Client error message
+ // TRANS: Client error message throw when a certain panel's settings cannot be changed.
$this->clientError(_('Changes to that panel are not allowed.'), 403);
return false;
}
@@ -225,7 +225,7 @@ class AdminPanelAction extends Action
function showForm()
{
- // TRANS: Client error message
+ // TRANS: Client error message.
$this->clientError(_('showForm() not implemented.'));
return;
}
@@ -279,7 +279,8 @@ class AdminPanelAction extends Action
$result = $config->delete();
if (!$result) {
common_log_db_error($config, 'DELETE', __FILE__);
- // TRANS: Client error message
+ // TRANS: Client error message thrown if design settings could not be deleted in
+ // TRANS: the admin panel Design.
$this->clientError(_("Unable to delete design setting."));
return null;
}