From 6b06439bf2091d93e4fb33f6e24d6fcc5de0bfe5 Mon Sep 17 00:00:00 2001 From: "Kristina D.C. Hoeppner" Date: Sat, 21 May 2016 14:50:17 +1200 Subject: [PATCH] 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 | 6 ++--- .../comment/blocktype/comment/lib.php | 4 ++-- .../comment/lang/en.utf8/artefact.comment.php | 13 +++++------ ...fs.activity_feedback_artefact_comment.html | 4 ++-- htdocs/artefact/comment/lib.php | 22 +++++++++---------- htdocs/artefact/file/download.php | 4 ++-- htdocs/artefact/lib.php | 2 +- .../text/lang/en.utf8/blocktype.text.php | 2 +- htdocs/export/index.php | 4 ++-- htdocs/export/lib.php | 2 +- htdocs/group/edit.php | 4 ++-- htdocs/lang/en.utf8/activity.php | 2 +- htdocs/lang/en.utf8/export.php | 6 ++--- htdocs/lang/en.utf8/group.php | 4 ++-- .../help/forms/editgroup.grouptype.html | 2 +- .../lang/en.utf8/help/pages/view/share.html | 2 +- .../help/sections/activitytypeselect.html | 2 +- .../lang/en.utf8/help/sections/viewmenu.html | 4 ++-- htdocs/lang/en.utf8/statistics.php | 2 +- htdocs/lang/en.utf8/view.php | 6 ++--- htdocs/lib/config-defaults.php | 2 +- htdocs/lib/view.php | 2 +- htdocs/theme/raw/templates/view/delete.tpl | 2 +- htdocs/view/view.php | 4 ++-- .../admin/notification_choices.feature | 8 +++---- .../admin/notification_setting_order.feature | 4 ++-- .../admin/tinymce_mathslate_plugin.feature | 2 +- .../feedback_configuration.feature | 8 +++---- .../comment/sort_threaded_comments.feature | 2 +- .../comment/threaded_comments.feature | 2 +- .../group_feedback_comment_visible.feature | 12 +++++----- .../notifications_for_group_members.feature | 16 +++++++------- .../group/switches_edit_group.feature | 3 +-- .../messages/activity_type_messages.feature | 4 ++-- test/behat/features/view/help_icon.feature | 2 +- 35 files changed, 84 insertions(+), 86 deletions(-) diff --git a/htdocs/artefact/artefact.php b/htdocs/artefact/artefact.php index e6c0f7a8bc..8f07e49f28 100644 --- a/htdocs/artefact/artefact.php +++ b/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; diff --git a/htdocs/artefact/comment/blocktype/comment/lib.php b/htdocs/artefact/comment/blocktype/comment/lib.php index bcb2536bb3..16c234af53 100644 --- a/htdocs/artefact/comment/blocktype/comment/lib.php +++ b/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'))); } diff --git a/htdocs/artefact/comment/lang/en.utf8/artefact.comment.php b/htdocs/artefact/comment/lang/en.utf8/artefact.comment.php index b6e9f0f68e..1370f6f355 100644 --- a/htdocs/artefact/comment/lang/en.utf8/artefact.comment.php +++ b/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.'; diff --git a/htdocs/artefact/comment/lang/en.utf8/help/forms/activityprefs.activity_feedback_artefact_comment.html b/htdocs/artefact/comment/lang/en.utf8/help/forms/activityprefs.activity_feedback_artefact_comment.html index ea8eb6bf79..c8e649d18a 100644 --- a/htdocs/artefact/comment/lang/en.utf8/help/forms/activityprefs.activity_feedback_artefact_comment.html +++ b/htdocs/artefact/comment/lang/en.utf8/help/forms/activityprefs.activity_feedback_artefact_comment.html @@ -1,4 +1,4 @@ -

Feedback

-

Notification of any feedback or comments received on any pages, artefacts or journals within your ePortfolio.

\ No newline at end of file +

Comment

+

Notification of comments received on any pages, artefacts or journals within your ePortfolio.

diff --git a/htdocs/artefact/comment/lib.php b/htdocs/artefact/comment/lib.php index 0b8c326615..b7fe77d15c 100644 --- a/htdocs/artefact/comment/lib.php +++ b/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), ), diff --git a/htdocs/artefact/file/download.php b/htdocs/artefact/file/download.php index c65ae9fcb0..e42d6ff862 100644 --- a/htdocs/artefact/file/download.php +++ b/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(''); diff --git a/htdocs/artefact/lib.php b/htdocs/artefact/lib.php index 03a9e9b751..508fef8d31 100644 --- a/htdocs/artefact/lib.php +++ b/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. */ diff --git a/htdocs/blocktype/text/lang/en.utf8/blocktype.text.php b/htdocs/blocktype/text/lang/en.utf8/blocktype.text.php index 68b024be40..a4e7fcd2da 100644 --- a/htdocs/blocktype/text/lang/en.utf8/blocktype.text.php +++ b/htdocs/blocktype/text/lang/en.utf8/blocktype.text.php @@ -21,7 +21,7 @@ $string['convertdescriptionfeatures'] = 'You can convert all re-usable "Note" bl
  • use of a license
  • use of tags
  • attachments
    • -
  • feedback on the displayed note-artefact
    • +
  • comments on the displayed note artefact
    • '; $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.', diff --git a/htdocs/export/index.php b/htdocs/export/index.php index a9aa650d86..afc2d83e84 100644 --- a/htdocs/export/index.php +++ b/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, ), ); diff --git a/htdocs/export/lib.php b/htdocs/export/lib.php index ecd81e65c6..6f244db418 100644 --- a/htdocs/export/lib.php +++ b/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; diff --git a/htdocs/group/edit.php b/htdocs/group/edit.php index 65fe3bf6d7..df9a45f7fb 100644 --- a/htdocs/group/edit.php +++ b/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) { diff --git a/htdocs/lang/en.utf8/activity.php b/htdocs/lang/en.utf8/activity.php index c9dd48ad01..99c82b1d92 100644 --- a/htdocs/lang/en.utf8/activity.php +++ b/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'; diff --git a/htdocs/lang/en.utf8/export.php b/htdocs/lang/en.utf8/export.php index ea4f8b8f58..f2998bf492 100644 --- a/htdocs/lang/en.utf8/export.php +++ b/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'; \ No newline at end of file +$string['exportqueueerrorsadminmessage'] = 'Unable to export row "%s" due to: %s'; diff --git a/htdocs/lang/en.utf8/group.php b/htdocs/lang/en.utf8/group.php index eb0eeceef0..081f6b74a3 100644 --- a/htdocs/lang/en.utf8/group.php +++ b/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'; diff --git a/htdocs/lang/en.utf8/help/forms/editgroup.grouptype.html b/htdocs/lang/en.utf8/help/forms/editgroup.grouptype.html index 70cf853e2d..27859136ed 100644 --- a/htdocs/lang/en.utf8/help/forms/editgroup.grouptype.html +++ b/htdocs/lang/en.utf8/help/forms/editgroup.grouptype.html @@ -7,4 +7,4 @@

    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.

    Course groups

    -

    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.

    +

    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.

    diff --git a/htdocs/lang/en.utf8/help/pages/view/share.html b/htdocs/lang/en.utf8/help/pages/view/share.html index 1c2e2115a4..2a3908e319 100644 --- a/htdocs/lang/en.utf8/help/pages/view/share.html +++ b/htdocs/lang/en.utf8/help/pages/view/share.html @@ -1,5 +1,5 @@

    Shared by me

    -

    When you have created portfolio pages and collections, you may wish to share them with others, e.g. to receive feedback.

    +

    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.

    You can set the access permissions via the edit access button or set up a secret URL.

    diff --git a/htdocs/lang/en.utf8/help/sections/activitytypeselect.html b/htdocs/lang/en.utf8/help/sections/activitytypeselect.html index 0a82d211ef..8f55ace88f 100644 --- a/htdocs/lang/en.utf8/help/sections/activitytypeselect.html +++ b/htdocs/lang/en.utf8/help/sections/activitytypeselect.html @@ -4,7 +4,7 @@

    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.

    Administration messages: Notifications to site and institution administrators.

    Contact us: Messages to site administrators that are sent via the "Contact us" form.

    -

    Feedback: Notification of any feedback or comments received on any pages, artefacts or journals within your ePortfolio.

    +

    Comment: Notification of any comments received on any pages, artefacts or journals within your ePortfolio.

    Feedback on annotations: Notification of any annotation feedback received on any pages or artefacts within your ePortfolio.

    Group message: Notification sent to group owners when new pages are submitted to a group.

    Institution message: Automatically generated by the system if you are a member of an institution or are about to be.

    diff --git a/htdocs/lang/en.utf8/help/sections/viewmenu.html b/htdocs/lang/en.utf8/help/sections/viewmenu.html index 22b8fd151c..87eebbe489 100644 --- a/htdocs/lang/en.utf8/help/sections/viewmenu.html +++ b/htdocs/lang/en.utf8/help/sections/viewmenu.html @@ -1,7 +1,7 @@ -

    Place feedback

    -

    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.

    +

    Add comment

    +

    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.

    Report objectionable material

    You can report material you believe to be objectionable to the administrators.

    Print

    diff --git a/htdocs/lang/en.utf8/statistics.php b/htdocs/lang/en.utf8/statistics.php index a4881219e5..619635e90a 100644 --- a/htdocs/lang/en.utf8/statistics.php +++ b/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é'; diff --git a/htdocs/lang/en.utf8/view.php b/htdocs/lang/en.utf8/view.php index e8c155f048..649e8b67c4 100644 --- a/htdocs/lang/en.utf8/view.php +++ b/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 exporting it.'; -$string['deleteviewconfirmnote1'] = 'Note: All your files and journal entries that you linked in this page will still be available.
    However, any feedback placed on this page will be deleted.'; +$string['deleteviewconfirmnote3'] = 'Note: All your files and journal entries that you linked in this page will still be available.
    However, any comments placed on this page will be deleted.'; $string['deleteviewconfirmnote2'] = 'This page is a part of the collection "%s".'; $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'; diff --git a/htdocs/lib/config-defaults.php b/htdocs/lib/config-defaults.php index 9ce54f478f..0ef595e3e3 100644 --- a/htdocs/lib/config-defaults.php +++ b/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; diff --git a/htdocs/lib/view.php b/htdocs/lib/view.php index 1f9545785b..71e54d2a38 100644 --- a/htdocs/lib/view.php +++ b/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, ), diff --git a/htdocs/theme/raw/templates/view/delete.tpl b/htdocs/theme/raw/templates/view/delete.tpl index ce49164572..4a198ecfb7 100644 --- a/htdocs/theme/raw/templates/view/delete.tpl +++ b/htdocs/theme/raw/templates/view/delete.tpl @@ -9,7 +9,7 @@

    {if $view->get('owner')} {str tag="deleteviewconfirmbackup" section="view" arg1=$WWWROOT} {/if}

    -

    {str tag="deleteviewconfirmnote1" section="view"}

    +

    {str tag="deleteviewconfirmnote3" section="view"}

    {$form|safe} diff --git a/htdocs/view/view.php b/htdocs/view/view.php index 7bf9b82c56..61a06a3fa2 100644 --- a/htdocs/view/view.php +++ b/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'))); } diff --git a/test/behat/features/admin/notification_choices.feature b/test/behat/features/admin/notification_choices.feature index 0fbe7527eb..b353f0444d 100644 --- a/test/behat/features/admin/notification_choices.feature +++ b/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" And I select "Email" from "New forum post" And I select "Email digest" from "New forum post" And I select "Inbox" from "New forum post" diff --git a/test/behat/features/admin/notification_setting_order.feature b/test/behat/features/admin/notification_setting_order.feature index 30015c7b9b..2dc2bb5a5d 100644 --- a/test/behat/features/admin/notification_setting_order.feature +++ b/test/behat/features/admin/notification_setting_order.feature @@ -10,11 +10,11 @@ And I choose "Site options" in "Configure site" And I click on "Notification settings" Then I should see "Contact us" - And I should see "Feedback" + And I should see "Comment" And I should see "Group message" And I should see "Institution message" And I should see "Virus flag release" And I should see "Watchlist" - And "Feedback" "text" should appear before "Group message" "text" + And "Comment" "text" should appear before "Group message" "text" And "Group message" "text" should appear before "Institution message" "text" And "Virus flag release" "text" should appear before "Watchlist" "text" diff --git a/test/behat/features/admin/tinymce_mathslate_plugin.feature b/test/behat/features/admin/tinymce_mathslate_plugin.feature index f39319b4b2..702e4c6fad 100644 --- a/test/behat/features/admin/tinymce_mathslate_plugin.feature +++ b/test/behat/features/admin/tinymce_mathslate_plugin.feature @@ -27,4 +27,4 @@ Scenario: Making adjustments to the mathslate plugin for mahara (Bug 1472446) And I press "Comment" And I wait "1" seconds And I should see "αAβB" - And I should see "Feedback submitted" + And I should see "Comment submitted" diff --git a/test/behat/features/artefact/collections/feedback_configuration.feature b/test/behat/features/artefact/collections/feedback_configuration.feature index 2973c947e3..36140a335d 100644 --- a/test/behat/features/artefact/collections/feedback_configuration.feature +++ b/test/behat/features/artefact/collections/feedback_configuration.feature @@ -1,15 +1,15 @@ @javascript @core_artefact @core @core_portfolio -Feature: Page feedback configuration -In order to change the settings for placing feedback for a page +Feature: Page comment configuration +In order to change the settings for placing comments on a page As an admin -So I can choose how I want to display my feedback +So I can choose how I want to display my comments Background: Given the following "users" exist: | username | password | email | firstname | lastname | institution | authname | role | | userA | Kupuhipa1 | test01@example.com | Pete | Mc | mahara | internal | member | - Scenario Outline: Turning switchboxes on and off on feedback page (Bug 1431569) + Scenario Outline: Turning switchboxes on and off on comment page (Bug 1431569) Given I log in as "" with password "Kupuhipa1" And I follow "Portfolio" And I press "Create page" diff --git a/test/behat/features/artefact/comment/sort_threaded_comments.feature b/test/behat/features/artefact/comment/sort_threaded_comments.feature index 82f5609496..3bb94df997 100644 --- a/test/behat/features/artefact/comment/sort_threaded_comments.feature +++ b/test/behat/features/artefact/comment/sort_threaded_comments.feature @@ -2,7 +2,7 @@ Feature: Threaded comments In order to see earliest/latest threaded comments to a page As a mahara user I should see threaded comments in the right order - So I can easily follow these comments/feedbacks + So I can easily follow these comments Background: Given the following "institutions" exist: diff --git a/test/behat/features/artefact/comment/threaded_comments.feature b/test/behat/features/artefact/comment/threaded_comments.feature index e5ad706562..4587749a12 100644 --- a/test/behat/features/artefact/comment/threaded_comments.feature +++ b/test/behat/features/artefact/comment/threaded_comments.feature @@ -92,7 +92,7 @@ Scenario: Private comment by commenter, private reply by page owner, private cou And I should see "Private counter-reply by pagecommenter" # pagecommenter should receive a notification about pageowner's reply even though they unwatched the page And I follow "mail" - And I follow "New feedback on page1" + And I follow "New comment on page1" And I should see "Private reply by pageowner" Scenario: No private replies to anonymous comments diff --git a/test/behat/features/group/group_feedback_comment_visible.feature b/test/behat/features/group/group_feedback_comment_visible.feature index 67cac592c6..8268394bbb 100644 --- a/test/behat/features/group/group_feedback_comment_visible.feature +++ b/test/behat/features/group/group_feedback_comment_visible.feature @@ -2,7 +2,7 @@ Feature: Commenting on a group page In order to be able to verify I commented publically on a group page As a user -So leave feedback and it appears in the right place +So leave a comment and it appears in the right place Background: Given the following "users" exist: @@ -16,13 +16,13 @@ Given the following "groups" exist: -Scenario: As a user leaving public feedback on a group page (Bug 1509129) +Scenario: As a user leaving a public comment on a group page (Bug 1509129) Given I log in as "userA" with password "Kupuhipa1" And I choose "Groups" - # Changing the settings of the block to change notification feedback + # Changing the settings of the block to change comment notification And I click on "Settings" in the "div.groupuserstatus" "css_element" And I set the following fields to these values: - | Feedback notifications | None | + | Comment notifications | None | And I press "Save group" When I click on "Pages" in the ".right-text" "css_element" And I press "Create page" @@ -36,11 +36,11 @@ Scenario: As a user leaving public feedback on a group page (Bug 1509129) | Make public | 1 | And I press "Comment" # Verifying that it saves - Then I should see "Feedback submitted" + Then I should see "Comment submitted" And I should see "Adding a comment to this field. Student = Awesome!" And I log out And I log in as "userB" with password "Kupuhipa1" - # Needs to navigate to see the feedback and check it can be seen publically + # Needs to navigate to see the comment and check it can be seen publically Then I should see "group 01" When I follow "group 01" Then I should see "About | group 01" diff --git a/test/behat/features/group/notifications_for_group_members.feature b/test/behat/features/group/notifications_for_group_members.feature index cef8a599aa..db57130007 100644 --- a/test/behat/features/group/notifications_for_group_members.feature +++ b/test/behat/features/group/notifications_for_group_members.feature @@ -1,7 +1,7 @@ @javascript @core @core_group -Feature: Sending notification message when someone leaves a feedback message in a group page - In order to notify a user of a feedback message in a group page - As an user I place feedback +Feature: Sending notification message when someone leaves a comment in a group page + In order to notify a user of a comment on a group page + As a user I add a comment So another person can log in and see a notification message @@ -22,14 +22,14 @@ Background: -Scenario: Leaving feedback on a group page (Bug 1426983) +Scenario: Adding a comment on a group page (Bug 1426983) Given I log in as "bob" with password "Kupuhipa1" And I follow "Groups" And I follow "Test group 1" And I follow "Pages (tab)" # And I click on "Pages" And I follow "Testing group page 01" - And I fill in "Testing feedback notifications" in editor "Message" + And I fill in "Testing comment notifications" in editor "Message" And I press "Comment" # Log out as user 1 And I follow "Logout" @@ -37,8 +37,8 @@ Scenario: Leaving feedback on a group page (Bug 1426983) When I log in as "admin" with password "Kupuhipa1" # Checking notification display on the dashboard And I wait "1" seconds - Then I should see "New feedback on Testing group page 01" + Then I should see "New comment on Testing group page 01" # Checking notifications also appear in my inbox And I follow "mail" - And I follow "New feedback on Testing group page 01" - And I should see "Testing feedback notifications" + And I follow "New comment on Testing group page 01" + And I should see "Testing comment notifications" diff --git a/test/behat/features/group/switches_edit_group.feature b/test/behat/features/group/switches_edit_group.feature index 1880754916..71aaf8554b 100644 --- a/test/behat/features/group/switches_edit_group.feature +++ b/test/behat/features/group/switches_edit_group.feature @@ -28,7 +28,7 @@ Scenario: Turning on and off switches on Group Edit page (Bug 1431569) | Participation report | 0 | | Auto-add users | 0 | | Shared page notifications | All group members | - | Feedback notifications | All group members | + | Comment notifications | All group members | | Send forum posts immediately | 0 | And I press "Save group" And I follow "Edit \"The Avengers\" Settings" @@ -71,4 +71,3 @@ Scenario: Turning on and off switches on Group Edit page (Bug 1431569) And I enable the switch "Recommendations" And the "Friend invitations" checkbox should not be checked And I press "Save group" - diff --git a/test/behat/features/messages/activity_type_messages.feature b/test/behat/features/messages/activity_type_messages.feature index 8ee3b2d0a5..df76fb7e3c 100644 --- a/test/behat/features/messages/activity_type_messages.feature +++ b/test/behat/features/messages/activity_type_messages.feature @@ -32,7 +32,7 @@ Scenario: Selection options to filter messages (Bug 1433342) # First check what options an admin has Given I log in as "admin" with password "Kupuhipa1" When I follow "mail" - And the "Activity type:" select box should contain all "Administration messages | Contact us | Feedback | Feedback on annotations | Group message | Institution message | Message from other users | New forum post | New page access | Objectionable content | Objectionable content in forum | Repeat virus upload | System message | Virus flag release | Watchlist" + And the "Activity type:" select box should contain all "Administration messages | Comment | Contact us | Feedback on annotations | Group message | Institution message | Message from other users | New forum post | New page access | Objectionable content | Objectionable content in forum | Repeat virus upload | System message | Virus flag release | Watchlist" And I log out # Then check what options a normal user has @@ -43,4 +43,4 @@ Scenario: Selection options to filter messages (Bug 1433342) And I press "Save group" And I am on homepage When I follow "mail" - And the "Activity type:" select box should contain all "Feedback | Feedback on annotations | Group message | Institution message | Message from other users | New forum post | New page access | Objectionable content in forum | System message | Watchlist" + And the "Activity type:" select box should contain all "Comment | Feedback on annotations | Group message | Institution message | Message from other users | New forum post | New page access | Objectionable content in forum | System message | Watchlist" diff --git a/test/behat/features/view/help_icon.feature b/test/behat/features/view/help_icon.feature index d1d183d194..c75a4dee5f 100644 --- a/test/behat/features/view/help_icon.feature +++ b/test/behat/features/view/help_icon.feature @@ -17,7 +17,7 @@ And I should see "A collection is a set of pages that are linked to one another and have the same access permissions." And I choose "Shared by me" in "Portfolio" And I click on "Help" - And I should see "When you have created portfolio pages and collections, you may wish to share them with others, e.g. to receive feedback." + And I should see "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." And I choose "Shared with me" in "Portfolio" And I click on "Help" And I should see "On this page you can list the most recently modified or commented on pages that have been shared with" -- GitLab