diff options
| -rw-r--r-- | actions/delete.php | 14 | ||||
| -rw-r--r-- | languages/en.php | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/actions/delete.php b/actions/delete.php index 5506c2303..cab996ec5 100644 --- a/actions/delete.php +++ b/actions/delete.php @@ -14,12 +14,12 @@ $entity = get_entity($guid); if (!$entity) { // unable to get Elgg entity - register_error(elgg_echo("file:deletefailed")); + register_error(elgg_echo("tidypics:deletefailed")); forward($forward_url); } if (!$entity->canEdit()) { // user doesn't have permissions - register_error(elgg_echo("file:deletefailed")); + register_error(elgg_echo("tidypics:deletefailed")); forward($forward_url); } @@ -27,7 +27,7 @@ $container = get_entity($entity->container_guid); if ($subtype != 'image' && $subtype != 'album') { // how did we even get here? - register_error(elgg_echo("file:deletefailed")); + register_error(elgg_echo("tidypics:deletefailed")); forward($forward_url); } @@ -83,9 +83,9 @@ $image_repo_size -= $delfile->size(); if (!$delfile->delete()) { - if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object + if ($subtype=='image') register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object } else { - if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object + if ($subtype=='image') system_message(elgg_echo("tidypics:deleted")); //successfully deleted object } } //end delete actual image file } //end looping through each image to delete it @@ -108,9 +108,9 @@ //delete object from database if (!$entity->delete()) { - register_error(elgg_echo("file:deletefailed")); //unable to delete object + register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object } else { - system_message(elgg_echo("file:deleted")); //successfully deleted object + system_message(elgg_echo("tidypics:deleted")); //successfully deleted object } } //end of delete album diff --git a/languages/en.php b/languages/en.php index 7fa5f2e73..aaab21b39 100644 --- a/languages/en.php +++ b/languages/en.php @@ -198,7 +198,8 @@ The photo can be viewed here: %s", 'tidypics:unk_error' => "Unknown upload error", 'tidypics:save_error' => "Unknown error saving the image on server", 'tidypics:not_image' => "This is not a recognized image type", - 'image:deletefailed' => "Your image could not be deleted at this time.", + 'tidypics:deletefailed' => "Sorry. Deletion failed.", + 'tidypics:deleted' => "Successful deletion.", 'image:downloadfailed' => "Sorry; this image is not available at this time.", 'tidypics:nosettings' => "Admin of this site has not set photo album settings.", 'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator", |