Skip to content

Commit

Permalink
MDL-65639 tool_analytics: Reworded language strings
Browse files Browse the repository at this point in the history
Some language strings have been reworded to clarify functionalities.

AMOS BEGIN
  MOV [getpredictionsresults,tool_analytics],[scheduledanalysisresults,tool_analytics]
  CPY [getpredictionsresultscli,tool_analytics],[scheduledanalysisresultscli,tool_analytics]
AMOS END
  • Loading branch information
David Monllaó committed Jun 6, 2019
1 parent 21cf3ec commit 5045c4d
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 17 deletions.
7 changes: 4 additions & 3 deletions admin/tool/analytics/classes/output/models_list.php
Expand Up @@ -216,10 +216,11 @@ public function export_for_template(\renderer_base $output) {

// Get predictions.
if (!$onlycli && $modeldata->enabled && !empty($modeldata->timesplitting)) {
$urlparams['action'] = 'getpredictions';
$urlparams['action'] = 'scheduledanalysis';
$url = new \moodle_url('model.php', $urlparams);
$icon = new \action_menu_link_secondary($url, new \pix_icon('i/notifications',
get_string('getpredictions', 'tool_analytics')), get_string('getpredictions', 'tool_analytics'));
$icon = new \action_menu_link_secondary($url,
new \pix_icon('i/notifications', get_string('executescheduledanalysis', 'tool_analytics')),
get_string('executescheduledanalysis', 'tool_analytics'));
$actionsmenu->add($icon);
}

Expand Down
4 changes: 2 additions & 2 deletions admin/tool/analytics/classes/output/renderer.php
Expand Up @@ -90,9 +90,9 @@ public function render_evaluate_results($results, $logs = array()) {
$langstrdata = (object)array('name' => $timesplitting->get_name(), 'id' => $timesplittingid);

if (CLI_SCRIPT) {
$output .= $OUTPUT->heading(get_string('getpredictionsresultscli', 'tool_analytics', $langstrdata), 3);
$output .= $OUTPUT->heading(get_string('scheduledanalysisresultscli', 'tool_analytics', $langstrdata), 3);
} else {
$output .= $OUTPUT->heading(get_string('getpredictionsresults', 'tool_analytics', $langstrdata), 3);
$output .= $OUTPUT->heading(get_string('scheduledanalysisresults', 'tool_analytics', $langstrdata), 3);
}
}

Expand Down
1 change: 1 addition & 0 deletions admin/tool/analytics/lang/en/deprecated.txt
@@ -0,0 +1 @@
getpredictions,tool_analytics
14 changes: 9 additions & 5 deletions admin/tool/analytics/lang/en/tool_analytics.php
Expand Up @@ -26,6 +26,7 @@
$string['allpredictions'] = 'All predictions';
$string['alltimesplittingmethods'] = 'All analysis intervals';
$string['analysingsitedata'] = 'Analysing the site';
$string['analysis'] = 'Analysis';
$string['analyticmodels'] = 'Analytics models';
$string['bettercli'] = 'Evaluating models and generating predictions may involve heavy processing. It is recommended to run these actions from the command line.';
$string['cantguessstartdate'] = 'Can\'t guess the start date';
Expand Down Expand Up @@ -71,15 +72,13 @@
$string['evaluationmodecolconfiguration'] = 'Configuration';
$string['evaluationmodeconfiguration'] = 'Evaluate the model configuration';
$string['evaluationinbatches'] = 'The site contents are calculated and stored in batches. The evaluation process may be stopped at any time. The next time it is run, it will continue from the point when it was stopped.';
$string['executescheduledanalysis'] = 'Execute scheduled analysis';
$string['export'] = 'Export';
$string['exportincludeweights'] = 'Include the weights of the trained model';
$string['exportmodel'] = 'Export configuration';
$string['exporttrainingdata'] = 'Export training data';
$string['getpredictionsresultscli'] = 'Results using {$a->name} (id: {$a->id}) analysis interval';
$string['getpredictionsresults'] = 'Results using {$a->name} analysis interval';
$string['extrainfo'] = 'Info';
$string['generalerror'] = 'Evaluation error. Status code {$a}';
$string['getpredictions'] = 'Get predictions';
$string['goodmodel'] = 'This is a good model for using to obtain predictions. Enable it to start obtaining predictions.';
$string['importmodel'] = 'Import model';
$string['indicators'] = 'Indicators';
Expand Down Expand Up @@ -107,8 +106,8 @@
$string['newmodel'] = 'New model';
$string['nextpage'] = 'Next page';
$string['nodatatoevaluate'] = 'There is no data to evaluate the model';
$string['nodatatopredict'] = 'No new elements to get predictions for';
$string['nodatatotrain'] = 'There is no new data that can be used for training';
$string['nodatatopredict'] = 'No new elements to get predictions for.';
$string['nodatatotrain'] = 'There is no new data that can be used for training.';
$string['noinvalidanalysables'] = 'This site does not contain any invalid analysable element.';
$string['notdefined'] = 'Not yet defined';
$string['pluginname'] = 'Analytic models';
Expand All @@ -125,6 +124,8 @@
$string['restoredefaultsubmit'] = 'Restore selected';
$string['samestartdate'] = 'Current start date is good';
$string['sameenddate'] = 'Current end date is good';
$string['scheduledanalysisresults'] = 'Results using {$a->name} analysis interval';
$string['scheduledanalysisresultscli'] = 'Results using {$a->name} (id: {$a->id}) analysis interval';
$string['selecttimesplittingforevaluation'] = 'Select the analysis interval you want to use to evaluate the model configuration.';
$string['target'] = 'Target';
$string['target_help'] = 'The target is what the model will predict.';
Expand All @@ -140,3 +141,6 @@
$string['weeksenddateautomaticallyset'] = 'End date automatically set based on start date and the number of sections';
$string['weeksenddatedefault'] = 'End date automatically calculated from the course start date.';
$string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.';

// Deprecated since Moodle 3.8.
$string['getpredictions'] = 'Get predictions';
6 changes: 3 additions & 3 deletions admin/tool/analytics/model.php
Expand Up @@ -45,8 +45,8 @@
case 'evaluate':
$title = get_string('evaluatemodel', 'tool_analytics');
break;
case 'getpredictions':
$title = get_string('getpredictions', 'tool_analytics');
case 'scheduledanalysis':
$title = get_string('analysis', 'tool_analytics');
break;
case 'log':
$title = get_string('viewlog', 'tool_analytics');
Expand Down Expand Up @@ -200,7 +200,7 @@
echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs());
break;

case 'getpredictions':
case 'scheduledanalysis':
confirm_sesskey();

if ($onlycli) {
Expand Down
5 changes: 2 additions & 3 deletions lang/en/analytics.php
Expand Up @@ -95,9 +95,8 @@
$string['nodata'] = 'No data to analyse';
$string['noinsightsmodel'] = 'This model does not generate insights';
$string['noinsights'] = 'No insights reported';
$string['nonewdata'] = 'No new data available';
$string['nonewranges'] = 'No new predictions yet';
$string['nonewtimeranges'] = 'No new time ranges; nothing to predict.';
$string['nonewdata'] = 'No new data available. It will be analysed after the next analysis interval.';
$string['nonewranges'] = 'No new predictions yet. It will be analysed after the next analysis interval.';
$string['nopredictionsyet'] = 'No predictions available yet';
$string['noranges'] = 'No predictions yet';
$string['notrainingbasedassumptions'] = 'Models based on assumptions do not need training';
Expand Down
2 changes: 1 addition & 1 deletion report/insights/lang/en/report_insights.php
Expand Up @@ -43,7 +43,7 @@
$string['predictiondetails'] = 'Prediction details';
$string['nodetailsavailable'] = 'No prediction details are relevant.';
$string['timecreated'] = 'Time predicted';
$string['timerange'] = 'Time range';
$string['timerange'] = 'Analysis interval';
$string['timerangewithdata'] = '{$a->timestart} to {$a->timeend}';
$string['selectotherinsights'] = 'Select other insights...';
$string['privacy:metadata'] = 'The Insights plugin does not store any personal data.';

0 comments on commit 5045c4d

Please sign in to comment.