Merge with git+ssh://git.catalyst.net.nz/var/git/mahara.git#master

htdocs/admin/editchangepage.json.php

@@ -33,12 +33,12 @@ $pagename = param_alpha('pagename');
 $data['pagename'] = $pagename;
 
 if (!$page = @get_record('site_content','name',$pagename)) {
-    json_reply('local',get_string('failedloadingsitecontent','admin'));
+    json_reply('local',get_string('loadsitepagefailed','admin'));
 }
 
 $data['content'] = $page->content;
 $data['error'] = false;
-$data['message'] = get_string('loadedsitecontent','admin');
+$data['message'] = get_string('sitepageloaded','admin');
 json_headers();
 echo json_encode($data);  
 ?>

htdocs/admin/editsitepage.php

@@ -118,17 +118,17 @@ function requestPageText(removeMessage) {
         editsitepage_remove_message();
     }
     editsitepage_remove_error('pagetext');
-    logDebug(get_string('loadingpagecontent', $('pagename').value));
+    logDebug(get_string('loadingpagecontent', 'admin'));
     var d = loadJSONDoc('editchangepage.json.php',{'pagename':$('pagename').value});
     d.addCallback(function(data) {
         if (!data.error) {
-            logDebug(get_string('loadedsuccessfully', $('pagename').value));
+            logDebug(get_string('sitepageloaded', 'admin'));
             setEditorContent(data.content);
             originalcontent = getEditorContent();
             oldpagename = $('pagename').value;
         }
         else {
-            displayMessage(get_string('failedloadingpagecontent', $('pagename').value),'error');
+            displayMessage(get_string('loadsitepagefailed', 'admin'));
         }
         processingStop();
     });

htdocs/admin/getmenuitems.json.php

@@ -52,14 +52,14 @@ if ($menuitems) {
             // $r['link'] = $i->url;
         }
         else {
-            json_reply('local',get_string('failedloadingsitemenu','admin'));
+            json_reply('local',get_string('loadmenuitemsfailed','admin'));
         }
         $rows[] = $r;
     }
 }
 $result['menuitems'] = array_values($rows);
 $result['error'] = false;
-$result['message'] = get_string('sitemenuloaded','admin');
+$result['message'] = get_string('menuitemsloaded','admin');
 
 json_headers();
 echo json_encode($result);

htdocs/artefact/lib.php

@@ -405,13 +405,12 @@ function artefact_check_plugin_sanity($pluginname) {
     $types = call_static_method($classname, 'get_artefact_types');
     foreach ($types as $type) {
         $typeclassname = generate_artefact_class_name($type);
-        try {
+        if (get_config('installed')) {
             if ($taken = get_record_select('artefact_installed_type', 'name = ? AND plugin != ?', 
                                            array($type, $pluginname))) {
                 throw new InstallationException("type $type is already taken by another plugin (" . $taken->plugin . ")");
             }
         }
-        catch (SQLException $e) {} // do nothing, it means we're installing and the table doesn't exist.
         if (!class_exists($typeclassname)) {
             throw new InstallationException("class $typeclassname for type $type in plugin $pluginname was missing");
         }

htdocs/lang/en.utf8/admin.php

@@ -77,27 +77,32 @@ $string['viruscheckingdescription'] = 'If checked, virus checking will be enable
 
 // Admin menu editor
 //$string['menueditor']    = 'Menu editor';
-$string['adminfile']     = 'Admin file';
-$string['externallink']  = 'External link';
-$string['type']          = 'Type';
-$string['name']          = 'Name';
-$string['noadminfiles']  = 'No admin files';
-$string['linkedto']      = 'Linked to';
-$string['editmenus']     = 'Edit menus';
-$string['menuitemsaved'] = 'Menu item saved';
-$string['savingmenuitem'] = 'Saving menu item';
-$string['menuitemsloaded'] = 'Menu items loaded';
-$string['deletingmenuitem'] = 'Deleting menu item';
-$string['menuitemdeleted'] = 'Menu item deleted';
-$string['loadingmenuitems'] = 'Loading menu items';
-$string['loggedinmenu']  = 'Logged in menu';
-$string['loggedoutmenu'] = 'Logged out menu';
+$string['adminfile']           = 'Admin file';
+$string['badmenuitemtype']     = 'Unknown menu item type';
+$string['externallink']        = 'External link';
+$string['type']                = 'Type';
+$string['name']                = 'Name';
+$string['noadminfiles']        = 'No admin files';
+$string['linkedto']            = 'Linked to';
+$string['editmenus']           = 'Edit menus';
+$string['menuitemsaved']       = 'Menu item saved';
+$string['savingmenuitem']      = 'Saving menu item';
+$string['menuitemsloaded']     = 'Menu items loaded';
+$string['deletingmenuitem']    = 'Deleting menu item';
+$string['deletefailed']        = 'Failed deleting menu item';
+$string['menuitemdeleted']     = 'Menu item deleted';
+$string['loadingmenuitems']    = 'Loading menu items';
+$string['loadmenuitemsfailed'] = 'Failed to load menu items';
+$string['loggedinmenu']        = 'Logged in menu';
+$string['loggedoutmenu']       = 'Logged out menu';
 
 // Site content
 $string['about']               = 'About';
 $string['discardpageedits']    = 'Discard your changes to this page?';
 $string['editsitecontent']     = 'Edit site content';
 $string['home']                = 'Home';
+$string['loadingpagecontent']  = 'Loading site page content';
+$string['loadsitepagefailed']  = 'Failed to load site page';
 $string['loggedouthome']       = 'Logged out Home';
 $string['pagecontents']        = 'Text to appear on the page';
 $string['pagename']            = 'Page name';
@@ -105,7 +110,8 @@ $string['pagesaved']           = 'Page saved';
 $string['pagetext']            = 'Page text';
 $string['privacy']             = 'Privacy statement';
 $string['savechanges']         = 'Save changes';
-$string['sitecontentnotfound'] = '%s text not available';
+$string['savefailed']          = 'Save failed';
+$string['sitepageloaded']      = 'Site page loaded';
 $string['termsandconditions']  = 'Terms and conditions';
 $string['uploadcopyright']     = 'Upload copyright statement';
 

htdocs/lang/en.utf8/mahara.php

@@ -138,7 +138,8 @@ $string['add']           = 'Add';
 $string['delete']        = 'Delete';
 $string['edit']          = 'Edit';
 
-
+// Site content pages
+$string['sitecontentnotfound'] = '%s text not available';
 
 // Contact us form
 $string['name']                     = 'Name';
@@ -150,6 +151,7 @@ $string['nositecontactaddress']     = 'Site contact email address not set';
 $string['nosendernamefound']        = 'No sender name was submitted';
 $string['emailnotsent']             = 'Failed to send contact email. Error message: "%s"';
 $string['contactinformationsent']   = 'Your contact information has been sent';
+$string['contactaddress']           = 'Contact address';
 
 // mahara.js
 $string['namedfieldempty'] = 'The required field "%s" is empty';