Some strings

htdocs/admin/site/options.php

@@ -104,7 +104,7 @@ $siteoptionform = pieform(array(
 ));
 
 function siteoptions_fail(Pieform $form, $field) {
-    $form->json_reply(PIEFORM_ERR, get_string('siteoptionsfailed','admin', get_string($field)), array($field => get_string($field . 'invalid', 'admin')));
+    $form->json_reply(PIEFORM_ERR, get_string('setsiteoptionsfailed','admin', get_string($field)), array($field => get_string($field . 'invalid', 'admin')));
 }
 
 function siteoptions_submit(Pieform $form, $values) {

htdocs/artefact/blog/attachedfiles.json.php

@@ -50,7 +50,7 @@ $result = array(
     'offset'      => $offset,
     'data'        => $filelist,
     'error'       => false,
-    'message'     => get_string('attachedfilelistloaded'),
+    'message'     => get_string('attachedfilelistloaded', 'artefact.blog'),
 );
 
 json_headers();

htdocs/artefact/blog/lang/en.utf8/artefact.blog.php

@@ -26,67 +26,60 @@
 
 defined('INTERNAL') || die();
 
-$string['myblogs'] = 'My Blogs';
-$string['title'] = 'Title';
-$string['description'] = 'description';
 $string['addblog'] = 'Add Blog';
-$string['newblog'] = 'New Blog';
-
+$string['addpost'] = 'Add Post';
 $string['attach'] = 'Attach';
+$string['attachedfilelistloaded'] = 'Attached file list loaded';
 $string['attachedfiles'] = 'Attached files';
-$string['nofilesattachedtothispost'] = 'No attached files';
-$string['blogpost'] = 'blog post';
-$string['browsemyfiles'] = 'Browse my files';
-$string['remove'] = 'Remove';
-$string['savepost'] = 'Save post';
-
-$string['blogfilesdirname'] = 'blogfiles';
+$string['blogdesc'] = 'Description';
+$string['blogdescdesc'] = 'e.g., ‘Follow Jill on her exciting adventures in New Zealand’.';
 $string['blogfilesdirdescription'] = 'Files uploaded as blog post attachments';
-
+$string['blogfilesdirname'] = 'blogfiles';
+$string['blogpost'] = 'blog post';
+$string['blogsettings'] = 'Blog Settings';
 $string['blogtitle'] = 'Title';
 $string['blogtitledesc'] = 'e.g., ‘Jill’s Travel Blog’.';
-$string['blogdesc'] = 'Description';
-$string['blogdescdesc'] = 'e.g., ‘Follow Jill on her exciting adventures in New Zealand’.';
+$string['browsemyfiles'] = 'Browse my files';
+$string['cancel'] = 'Cancel';
 $string['commentsallowed'] = 'Comments';
 $string['commentsalloweddesc'] = 'Comments can be made on your blog posts if you turn on this option.';
-$string['commentsallowedyes'] = 'Allow logged in users to comment on this blog';
 $string['commentsallowedno'] = 'Don’t allow comments on this blog';
+$string['commentsallowedyes'] = 'Allow logged in users to comment on this blog';
 $string['commentsnotify'] = 'Comment Notification';
 $string['commentsnotifydesc'] = 'You can optionally receive notification whenever someone adds a comment to one of your blog posts.';
-$string['commentsnotifyyes'] = 'Notify me of comments to this blog';
 $string['commentsnotifyno'] = 'Do not notify me of comments to this blog';
-
+$string['commentsnotifyyes'] = 'Notify me of comments to this blog';
+$string['createandpublishdesc'] = 'This will create the blog post and make it available to others.';
+$string['createasdraftdesc'] = 'This will create the blog post, but it will not become available to others until you choose to publish it.';
 $string['createblog'] = 'Create Blog';
-$string['cancel'] = 'Cancel';
-
-$string['viewblog'] = 'View Blog';
-$string['blogsettings'] = 'Blog Settings';
-$string['settings'] = 'Settings';
-$string['addpost'] = 'Add Post';
+$string['delete'] = 'Delete';
+$string['description'] = 'description';
+$string['edit'] = 'Edit';
+$string['editblogpost'] = 'Edit Blog Post';
+$string['erroraccessingblogfilesfolder'] = 'Error accessing blogfiles folder';
+$string['errorsavingattachments'] = 'An error occurred while saving blog post attachments';
+$string['myblogs'] = 'My Blogs';
+$string['newblog'] = 'New Blog';
 $string['newblogpost'] = 'New Blog Post';
-$string['posttitle'] = 'Title';
-$string['posttitledesc'] = 'The title appears above your post.';
+$string['nofilesattachedtothispost'] = 'No attached files';
+$string['noresults'] = 'No results';
 $string['postbody'] = 'Body';
 $string['postbodydesc'] = 'This is where your actual post goes.';
+$string['posttitle'] = 'Title';
+$string['posttitledesc'] = 'The title appears above your post.';
+$string['publish'] = 'Publish';
+$string['published'] = 'Published';
+$string['remove'] = 'Remove';
+$string['save'] = 'Save';
 $string['saveandpublish'] = 'Save and Publish';
-$string['createandpublishdesc'] = 'This will create the blog post and make it available to others.';
 $string['saveasdraft'] = 'Save as Draft';
-$string['createasdraftdesc'] = 'This will create the blog post, but it will not become available to others until you choose to publish it.';
-
+$string['savepost'] = 'Save post';
 $string['savesettings'] = 'Save Settings';
-
-$string['publish'] = 'Publish';
-$string['published'] = 'Published';
-
-$string['edit'] = 'Edit';
-$string['delete'] = 'Delete';
-
-$string['editblogpost'] = 'Edit Blog Post';
-
+$string['settings'] = 'Settings';
 $string['thisisdraft'] = 'This post is a draft';
 $string['thisisdraftdesc'] = 'When your post is a draft, no one except you can see it.';
-$string['save'] = 'Save';
-
-$string['noresults'] = 'No results';
+$string['title'] = 'Title';
+$string['viewblog'] = 'View Blog';
+$string['youarenottheownerofthisblogpost'] = 'You are not the owner of this blog post';
 
 ?>

htdocs/artefact/blog/saveblogpost.json.php

@@ -54,7 +54,7 @@ if (!$blogpost) {
     $postobj->set('owner', $userid);
 }
 else if ($postobj->get('owner') != $userid) {
-    json_reply('local', get_string('notowner'));
+    json_reply('local', get_string('youarenottheownerofthisblogpost', 'artefact.blog'));
 }
 $postobj->commit();
 $blogpost = $postobj->get('id');

htdocs/artefact/file/lang/en.utf8/artefact.file.php

@@ -38,9 +38,10 @@ $string['editfile'] = 'Edit file';
 $string['editfolder'] = 'Edit folder';
 $string['file'] = 'File';
 $string['fileexists'] = 'File exists';
-$string['filethingdeleted'] = '%s deleted';
 $string['fileexistsoverwritecancel'] =  'A file with that name already exists.  You can try a different name, or overwrite the existing file.';
+$string['filelistloaded'] = 'File list loaded';
 $string['filenamefieldisrequired'] = 'The file field is required';
+$string['filethingdeleted'] = '%s deleted';
 $string['folder'] = 'Folder';
 $string['foldercreated'] = 'Folder created';
 $string['home'] = 'Home';
@@ -56,11 +57,11 @@ $string['title'] = 'Name';
 $string['titlefieldisrequired'] = 'The name field is required';
 $string['unlinkthisfilefromblogposts?'] = 'This file is attached to one or more blog posts.  If you delete the file, it will be removed from these posts.';
 $string['upload'] = 'Upload';
-$string['uploadoffilecomplete'] = 'Upload of %s complete';
-$string['uploadoffilefailed'] =  'Upload of %s failed';
 $string['uploadfile'] =  'Upload file';
 $string['uploadfileexistsoverwritecancel'] =  'A file with that name already exists.  You can rename the file you are about to upload, or overwrite the existing file.';
 $string['uploadingfiletofolder'] =  'Uploading %s to %s';
+$string['uploadoffilecomplete'] = 'Upload of %s complete';
+$string['uploadoffilefailed'] =  'Upload of %s failed';
 $string['youmustagreetothecopyrightnotice'] = 'You must agree to the copyright notice';
 
 ?>

htdocs/artefact/file/myfiles.json.php

@@ -46,7 +46,7 @@ $result = array(
     'offset'      => $offset,
     'data'        => $filedata,
     'error'       => false,
-    'message'     => get_string('filelistloaded'),
+    'message'     => get_string('filelistloaded', 'artefact.file'),
 );
 
 //log_debug($result);

htdocs/lang/en.utf8/mahara.php

@@ -264,18 +264,19 @@ $string['deleteviewfailed'] = 'Delete view failed';
 $string['deleteviewquestion'] = 'Do you really want to delete this view?';
 $string['description'] = 'Description';
 $string['editaccess'] = 'Edit Access';
-$string['saveaccess'] = 'Save Access';
 $string['editview'] = 'Edit View';
 $string['editviewinformation'] = 'Edit View Information';
 $string['myviews'] = 'My Views';
 $string['notownerofview'] = 'You are not the owner of this view';
+$string['saveaccess'] = 'Save Access';
 $string['submitview'] = 'Submit View';
+$string['submitviewfailed'] = 'Submit view failed';
 $string['submitviewquestion'] = 'If you submit this view for assessment, you will not be able to edit the view or any of its associated artefacts until your tutor has finished marking the view.  Are you sure you want to submit this view now?';
+$string['viewaccesseditedsuccessfully'] = 'View access saved successfully';
 $string['viewdeleted'] = 'View deleted';
 $string['views'] = 'Views';
 $string['viewsubmitted'] = 'View submitted';
 $string['viewsubmittedto'] = 'This view has been submitted to %s';
-$string['viewaccesseditedsuccessfully'] = 'View access saved successfully';
 
 // access levels
 $string['public'] = 'Public';
@@ -327,6 +328,11 @@ $string['noresultsfound'] = 'No results found';
 $string['artefact'] = 'artefact';
 $string['Artefact'] = 'Artefact';
 $string['artefactnotfound'] = 'Artefact with id %s not found';
+$string['created'] = 'Created';
+$string['lastmodified'] = 'Last modified';
+$string['owner'] = 'Owner';
+$string['title'] = 'Title';
+$string['type'] = 'Type';
 
 $string['belongingto'] = 'Belonging to';
 $string['allusers'] = 'All users';
@@ -345,11 +351,13 @@ $string['nopublicfeedback'] = 'No public feedback';
 $string['notifysiteadministrator'] = 'Notify site administrator';
 $string['placefeedback'] = 'Place feedback';
 $string['print'] = 'Print';
+$string['private'] = 'Private';
 $string['reportobjectionablematerial'] = 'Report objectionable material';
 $string['reportsent'] = 'Your report has been sent';
 $string['updatewatchlistfailed'] = 'Update of watchlist failed';
 $string['view'] = 'view';
 $string['View'] = 'View';
+$string['watchlistupdated'] = 'Your watchlist has been updated';
 
 // communities
 $string['communitymemberrequests'] = 'Pending membership requests';

htdocs/view/delete.json.php

@@ -38,7 +38,7 @@ require_once('view.php');
 $view = new View($viewid, null);
 
 if ($view->get('owner') != $USER->get('id')) {
-    json_reply('local', get_string('notowner'));
+    json_reply('local', get_string('notownerofview'));
 }
 $view->delete();