MDL-14378 When deleting course category deal with everything that depends on its...

diff --git a/course/lib.php b/course/lib.php
index 0d59719ceeba74834365f8ad528a54694e27f129..b0b99798f009e745f09e6f4d0a0ef4d61b2229ea 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -2726,7 +2726,7 @@ function category_delete_full($category, $showfeedback=true) {
                 notify("Error deleting course $course->shortname"); 
                 return false;
             }
-            notify("Deleted course $course->shortname", 'notifysuccess'); // TODO: localize 
+            notify(get_string('coursedeleted', '', $course->shortname), 'notifysuccess'); 
         }
     }
 
@@ -2743,7 +2743,7 @@ function category_delete_full($category, $showfeedback=true) {
 
     events_trigger('category_deleted', $category);
 
-    notify("Deleted category $category->name", 'notifysuccess'); // TODO: localize 
+    notify(get_string('coursecategorydeleted', '', format_string($category->name)), 'notifysuccess'); 
 
     return true;
 }
@@ -2777,7 +2777,7 @@ function category_delete_move($category, $newparentid, $showfeedback=true) {
             notify("Error moving courses"); 
             return false;
         }
-        notify("Moved courses from $category->name", 'notifysuccess'); // TODO: localize 
+        notify(get_string('coursesmovedout', '', format_string($category->name)), 'notifysuccess'); 
     }
 
     // now delete anything that may depend on course category context
@@ -2793,7 +2793,7 @@ function category_delete_move($category, $newparentid, $showfeedback=true) {
 
     events_trigger('category_deleted', $category);
 
-    notify("Deleted category $category->name", 'notifysuccess'); // TODO: localize 
+    notify(get_string('coursecategorydeleted', '', format_string($category->name)), 'notifysuccess'); 
 
     return true;
 }

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 8221160975c54ca5b8fbb2579cc3b8501c223ddb..ad1ba127c00583faea26cc487accb338cbda28d5 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -268,8 +268,10 @@ $string['courseavailablenot'] = 'This course is not available to students';
 $string['coursebackup'] = 'Course backup';
 $string['coursecategories'] = 'Course categories';
 $string['coursecategory'] = 'Course category';
+$string['coursecategorydeleted'] = 'Deleted course category $a';
 $string['coursecreators'] = 'Course creator';
 $string['coursecreatorsdescription'] = 'Course creators can create new courses and teach in them.';
+$string['coursedeleted'] = 'Deleted course $a';
 $string['coursefiles'] = 'Course files';
 $string['courseformatdata'] = 'Course format data';
 $string['courseformats'] = 'Course formats';
@@ -297,6 +299,7 @@ $string['courserequestsuccess'] = 'Successfully saved your course request. Expec
 $string['courserestore'] = 'Course restore';
 $string['courses'] = 'Courses';
 $string['coursescategory'] = 'Courses in the same category';
+$string['coursesmovedout'] = 'Courses moved out from $a';
 $string['coursespending'] = 'Courses pending approval';
 $string['coursestaught'] = 'Courses I have taught';
 $string['courseupdates'] = 'Course updates';