From f95451b6b586eaeedfb36c96e463e74c88a31e7e Mon Sep 17 00:00:00 2001 From: Friederike Schwager <schwager@cil.rwth-aachen.de> Date: Thu, 10 Oct 2019 10:51:48 +0200 Subject: [PATCH] clean-up language strings --- classes/output/reportmenu.php | 1 + lang/en/pdfannotator.php | 92 ++--------------------------------- model/overviewtable.php | 6 +-- model/pdfannotator.php | 2 +- 4 files changed, 10 insertions(+), 91 deletions(-) diff --git a/classes/output/reportmenu.php b/classes/output/reportmenu.php index 0933c6b..d23b759 100644 --- a/classes/output/reportmenu.php +++ b/classes/output/reportmenu.php @@ -59,6 +59,7 @@ class reportmenu implements \renderable, \templatable { $urlparams['reportid'] = $report->reportid; $urlparams['itemsperpage'] = $itemsperpage; $urlparams['reportfilter'] = $reportfilter; + $urlparams['sesskey'] = sesskey(); $url = new moodle_url($CFG->wwwroot . '/mod/pdfannotator/view.php', $urlparams); diff --git a/lang/en/pdfannotator.php b/lang/en/pdfannotator.php index c7359d7..f2028df 100644 --- a/lang/en/pdfannotator.php +++ b/lang/en/pdfannotator.php @@ -33,21 +33,16 @@ $string['allquestionsimgtitle'] = "Show all questions in this document"; $string['allquestionstitle'] = 'All questions in'; $string['allreports'] = 'all reports'; $string['annotationDeleted'] = 'Annotation has been deleted'; -$string['annotationsButton'] = 'Comments'; $string['anonymous'] = 'Anonymous'; -$string['answer'] = "Answer"; +$string['answer'] = 'Answer'; $string['answerButton'] = 'Answer'; $string['answercounthelpicon'] = 'Number of answers'; $string['answercounthelpicon_help'] = 'This column tells you how many answers a question has received.'; -$string['answeredby'] = 'By / on'; -$string['answers'] = 'Answers'; $string['answers'] = 'answers'; -$string['answers_myquestions'] = 'answers to my questions'; $string['answerSolved'] = 'This answer was marked as correct by the manager.'; $string['answerstab'] = 'Answers'; $string['answerstabicon'] = 'Answers'; $string['answerstabicon_help'] = "This page can show you all answers or only answers to questions you subscribed* to. The list covers all annotators in this course.<br>*When you post a question yourself, you are automatically subscribed to it as long as you don't unsubscribe."; -$string['askedby'] = 'By / on'; $string['author'] = 'Author'; $string['average'] = 'average'; $string['average_answers'] = 'average answers'; @@ -58,15 +53,10 @@ $string['by_other_users'] = 'by other users'; $string['bynameondate'] = 'by {$a->name} - {$a->date}'; $string['cancelButton'] = 'Cancel'; $string['chart_title'] = 'Questions and answers in the annotators in this course'; -$string['choice_viewanswers'] = 'Display answers'; -$string['choice_viewreports'] = 'Display reports'; -$string['chooseyoursettings'] = 'Would you like to be notified about new activities in this module?'; $string['clicktoopen2'] = 'Click {$a} link to view the file.'; -$string['closeAll'] = 'Collapse all'; $string['closedquestions'] = 'solved'; $string['colorPicker'] = 'Pick a color'; $string['comment'] = 'Comment'; -$string['comment'] = 'Comment'; $string['commentDeleted'] = 'Comment has been deleted'; $string['comments'] = 'Comments'; $string['continueDiscussion'] = 'Add a comment'; @@ -74,19 +64,14 @@ $string['correct'] = 'correct'; $string['count'] = 'count'; $string['createAnnotation'] = 'Create Annotation'; $string['currentPage'] = 'current page number'; -$string['datetime'] = 'Date'; -$string['day'] = 'day'; $string['day'] = 'day'; $string['days'] = 'days'; -$string['days'] = 'days'; $string['decision:overlappingAnnotation'] = 'You clicked an area, in which is more than one annotation. Decide which one you wanted to click.'; $string['decision'] = 'Make a decision'; $string['delete'] = 'Delete'; $string['deleteComment'] = 'Delete comment'; $string['deletedComment'] = 'deleted comment'; $string['deletedQuestion'] = 'deleted question'; -$string['deletereport'] = 'Delete this report permanently'; -$string['deletereport'] = 'Permanently delete this report'; $string['deletingAnnotation_manager'] = 'The annotation and all corresponding comments will be deleted.'; $string['deletingAnnotation_student'] = "The annotation and all corresponding comments will be deleted.<br>You may delete your own annotations as long as they haven't been commented by other users."; $string['deletingComment'] = 'The comment will be deleted. It will be displayed as deleted unless it is the last comment in its thread.'; @@ -95,9 +80,6 @@ $string['deletingQuestion_manager'] = 'The comment will be deleted.<br>Hint: If $string['deletingQuestion_student'] = 'The question will be deleted.<br>If it is not answered, the annotation will be deleted too, otherwise the question will be displayed as deleted'; $string['deletionForbidden'] = 'Deletion not allowed'; $string['didyouknow'] = 'Did you know?'; -$string['displayagain'] = 'Display once more'; -$string['displayagain'] = 'Display this report once more'; -$string['displayreportagain'] = 'Display report'; $string['dnduploadpdfannotator'] = 'Create file for PDF Annotation'; $string['document'] = 'Document'; $string['drawing'] = 'Draw in the document with the pen.'; @@ -123,7 +105,6 @@ $string['error:getAnnotation'] = 'An error has occured while getting the annotat $string['error:getAnnotations'] = 'An error has occured while getting all annotations.'; $string['error:getComments'] = 'An error has occured while getting the comments.'; $string['error:getQuestions'] = 'An error has occured while getting the questions for this page.'; -$string['error:hide'] = 'An error has occured while hiding the element.'; $string['error:hideComment'] = "An error has occured while trying to hide the comment from participants' view."; $string['error:markasread'] = 'The item could not be marked as read.'; $string['error:markasunread'] = 'The item could not be marked as unread.'; @@ -132,11 +113,9 @@ $string['error:missingAnnotationtype'] = 'Annotationtype does not exists. Possib $string['error:openingPDF'] = 'An error occurred while opening the PDF file.'; $string['error:openprintview'] = 'An error has occured while trying to open the pdf in Acrobat Reader.'; $string['error:printcomments'] = 'An error has occured while trying to open the comments in a pdf.'; -$string['error:putinrecyclebin'] = 'The item could not be placed in the recycle bin.'; +$string['error:redisplayComment'] = 'An error has occured while redisplaying the comment.'; $string['error:renderPage'] = 'An error has occured while rendering the page.'; $string['error:reportComment'] = 'An error has occured while saving the report.'; -$string['error:settimespan'] = "An error has occured while trying to set the timespan for new questions."; -$string['error:show'] = 'An error has occured while showing the element.'; $string['error:subscribe'] = 'An error has occured while subscribing to the question.'; $string['error:unsubscribe'] = 'An error has occured while unsubscribing to the question.'; $string['error:voteComment'] = 'An error has occured while saving the vote.'; @@ -177,31 +156,19 @@ $string['global_setting_useprint_document'] = 'Allow saving/printing document?'; $string['global_setting_useprint_document_desc'] = 'Allow participants to save and print the pdf document'; $string['global_setting_usevotes'] = 'Allow liking of comments?'; $string['global_setting_usevotes_desc'] = 'With this option users can like / vote for posts other than their own.'; -$string['gotocomment'] = 'Open the comment.'; -$string['gotoquestion'] = 'Open the question.'; -$string['guestscantdoanything'] = 'Guests can\'t do anything here.'; $string['hiddenComment'] = 'hidden comment'; $string['hiddenforparticipants'] = 'Hidden from students'; -$string['hiddenreportstitle'] = 'Recycle bin (reports)'; -$string['hiddenreportstitle_help'] = "You can display hidden reports once more or delete them permanently."; $string['hideAnnotations'] = 'Hide Annotations'; -$string['hideanswerforever'] = 'Hide permanently'; -$string['hideforever'] = 'Hide permanently'; $string['highlight'] = 'Highlight text and add a comment.'; $string['hour'] = 'hour'; $string['hours'] = 'hours'; $string['in_course'] = 'in this course'; $string['in_document'] = 'in this document'; -$string['inaccurate'] = 'inaccurate'; -$string['inappropriate'] = 'inappropriate'; $string['infonocomments'] = "This document contains no comments at present."; -$string['interestedpeople'] = 'other people interested in the question'; -$string['introquestions'] = 'All unsolved questions in this course are displayed.'; $string['iscorrecthelpicon'] = 'Correct'; $string['iscorrecthelpicon_help'] = 'When a teacher or manager has marked an answer as correct, a green check mark appears next to it.'; $string['itemsperpage'] = 'Items per page'; $string['justnow'] = 'just now'; -$string['labelforsettingnewsspan'] = 'Select a period of time'; $string['lastanswered'] = 'Last Answer'; $string['lastedited'] = 'last edited'; $string['legacyfiles'] = 'Migration of old course file'; @@ -217,8 +184,6 @@ $string['likeOwnComment'] = 'own comment'; $string['likeQuestion'] = 'interesting question'; $string['likeQuestionForbidden'] = 'already marked as helpful'; $string['loading'] = 'Loading!'; -$string['location'] = 'Location'; -$string['location'] = 'Pdf'; $string['markasread'] = 'Mark as read'; $string['markasunread'] = 'Mark as unread'; $string['markCorrect'] = 'Mark as correct'; @@ -244,16 +209,10 @@ $string['month'] = 'month'; $string['months'] = 'months'; $string['myanswers'] = 'my answers'; $string['mypost'] = 'My post'; -$string['mypoststitle'] = 'My posts'; -$string['mypoststitle_help'] = "Here's a list of all your posts in this course, including anonymous ones but excluding deleted ones."; $string['myquestion'] = 'Question'; $string['myquestions'] = 'my questions'; $string['newanswerhtml'] = 'Your subscribed question "{$a->question}" was ansered by {$a->answeruser} with the comment: <br /> <br /> "{$a->content}"<br /><br /> The answer is <a href="{$a->urltoanswer}">here</a> available.'; -$string['newanswersavailable'] = 'Recently answered'; -$string['newanswersavailable'] = 'Recently answered'; -$string['newanswersavailable_help'] = 'See all answers to questions that you asked or subscribed to in this course.'; -$string['newanswersavailable_helptitle'] = 'Help for Recently answered'; $string['newanswertext'] = 'Your subscribed question "{$a->question}" was ansered by {$a->answeruser} with the comment: "{$a->content}" @@ -267,13 +226,10 @@ $string['newquestiontext'] = 'A new Questions was added by {$a->answeruser} with "{$a->content}" The question is available under: {$a->urltoanswer}'; -$string['newstitle'] = 'Just asked'; $string['nextPage'] = 'Next page'; $string['noanswers'] = 'There are no answers in this course at present.'; $string['noanswerssubscribed'] = 'There are no answers to subscribed questions in this course at present.'; $string['noCommentsupported'] = 'This kind of annotation does not support comments.'; -$string['nohiddenanswernotifications'] = "There are no hidden answers in this course at present."; -$string['nohiddenreports'] = "There are no hidden reports in this course at present."; $string['nomyposts'] = 'You have posted no question or answer in this course yet.'; $string['noquestions'] = 'No questions on this page!'; $string['noquestions_overview'] = 'There are no questions in this course at present.'; @@ -290,16 +246,10 @@ $string['notificationsubject:newreport'] = 'A comment was reported in {$a}'; $string['nounreadreports'] = 'There are no unread reports in this course at present.'; $string['on'] = 'on'; $string['onlyDeleteOwnAnnotations'] = ", because it belongs to another user."; -$string['onlyDeleteOwnComments'] = ", because You are not allowed to delete other users' comments."; $string['onlyDeleteUncommentedPosts'] = ", because the other users comments would be deleted as well."; -$string['openAll'] = 'Show all'; $string['openquestions'] = 'unsolved'; -$string['other_reason'] = 'other reason'; $string['overview'] = 'Overview'; -$string['overviewactioncolumn'] = "Manage"; -$string['OverviewConfigCouldNotBeSaved'] = 'The current view could not be saved, because your browser does not support this function.'; -$string['OverviewConfigSaved'] = 'The current view was saved.'; -$string['own'] = 'own'; +$string['overviewactioncolumn'] = 'Manage'; $string['ownpoststab'] = 'My posts'; $string['ownpoststabicon'] = 'My posts'; $string['ownpoststabicon_help'] = 'This page displays all comments that you posted in this course.'; @@ -339,17 +289,13 @@ $string['pdfannotatorcontent'] = 'Files and subfolders'; $string['pdfannotatorname'] = 'PDF Annotation Tool'; $string['pdfButton'] = 'Document'; $string['pleaforfeedback'] = 'The PDF Annotator is still being developed. You can help us tailor it to your needs by giving us feedback. Thank you in advance.'; -$string['pleaseSelectReportReason'] = '--- Please indicate your reason for reporting this comment. ---'; $string['pluginadministration'] = 'PDF Annotation administration'; $string['pluginname'] = 'PDF Annotation'; $string['point'] = 'Add a pin in the document and write a comment.'; -$string['post'] = 'Post'; $string['prevPage'] = 'Previous page'; $string['print'] = 'download document'; $string['printButton'] = 'Download'; -$string['printviewtitle'] = "Comments"; -$string['printwhat'] = 'What would you like to open?'; -$string['printwhatTitle'] = 'Open PDF in Acrobat Reader'; +$string['printviewtitle'] = 'Comments'; $string['printwithannotations'] = 'download comments'; $string['privacy:metadata:core_files'] = 'The Pdfannotator stores files which have been uploaded by the user as a basis for annotation and discussion.'; $string['privacy:metadata:pdfannotator_annotations:annotationid'] = 'The ID of the annotation that was made. It refers to the data listed above.'; @@ -369,9 +315,6 @@ $string['privacy:metadata:pdfannotator_subscriptions'] = "Information about the $string['privacy:metadata:pdfannotator_votes:commentid'] = "The ID of the comment."; $string['privacy:metadata:pdfannotator_votes:userid'] = "The ID of the user who marked the comment as interesting or helpful. It is saved in order to prevent users from voting for the same comment repeatedly."; $string['privacy:metadata:pdfannotator_votes'] = "Information about questions and comments that were marked as interesting or helpful."; -$string['public'] = 'public'; -$string['putinrecyclebin'] = 'Mark as read'; -$string['putinrecyclebin_report'] = 'Mark as read'; $string['question'] = 'Question'; $string['questions'] = 'questions'; $string['questionsimgtitle'] = "Show all questions on this page"; @@ -381,19 +324,12 @@ $string['questionstabicon'] = 'Questions'; $string['questionstabicon_help'] = 'This page displays all unsolved questions that were asked in this course. You can also choose to see all or all solved questions in this course.'; $string['questionstitle'] = 'Questions on page'; $string['read'] = 'Read'; -$string['reason'] = 'Explanation'; $string['recievenewquestionnotifications'] = 'Notify about new questions'; $string['recipient'] = 'Recipient/s'; $string['recipient_help'] = 'To select several persons, hold down "Ctrl"'; $string['recipientforwardform'] = 'Forward to'; $string['recipientrequired'] = 'Please select recipient/s'; $string['rectangle'] = 'Add a Rectangle in the document and write a comment.'; -$string['recyclebin_overview_managerintro'] = 'This page displays all hidden report notifications for this course.'; -$string['recyclebin_overview_studentsintro'] = 'This page displays all hidden answer notifications for questions that you asked or subscribed to in this course.'; -$string['recyclebintab'] = 'Read'; -$string['recyclebintabicon'] = 'Read'; -$string['recyclebintabicon_help'] = "This page displays all reports marked as <em>seen</em> in this course"; -$string['register'] = 'apply'; $string['removeCorrect'] = 'Remove marking as correct'; $string['removehidden'] = 'Show'; $string['report'] = 'Report'; @@ -406,18 +342,13 @@ $string['reportaddedtext'] = '{$a->reportinguser} has reportet a comment with th It is available under: {$a->urltoreport}'; $string['reportedby'] = 'by / on'; $string['reportedcomment'] = 'Reported comment'; -$string['reportForbidden'] = 'Not allowed to report'; -$string['reportinfotitle'] = 'Reported comments'; -$string['reportinfotitle_help'] = 'All reports in this course are listed.'; -$string['reportreason'] = 'Reason for reporting this comment'; $string['reports'] = 'reported comments'; $string['reportsendbutton'] = 'Send'; $string['reportstab'] = 'Reported comments'; $string['reportstabicon'] = 'Reported comments'; $string['reportstabicon_help'] = 'This page displays comments that were reported as inappropriate in this course. You can choose to see only unread/read* reports or all reports.<br>* Any manager of this course can mark a report as read.'; $string['reportwassentoff'] = 'The comment has been reported.'; -$string['saveOverviewConfig'] = 'Remember this view'; -$string['search'] = "Search"; +$string['search'] = 'Search'; $string['searchresults'] = 'Search results'; $string['second'] = 'second'; $string['seconds'] = 'seconds'; @@ -430,8 +361,6 @@ $string['setting_alternative_name'] = 'Name'; $string['setting_alternative_name_desc'] = 'Provide an alternative name for the PDF. If empty, the name of the pdf will be taken as represantative name'; $string['setting_alternative_name_help'] = "If the name is more than 20 characters long, the remaining characters will be replaced with '...' in the annotator's internal tab navigation."; $string['setting_anonymous'] = 'Allow anonymous posting?'; -$string['setting_choosetimespanfornews'] = "For how long should a comment be marked as new?"; -$string['setting_col_annotating_enabled'] = 'Enable collaborative annotation on PDF'; $string['setting_fileupload'] = 'Select a pdf-file'; $string['setting_fileupload_help'] = "You can only change the selected file until the annotator has been created by a click on 'Save'."; $string['setting_use_studentdrawing'] = "Drawing"; @@ -469,10 +398,7 @@ $string['successfullymarkedasread'] = 'The report was marked as read.'; $string['successfullymarkedasreadandnolongerdisplayed'] = 'The report was marked as read and removed from the table.'; $string['successfullymarkedasunread'] = 'he report was marked as unread.'; $string['successfullymarkedasunreadandnolongerdisplayed'] = 'The report was marked as unread and removed from the table.'; -$string['successfullyPutInRecycleBin'] = 'The item was put in the recycle bin.'; $string['successfullyRedisplayed'] = 'The comment is visible to participants once more'; -$string['successfullyRedisplayedAnswer'] = 'The item was moved to the "Answers" category once more..'; -$string['successfullyRedisplayedReport'] = 'The item was moved to the "Reports" category once more.'; $string['successfullySubscribed'] = 'Subscribed to question.'; $string['successfullySubscribed'] = 'Your subscription to the question was registered.'; $string['successfullyUnsubscribed'] = 'Your subscribtion was cancelled.'; @@ -481,15 +407,9 @@ $string['successfullyUnsubscribedSingular'] = 'Your subscribtion to the question $string['successfullyUnsubscribedTwo'] = 'Your subscribtion was cancelled. Both answers to the question were removed from this table.'; $string['sumPages'] = 'Number of pages'; $string['text'] = 'Add a text in the document.'; -$string['timecouldnotbeset'] = 'An error has occured.'; -$string['timewasset'] = 'Your selection has been saved.'; $string['titleforreportcommentform'] = 'Report comment'; $string['titleforwardform'] = 'Forward question'; -$string['tooverview'] = 'to overview'; $string['toreport'] = 'Report'; -$string['tosettingspage'] = 'got to settings page'; -$string['total'] = 'total'; -$string['unknownuser'] = 'unknown user'; $string['unseenreports'] = 'unread only'; $string['unsolvedquestionstitle'] = 'Unsolved Questions'; $string['unsolvedquestionstitle_help'] = 'All unsolved questions in this course are listed.'; @@ -504,7 +424,6 @@ $string['useprint_comments'] = "Give participants access to the PDF and its comm $string['useprint_document'] = "Give participants access to the PDF?"; $string['usevotes'] = "Allow users to like comments."; $string['view'] = 'Document'; -$string['viewAllActivitiesInThisCourse'] = 'Would you like to see all modules with new activities in this course?'; $string['votes'] = 'Likes'; $string['voteshelpicon'] = 'Likes'; $string['voteshelpicon_help'] = 'This column tells you how many other people take an interest in the question.'; @@ -512,7 +431,6 @@ $string['voteshelpicontwo'] = 'Likes'; $string['voteshelpicontwo_help'] = 'This column tells you how often your posts were <em>liked</em>.'; $string['week'] = 'week'; $string['weeks'] = 'weeks'; -$string['writtenby'] = 'von / am'; $string['year'] = 'year'; $string['years'] = 'years'; $string['yesButton'] = 'Yes'; diff --git a/model/overviewtable.php b/model/overviewtable.php index f187171..a3baebb 100644 --- a/model/overviewtable.php +++ b/model/overviewtable.php @@ -156,13 +156,13 @@ class userspoststable extends overviewtable { $this->column_style('col0', 'width', '60%'); // The user's post. $this->column_style('col1', 'width', '18%'); // Time of last modification. $this->column_style('col2', 'width', '7%'); // Number of votes for this post. - $this->column_style('col3', 'width', '15%'); // Annotator in which they posted it + $this->column_style('col3', 'width', '15%'); // Annotator in which they posted it. $this->attributes['id'] = $this->id; $mypost = get_string('mypost', 'pdfannotator'); // $OUTPUT->pix_icon('t/message', '') . self::wrap(get_string('mypost', 'pdfannotator')); $lastedited = get_string('lastedited', 'pdfannotator'); // $OUTPUT->pix_icon('e/insert_time', '') . self::wrap(get_string('lastedited', 'pdfannotator')); $votes = "<i class='icon fa fa-thumbs-up fa-fw' style='float:left'></i>" . ' ' . $OUTPUT->help_icon('voteshelpicontwo', 'pdfannotator');; // "<i class='icon fa fa-chevron-up fa-lg' style='float:left'></i>" . self::wrap(get_string('votes', 'pdfannotator')). ' ' . $OUTPUT->help_icon('voteshelpicon', 'pdfannotator'); $document = get_string('pdfannotatorcolumn', 'pdfannotator'); // "<i class='icon fa fa-book fa-fw'></i>" . self::wrap(get_string('pdfannotatorcolumn', 'pdfannotator')); - $this->define_headers(array($mypost, $lastedited, $votes, $document)); // get_string('unsubscribeQuestion', 'pdfannotator'), get_string('putinrecyclebin', 'pdfannotator') + $this->define_headers(array($mypost, $lastedited, $votes, $document)); $this->no_sorting('col0'); $this->sortable(true, 'col2', SORT_ASC); $this->sortable(true, 'col3', SORT_DESC); @@ -192,7 +192,7 @@ class reportstable extends overviewtable { $reportedcomment = get_string('reportedcomment', 'pdfannotator'); // $OUTPUT->pix_icon('i/flagged', '') . self::wrap(get_string('reportedcomment', 'pdfannotator')); $writtenby = get_string('by', 'pdfannotator') . ' ' . get_string('on', 'pdfannotator'); // $OUTPUT->pix_icon('i/user', '') . self::wrap(get_string('by', 'pdfannotator')) . ' ' . $OUTPUT->pix_icon('e/insert_time', '') . self::wrap(get_string('on', 'pdfannotator')); $actionmenu = get_string('overviewactioncolumn', 'pdfannotator'); // $OUTPUT->pix_icon('i/settings', '') . self::wrap(get_string('overviewactioncolumn', 'pdfannotator')); - $this->define_headers(array($report, $reportedby, $reportedcomment, $writtenby, $actionmenu)); // get_string('unsubscribeQuestion', 'pdfannotator'), get_string('putinrecyclebin', 'pdfannotator') + $this->define_headers(array($report, $reportedby, $reportedcomment, $writtenby, $actionmenu)); $this->no_sorting('col0'); $this->no_sorting('col2'); $this->no_sorting('col4'); diff --git a/model/pdfannotator.php b/model/pdfannotator.php index 3eab82d..3658501 100644 --- a/model/pdfannotator.php +++ b/model/pdfannotator.php @@ -141,7 +141,7 @@ class pdfannotator_instance { } foreach ($questions as $question) { - + $question->answeredquestion = html_entity_decode($question->answeredquestion); $question->timemodified = pdfannotator_get_user_datetime($question->timemodified); if ($question->visibility === 'anonymous') { -- GitLab