Bug 1584265: Replace "Feedback" with "Comment"

in various places around Mahara to be more consistent
with what people see on the interface.

Change-Id: I83e088d39964ecd1d72945973fd0b4995b82da65

htdocs/artefact/artefact.php

@@ -69,7 +69,7 @@ if ($artefactok == false) {
     throw new AccessDeniedException(get_string('artefactnotinview', 'error', $artefactid, $viewid));
 }
 
-// Feedback list pagination requires limit/offset params
+// Comment list pagination requires limit/offset params
 $limit       = param_integer('limit', 10);
 $offset      = param_integer('offset', 0);
 $showcomment = param_integer('showcomment', null);
@@ -82,7 +82,7 @@ else {
     $title = $artefact->display_title();
 }
 
-// Create the "make feedback private form" now if it's been submitted
+// Create the "make comment private form" now if it's been submitted
 if (param_variable('make_public_submit', null)) {
     pieform(ArtefactTypeComment::make_public_form(param_integer('comment')));
 }
@@ -131,7 +131,7 @@ if (!empty($rendered['javascript'])) {
 }
 $content .= $rendered['html'];
 
-// Feedback
+// Comments
 $commentoptions = ArtefactTypeComment::get_comment_options();
 $commentoptions->limit = $limit;
 $commentoptions->offset = $offset;

htdocs/artefact/comment/blocktype/comment/lib.php

@@ -48,11 +48,11 @@ class PluginBlocktypeComment extends MaharaCoreBlocktype {
             return $html;
         }
 
-        // Feedback list pagination requires limit/offset params
+        // Comment list pagination requires limit/offset params
         $limit       = param_integer('limit', 10);
         $offset      = param_integer('offset', 0);
         $showcomment = param_integer('showcomment', null);
-        // Create the "make feedback private form" now if it's been submitted
+        // Create the "make comment private form" now if it's been submitted
         if (param_variable('make_public_submit', null)) {
             pieform(ArtefactTypeComment::make_public_form(param_integer('comment')));
         }

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

@@ -41,10 +41,10 @@ $string['feedback'] = 'Feedback';
 $string['feedbackattachdirname'] = 'commentfiles';
 $string['feedbackattachdirdesc'] = 'Files attached to comments on your portfolio';
 $string['feedbackattachmessage'] = 'The attached file(s) have been added to your %s folder';
-$string['feedbackonviewbyuser'] = 'Feedback on %s by %s';
-$string['feedbacksubmitted'] = 'Feedback submitted';
-$string['feedbacksubmittedmoderatedanon'] = 'Feedback submitted, awaiting moderation';
-$string['feedbacksubmittedprivateanon'] = 'Private feedback submitted';
+$string['commentonviewbyuser'] = 'Comment on %s by %s';
+$string['commentsubmitted'] = 'Comment submitted';
+$string['commentsubmittedmoderatedanon'] = 'Comment submitted, awaiting moderation';
+$string['commentsubmittedprivateanon'] = 'Private comment submitted';
 $string['forcepubliccomment'] = 'Public';
 $string['forceprivatecomment'] = 'Private: This reply will only be visible to you and the author of the preceeding comment.';
 $string['lastcomment'] = 'Last comment';
@@ -58,8 +58,7 @@ $string['messageempty'] = 'Your message is empty. Please enter a message or atta
 $string['Moderate'] = 'Moderate';
 $string['moderatecomments'] = 'Moderate comments';
 $string['moderatecommentsdescription1'] = 'Comments on pages will remain private until they are approved by you. Comments on individual content, e.g. files and journal entries, are excluded from the moderation.';
-$string['newfeedbacknotificationsubject'] = 'New feedback on %s';
-$string['placefeedback'] = 'Place feedback';
+$string['newcommentnotificationsubject'] = 'New comment on %s';
 $string['progress_feedback'] = array(
     'Comment on another user\'s page',
     'Comment on %s other users\' pages',
@@ -72,7 +71,7 @@ $string['replytonoaccess'] = 'You are not allowed to post a reply to this commen
 $string['replytonoprivatereplyallowed'] = 'You are not allowed to post a private reply to this comment.';
 $string['replytonopublicreplyallowed'] = 'You are not allowed to post a public reply to this comment.';
 $string['thiscommentisprivate'] = 'This comment is private';
-$string['typefeedback'] = 'Feedback';
+$string['typefeedback'] = 'Comment';
 $string['viewcomment'] = 'View comment';
 $string['youhaverequestedpublic'] = 'You have requested that this comment be made public.';
 

htdocs/artefact/comment/lang/en.utf8/help/forms/activityprefs.activity_feedback_artefact_comment.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
-<h3>Feedback</h3>
-<p>Notification of any feedback or comments received on any pages, artefacts or journals within your ePortfolio.</p>
+<h3>Comment</h3>
+<p>Notification of comments received on any pages, artefacts or journals within your ePortfolio.</p>
\ No newline at end of file

htdocs/artefact/comment/lib.php

@@ -142,7 +142,7 @@ class PluginArtefactComment extends PluginArtefact {
         return array(
             (object)array(
                     'name' => 'feedback',
-                    'title' => get_string('placefeedback', 'artefact.comment'),
+                    'title' => get_string('addcomment', 'artefact.comment'),
                     'plugin' => 'comment',
                     'active' => true,
                     'iscountable' => true,
@@ -451,7 +451,7 @@ class ArtefactTypeComment extends ArtefactType {
             // If pagination is in use, see if we want to get a page with particular comment
             if ($limit) {
                 if ($showcomment == 'last') {
-                    // If we have limit (pagination is used) ignore $offset and just get the last page of feedback.
+                    // If we have limit (pagination is used) ignore $offset and just get the last page of comments.
                     $result->forceoffset = $offset = (ceil($result->count / $limit) - 1) * $limit;
                 }
                 else if (is_numeric($showcomment)) {
@@ -531,7 +531,7 @@ class ArtefactTypeComment extends ArtefactType {
             $result->data = array_values($comments);
         }
 
-        // check to see if the feedback is to be displayed in a block instance
+        // check to see if the comments are to be displayed in a block instance
         // or the base of the page
         $result->position = 'base';
         $blocks = get_records_array('block_instance', 'view', $viewid);
@@ -1641,7 +1641,7 @@ function add_feedback_form_submit(Pieform $form, $values) {
             'parent'        => $folderid,
             'description'   => get_string_from_language(
                 $ownerlang,
-                'feedbackonviewbyuser',
+                'commentonviewbyuser',
                 'artefact.comment',
                 $view->get('title'),
                 display_name($USER)
@@ -1711,15 +1711,15 @@ function add_feedback_form_submit(Pieform $form, $values) {
 
     // If you're anonymous and your message is moderated or private, then you won't
     // be able to tell what happened to it. So we'll provide some more explanation in
-    // the feedback message.
+    // the comment message.
     if ($anonymous && $moderated) {
-        $message = get_string('feedbacksubmittedmoderatedanon', 'artefact.comment');
+        $message = get_string('commentsubmittedmoderatedanon', 'artefact.comment');
     }
     else if ($anonymous && $private) {
-        $message = get_string('feedbacksubmittedprivateanon', 'artefact.comment');
+        $message = get_string('commentsubmittedprivateanon', 'artefact.comment');
     }
     else {
-        $message = get_string('feedbacksubmitted', 'artefact.comment');
+        $message = get_string('commentsubmitted', 'artefact.comment');
     }
 
     $form->reply(PIEFORM_OK, array(
@@ -1753,7 +1753,7 @@ class ActivityTypeArtefactCommentFeedback extends ActivityTypePlugin {
 
         $this->overridemessagecontents = true;
 
-        if ($onartefact = $comment->get('onartefact')) { // feedback on artefact
+        if ($onartefact = $comment->get('onartefact')) { // comment on artefact
             $userid = null;
             require_once(get_config('docroot') . 'artefact/lib.php');
             $artefactinstance = artefact_instance_from_id($onartefact);
@@ -1766,7 +1766,7 @@ class ActivityTypeArtefactCommentFeedback extends ActivityTypePlugin {
                 $this->url = 'artefact/artefact.php?artefact=' . $onartefact . '&view=' . $this->viewid;
             }
         }
-        else { // feedback on view.
+        else { // comment on page.
             $onview = $comment->get('onview');
             if (!$viewrecord = get_record('view', 'id', $onview)) {
                 throw new ViewNotFoundException(get_string('viewnotfound', 'error', $onview));
@@ -1877,7 +1877,7 @@ class ActivityTypeArtefactCommentFeedback extends ActivityTypePlugin {
 
         $this->strings = (object) array(
             'subject' => (object) array(
-                'key'     => 'newfeedbacknotificationsubject',
+                'key'     => 'newcommentnotificationsubject',
                 'section' => 'artefact.comment',
                 'args'    => array($title),
             ),

htdocs/artefact/file/download.php

@@ -63,8 +63,8 @@ if ($viewid && $fileid) {
         }
     }
 
-    // The user may be trying to download a file that's not in the view, but which has
-    // been attached to public feedback on the view
+    // The user may be trying to download a file that's not in the page, but which has
+    // been attached to a public comment on the page
     if ($commentid = param_integer('comment', null)) {
         if (!record_exists('artefact_attachment', 'artefact', $commentid, 'attachment', $fileid)) {
             throw new AccessDeniedException('');

htdocs/artefact/lib.php

@@ -859,7 +859,7 @@ abstract class ArtefactType implements IArtefactType {
     }
 
     /**
-     * By default users are notified of all feedback on artefacts
+     * By default users are notified of all comments on artefacts
      * which they own.  Artefact types which want to allow this
      * notification to be turned off should redefine this function.
      */

htdocs/blocktype/text/lang/en.utf8/blocktype.text.php

@@ -21,7 +21,7 @@ $string['convertdescriptionfeatures'] = 'You can convert all re-usable "Note" bl
         <li>use of a license</li>
         <li>use of tags</li>
         <li>attachments</li>
-        <li>feedback on the displayed note-artefact</li>
+        <li>comments on the displayed note artefact</li>
     </ul>';
 $string['convertdescription'] = array(
     0 => 'There is %s note that can be considered for conversion. If you select the option to convert this note, please be aware that this may take some time. Once the conversion is finished, you will see a success message on this page.',

htdocs/export/index.php

@@ -55,8 +55,8 @@ $elements = array(
     'includefeedback' => array(
         'type' => 'switchbox',
         'class' => 'last',
-        'title' => get_string('includefeedback', 'export'),
-        'description' => get_string('includefeedbackdescription', 'export'),
+        'title' => get_string('includecomments', 'export'),
+        'description' => get_string('includecommentsdescription', 'export'),
         'defaultvalue' => 1,
     ),
 );

htdocs/export/lib.php

@@ -132,7 +132,7 @@ abstract class PluginExport extends Plugin implements IPluginExport {
     public $views = array();
 
     /**
-     * Whether the user requested to export feedback as well
+     * Whether the user requested to export comments as well
      */
     public $includefeedback = false;
 

htdocs/group/edit.php

@@ -388,9 +388,9 @@ $elements['viewnotify'] = array(
 );
 $elements['feedbacknotify'] = array(
     'type' => 'select',
-    'title' => get_string('feedbacknotify', 'group'),
+    'title' => get_string('commentnotify', 'group'),
     'options' => $notifyroles,
-    'description' => get_string('feedbacknotifydescription1', 'group'),
+    'description' => get_string('commentnotifydescription1', 'group'),
     'defaultvalue' => $group_data->feedbacknotify
 );
 if ($cancreatecontrolled) {

htdocs/lang/en.utf8/activity.php

@@ -13,7 +13,7 @@ defined('INTERNAL') || die();
 
 $string['typemaharamessage'] = 'System message';
 $string['typeusermessage'] = 'Message from other users';
-$string['typefeedback'] = 'Feedback';
+$string['typefeedback'] = 'Comment';
 $string['typewatchlist'] = 'Watchlist';
 $string['typeviewaccess'] = 'New page access';
 $string['typecontactus'] = 'Contact us';

htdocs/lang/en.utf8/export.php

@@ -36,8 +36,8 @@ $string['generateexport'] = 'Generate export';
 $string['noexportpluginsenabled'] = 'No export plugins have been enabled by the site administrator, so you are unable to use this feature';
 $string['justsomecollections'] = 'Just some of my collections';
 $string['justsomeviews'] = 'Just some of my pages';
-$string['includefeedback'] = 'Include user feedback';
-$string['includefeedbackdescription'] = 'All user comments will be included in the HTML export.';
+$string['includecomments'] = 'Include comments';
+$string['includecommentsdescription'] = 'All comments will be included in the HTML export.';
 $string['nonexistentfile'] = "Tried to add non-existent file '%s'";
 $string['nonexistentprofileicon'] = "Tried to add non-existent profile icon '%s'";
 $string['nonexistentresizedprofileicon'] = "Tried to add non-existent resized profile icon '%s'";
@@ -81,4 +81,4 @@ $string['submissionreleasefailed'] =  'Failed to release submission after archiv
 $string['deleteexportqueueitems'] = 'Failed to remove items from export queue items database table';
 $string['deleteexportqueuerow'] = 'Failed to remove items from export queue database table';
 $string['exportqueueerrorsadminsubject'] = 'Error running export queue';
-$string['exportqueueerrorsadminmessage'] = 'Unable to export row "%s" due to: %s';
+$string['exportqueueerrorsadminmessage'] = 'Unable to export row "%s" due to: %s';
\ No newline at end of file

htdocs/lang/en.utf8/group.php

@@ -92,8 +92,8 @@ $string['groupinvitesfrom'] = 'Invited to join:';
 $string['requestedmembershipin'] = 'Requested membership in:';
 $string['viewnotify'] = 'Shared page notifications';
 $string['viewnotifydescription2'] = 'Select which group members should receive a notification when a new group page is created and when a group member shares one of their pages with the group. The group member sharing the page will not receive this notification. For very large groups it would be best to limit this to non ordinary members as it can produce a lot of notifications.';
-$string['feedbacknotify'] = 'Feedback notifications';
-$string['feedbacknotifydescription1'] = 'Select which group members should receive a notification when feedback is placed on a group page and artefacts.';
+$string['commentnotify'] = 'Comment notifications';
+$string['commentnotifydescription1'] = 'Select which group members should receive a notification when comments are placed on a group page and artefacts.';
 $string['allowsendnow'] = 'Send forum posts immediately';
 $string['allowsendnowdescription1'] = 'Any group member can choose to send forum posts immediately. If this option is set to "Off", only group administrators, tutors and moderators can do so.';
 $string['hiddengroup'] = 'Hide group';

htdocs/lang/en.utf8/help/forms/editgroup.grouptype.html

@@ -7,4 +7,4 @@
 <p>Standard groups contain administrators and ordinary members. Administrators manage the group, its membership and permission options. Ordinary members cannot edit the group settings and membership, but they can usually post in the forums as well as edit pages and files belonging to the group.</p>
 
 <h4>Course groups</h4>
-<p>Course groups contain tutors as well as administrators and ordinary members. If the group allows members to submit pages to the group for assessment, tutors and administrators can assess those submitted pages and provide feedback to the authors.</p>
+<p>Course groups contain tutors as well as administrators and ordinary members. If the group allows members to submit pages to the group for assessment, tutors and administrators can assess those submitted pages and provide feedback in the form of comments to the authors.</p>

htdocs/lang/en.utf8/help/pages/view/share.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Shared by me</h3>
-<p>When you have created portfolio pages and collections, you may wish to share them with others, e.g. to receive feedback.</p>
+<p>When you have created portfolio pages and collections, you may wish to share them with others, e.g. to receive feedback on your work in form of comments.</p>
 <p>You can set the access permissions via the <strong>edit access</strong> button or set up a <strong>secret URL</strong>.</p>

htdocs/lang/en.utf8/help/sections/activitytypeselect.html

@@ -4,7 +4,7 @@
 <p>Select from this drop-down menu the notification type you wish to view. You may not be able to see all notification types depending on your permissions in the system.</p>
 <p><strong>Administration messages:</strong> Notifications to site and institution administrators.</p>
 <p><strong>Contact us</strong>: Messages to site administrators that are sent via the "Contact us" form.</p>
-<p><strong>Feedback:</strong> Notification of any feedback or comments received on any pages, artefacts or journals within your ePortfolio.</p>
+<p><strong>Comment:</strong> Notification of any comments received on any pages, artefacts or journals within your ePortfolio.</p>
 <p><strong>Feedback on annotations:</strong> Notification of any annotation feedback received on any pages or artefacts within your ePortfolio.</p>
 <p><strong>Group message:</strong> Notification sent to group owners when new pages are submitted to a group.</p>
 <p><strong>Institution message:</strong> Automatically generated by the system if you are a member of an institution or are about to be.</p>

htdocs/lang/en.utf8/help/sections/viewmenu.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
-<h4>Place feedback</h4>
-<p>Public feedback may be seen by other users with access to the page, while private feedback may only be read by the page owner. A page owner can make public feedback private.</p>
+<h4>Add comment</h4>
+<p>Public comments may be seen by other users with access to the page, while private comments may only be read by the page owner. A page owner can make public comments private.</p>
 <h4>Report objectionable material</h4>
 <p>You can report material you believe to be objectionable to the administrators.</p>
 <h4>Print</h4>

htdocs/lang/en.utf8/statistics.php

@@ -67,7 +67,7 @@ $string['artefact_type_workskill'] = 'Artefact: Work skills';
 $string['blocktype_annotation'] = 'Block: Annotation';
 $string['blocktype_blog'] = 'Block: Journal';
 $string['blocktype_blogpost'] = 'Block: Journal entry';
-$string['blocktype_comment'] = 'Block: Feedback';
+$string['blocktype_comment'] = 'Block: Comments';
 $string['blocktype_contactinfo'] = 'Block: Contact information';
 $string['blocktype_creativecommons'] = 'Block: Creative Commons';
 $string['blocktype_entireresume'] = 'Block: Entire résumé';

htdocs/lang/en.utf8/view.php

@@ -194,7 +194,7 @@ $string['cantdeleteview'] = 'You cannot delete this page.';
 $string['deletespecifiedview'] = 'Delete page "%s"';
 $string['deleteviewconfirm1'] = 'Do you really want to delete this page? It cannot be undone.';
 $string['deleteviewconfirmbackup'] = 'Please consider creating a backup of this page by <a href="%sexport/">exporting</a> it.';
-$string['deleteviewconfirmnote1'] = '<strong>Note:</strong> All your files and journal entries that you linked in this page will still be available.<br/>However, any feedback placed on this page will be deleted.';
+$string['deleteviewconfirmnote3'] = '<strong>Note:</strong> All your files and journal entries that you linked in this page will still be available.<br/>However, any comments placed on this page will be deleted.';
 $string['deleteviewconfirmnote2'] = 'This page is a part of the collection <a href="%s">"%s"</a>.';
 
 $string['editaccesspagedescription6'] = 'You are the only one who can see your pages and collections by default. On this page you decide who can access them besides you.';
@@ -353,7 +353,7 @@ $string['blocktypecategorydesc.internal'] = 'Click for personal info options';
 $string['blocktypecategorydesc.blog'] = 'Click for journal options';
 
 $string['notitle'] = 'No title';
-$string['clickformoreinformation'] = 'Click for more information and to place feedback.';
+$string['clickformoreinformation1'] = 'Click for more information and to add a comment.';
 $string['detailslinkalt'] = 'Details';
 
 $string['Browse'] = 'Browse';
@@ -423,7 +423,7 @@ $string['latestcreated'] = 'Date created';
 $string['latestmodified'] = 'Last modified';
 $string['latestviewed'] = 'Last viewed';
 $string['mostvisited'] = 'Most visited';
-$string['mostcomments'] = 'Most feedback';
+$string['mostcomments1'] = 'Most comments';
 
 // View types
 $string['dashboard'] = 'Dashboard';

htdocs/lib/config-defaults.php

@@ -518,7 +518,7 @@ $cfg->plugin_search_elasticsearch_redolimit = '500';
 
 /**
  * The maximum number of comment indentation levels to show
- * (Same for the feedback block & for bottom of page, so it's best if it's small)
+ * (Same for the comment block & for bottom of page, so it's best if it's small)
  */
 // $cfg->plugin_artefact_comment_maxindent = 5;
 

htdocs/lib/view.php

@@ -3790,7 +3790,7 @@ class View {
                                                'latestmodified' => get_string('latestmodified', 'view'),
                                                'latestviewed' => get_string('latestviewed', 'view'),
                                                'mostvisited' => get_string('mostvisited', 'view'),
-                                               'mostcomments' => get_string('mostcomments', 'view'),
+                                               'mostcomments' => get_string('mostcomments1', 'view'),
                                                ),
                             'defaultvalue' => $orderby,
                         ),

htdocs/theme/raw/templates/view/delete.tpl

@@ -9,7 +9,7 @@
         <p>{if $view->get('owner')}
         {str tag="deleteviewconfirmbackup" section="view" arg1=$WWWROOT}
         {/if}</p>
-        <p>{str tag="deleteviewconfirmnote1" section="view"}</p>
+        <p>{str tag="deleteviewconfirmnote3" section="view"}</p>
         {$form|safe}
     </div>
 </div>

htdocs/view/view.php

@@ -96,12 +96,12 @@ else {
     $view->commit();
 }
 
-// Feedback list pagination requires limit/offset params
+// Comment list pagination requires limit/offset params
 $limit       = param_integer('limit', 10);
 $offset      = param_integer('offset', 0);
 $showcomment = param_integer('showcomment', null);
 
-// Create the "make feedback private form" now if it's been submitted
+// Create the "make comment private form" now if it's been submitted
 if (param_variable('make_public_submit', null)) {
     pieform(ArtefactTypeComment::make_public_form(param_integer('comment')));
 }

test/behat/features/admin/notification_choices.feature

@@ -79,10 +79,10 @@ Scenario: Confirm that multiple notification choices are available (Bug #1299993
     And I select "Email digest" from "Group message"
     And I select "Inbox" from "Group message"
     And I select "None" from "Group message"
-    And I select "Email" from "Feedback"
-    And I select "Email digest" from "Feedback"
-    And I select "Inbox" from "Feedback"
-    And I select "None" from "Feedback"
+    And I select "Email" from "Comment"
+    And I select "Email digest" from "Comment"
+    And I select "Inbox" from "Comment"
+    And I select "None" from "Comment"