diff --git a/lang/en/pdfannotator.php b/lang/en/pdfannotator.php
index 7f796c2cccb9429bae2683c254cb64eb5c598be5..b510e626fb146beb613294616144e0343a73740a 100644
--- a/lang/en/pdfannotator.php
+++ b/lang/en/pdfannotator.php
@@ -30,7 +30,9 @@ $string['add_private_comment'] = 'Add a comment to personal note';
$string['ago'] = '{$a} ago';
$string['all'] = 'all';
$string['allanswers'] = 'all';
+$string['all_answers'] = 'All answers';
$string['allquestions'] = 'all';
+$string['all_questions'] = 'All questions';
$string['allquestionsimgtitle'] = "Show all questions in this document";
$string['allquestionstitle'] = 'All questions in';
$string['allreports'] = 'all reports';
@@ -47,9 +49,9 @@ $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['author'] = 'Author';
$string['average'] = 'average';
-$string['average_answers'] = 'average answers';
+$string['average_answers'] = 'Average answers';
$string['average_help'] = 'Only users who wrote at least one comment are included in the calculation of the average (arithmetic mean)';
-$string['average_questions'] = 'average questions';
+$string['average_questions'] = 'Average questions';
$string['by'] = 'by';
$string['by_other_users'] = 'by other users';
$string['bynameondate'] = 'by {$a->name} - {$a->date}';
@@ -218,13 +220,15 @@ $string['modulename_link'] = 'mod/pdfannotator/view';
$string['modulenameplural'] = 'PDF Annotations';
$string['month'] = 'month';
$string['months'] = 'months';
-$string['myanswers'] = 'my answers';
+$string['myanswers'] = 'My answers';
$string['mypost'] = 'My post';
$string['myprivate'] = 'My personal notes';
-$string['myprotectedanswers'] = 'my private answers';
-$string['myprotectedquestions'] = 'my private questions';
+$string['myprotectedanswers'] = 'My private answers';
+$string['myprotectedquestions'] = 'My private questions';
+$string['mypublicanswers'] = 'My public answers';
+$string['mypublicquestions'] = 'My public questions';
$string['myquestion'] = 'Question';
-$string['myquestions'] = 'my questions';
+$string['myquestions'] = 'My questions';
$string['newanswerhtml'] = 'Your subscribed question "{$a->question}" was answered by {$a->answeruser} with the comment: <br /> <br /> "{$a->content}"<br /><br />
The answer is <a href="{$a->urltoanswer}">here</a> available.';
$string['newanswertext'] = 'Your subscribed question "{$a->question}" was answered by {$a->answeruser} with the comment:
@@ -337,9 +341,10 @@ $string['protected_answers'] = 'Private answers';
$string['protected_comments'] = "Private comments";
$string['protected_comments_help'] = 'Visible only for you and teachers.';
$string['protected_questions'] = 'Private questions';
+$string['publicanswers'] = 'Public answers';
$string['public_comments'] = 'Public comments';
+$string['publicquestions'] = 'Public questions';
$string['question'] = 'Question';
-$string['questions'] = 'questions';
$string['questionsimgtitle'] = "Show all questions on this page";
$string['questionSolved'] = 'Questions is closed. However, you can still create new comments.';
$string['questionstab'] = 'Questions';
@@ -366,7 +371,7 @@ $string['reportaddedtext'] = '{$a->reportinguser} has reported a comment with th
It is available under: {$a->urltoreport}';
$string['reportedby'] = 'by / on';
$string['reportedcomment'] = 'Reported comment';
-$string['reports'] = 'reported comments';
+$string['reports'] = 'Reported comments';
$string['reportsendbutton'] = 'Send';
$string['reportstab'] = 'Reported comments';
$string['reportstabicon'] = 'Reported comments';
diff --git a/model/statistics.class.php b/model/statistics.class.php
index c77dc47c073f0cabcd186704762feecf37ce7169..287064c529af81f341f948d8e289fc47207e824a 100644
--- a/model/statistics.class.php
+++ b/model/statistics.class.php
@@ -136,11 +136,11 @@ class pdfannotator_statistics {
public function get_tabledata() {
$ret = [];
- $ret[] = array('row' => array(get_string('questions', 'pdfannotator'), $this->get_comments_annotator('1'), $this->get_comments_course('1')));
+ $ret[] = array('row' => array(get_string('all_questions', 'pdfannotator'), $this->get_comments_annotator('1'), $this->get_comments_course('1')));
$ret[] = array('row' => array(get_string('myquestions', 'pdfannotator'), $this->get_comments_annotator('1', true), $this->get_comments_course('1', true)));
$ret[] = array('row' => array(get_string('average_questions', 'pdfannotator').'<a class="btn btn-link p-a-0" role="button" data-container="body" data-toggle="popover" data-placement="right" data-content="'.get_string('average_help', 'pdfannotator').'" data-html="true" tabindex="0" data-trigger="focus"><li class="icon fa fa-question-circle text-info fa-fw" aria-hidden="true" title="'.get_string('entity_helptitle', 'pdfannotator').' '.get_string('average', 'pdfannotator').'"></li></a>'
, round($this->get_comments_average_annotator('1'), 2), round($this->get_comments_average_course('1'), 2)));
- $ret[] = array('row' => array(get_string('answers', 'pdfannotator'), $this->get_comments_annotator('0'), $this->get_comments_course('0')));
+ $ret[] = array('row' => array(get_string('all_answers', 'pdfannotator'), $this->get_comments_annotator('0'), $this->get_comments_course('0')));
$ret[] = array('row' => array(get_string('myanswers', 'pdfannotator'), $this->get_comments_annotator('0', true), $this->get_comments_course('0', true)));
$ret[] = array('row' => array(get_string('average_answers', 'pdfannotator').'<a class="btn btn-link p-a-0" role="button" data-container="body" data-toggle="popover" data-placement="right" data-content="'.get_string('average_help', 'pdfannotator').'" data-html="true" tabindex="0" data-trigger="focus"><li class="icon fa fa-question-circle text-info fa-fw" aria-hidden="true" title="'.get_string('entity_helptitle', 'pdfannotator').' '.get_string('average', 'pdfannotator').'"></li></a>'
, round($this->get_comments_average_annotator('0'), 2), round($this->get_comments_average_course('0'), 2)));
diff --git a/shared/statistic.js b/shared/statistic.js
index c2c757c629e31cb0dcbc647be691a68bc86dda06..7cd422d7ee6d9b48935539fe9debabab2ff21a39 100644
--- a/shared/statistic.js
+++ b/shared/statistic.js
@@ -24,14 +24,14 @@ function setCharts(Y, names, otherquestions, myquestions, otheranswers, myanswer
data: {
labels: names,
datasets: [{
- label: M.util.get_string('myquestions', 'pdfannotator'),
+ label: M.util.get_string('mypublicquestions', 'pdfannotator'),
stack: 'questions',
data: myquestions,
backgroundColor: 'rgb(0,84,159)',
borderColor: borderCol,
borderWidth: 1,
}, {
- label: M.util.get_string('questions', 'pdfannotator') + ' ' + M.util.get_string('by_other_users', 'pdfannotator'),
+ label: M.util.get_string('publicquestions', 'pdfannotator') + ' ' + M.util.get_string('by_other_users', 'pdfannotator'),
stack: 'questions',
data: otherquestions,
backgroundColor: 'rgb(142,186,229)',
@@ -53,7 +53,7 @@ function setCharts(Y, names, otherquestions, myquestions, otheranswers, myanswer
borderWidth: 1,
},
{
- label: M.util.get_string('myanswers', 'pdfannotator'),
+ label: M.util.get_string('mypublicanswers', 'pdfannotator'),
stack: 'answers',
data: myanswers,
backgroundColor: 'rgb(87, 171, 39)',
@@ -63,7 +63,7 @@ function setCharts(Y, names, otherquestions, myquestions, otheranswers, myanswer
borderWidth: 1,
},
{
- label: M.util.get_string('answers', 'pdfannotator') + ' ' + M.util.get_string('by_other_users', 'pdfannotator'),
+ label: M.util.get_string('publicanswers', 'pdfannotator') + ' ' + M.util.get_string('by_other_users', 'pdfannotator'),
stack: 'answers',
data: otheranswers,
backgroundColor: 'rgb(184, 214, 152)',