mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-60717-master-enfix' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2017-11-08 14:43:15 +13:00
commit 7a2300fd82
5 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/ldap/lang/en/auth_ldap.php
View File

@ -121,7 +121,7 @@ $string['didntgetusersfromldap'] = "Did not get any users from LDAP -- error? --
$string['gotcountrecordsfromldap'] = "Got {\$a} records from LDAP\n";
$string['ldapnotconfigured'] = 'The LDAP host url is currently not configured';
$string['morethanoneuser'] = 'Strange! More than one user record found in ldap. Only using the first one.';
$string['needbcmath'] = 'You need the BCMath extension to use grace logins with Active Directory';
$string['needbcmath'] = 'You need the BCMath extension to use expired password checking with Active Directory.';
$string['needmbstring'] = 'You need the mbstring extension to change passwords in Active Directory';
$string['nodnforusername'] = 'Error in user_update_password(). No DN for: {$a->username}';
$string['noemail'] = 'Tried to send you an email but failed!';

2
lang/en/role.php
View File

@ -456,7 +456,7 @@ $string['useshowadvancedtochange'] = 'Use \'Show advanced\' to change';
$string['viewingdefinitionofrolex'] = 'Viewing the definition of role \'{$a}\'';
$string['viewrole'] = 'View role details';
$string['webservice:createtoken'] = 'Create a web service token';
$string['webservice:managealltokens'] = 'Manage all users\' web services';
$string['webservice:managealltokens'] = 'Manage all users\' web service tokens';
$string['webservice:createmobiletoken'] = 'Create a web service token for mobile access';
$string['whydoesuserhavecap'] = 'Why does {$a->fullname} have capability {$a->capability} in context {$a->context}?';
$string['whydoesusernothavecap'] = 'Why does {$a->fullname} not have capability {$a->capability} in context {$a->context}?';

26
mod/quiz/lang/en/quiz.php
View File

@ -285,37 +285,27 @@ $string['editquestion'] = 'Edit question';
$string['editquestions'] = 'Edit questions';
$string['editquiz'] = 'Edit quiz';
$string['editquizquestions'] = 'Edit quiz questions';
$string['emailconfirmbody'] = 'Dear {$a->username},
$string['emailconfirmbody'] = 'Hi {$a->username},
Thank you for submitting your answers to
\'{$a->quizname}\'
in course \'{$a->coursename}\'
at {$a->submissiontime}.
Thank you for submitting your answers to \'{$a->quizname}\' in course \'{$a->coursename}\' at {$a->submissiontime}.
This message confirms that we have safely received your answers.
This message confirms that your answers have been saved.
You can access this quiz at {$a->quizurl}.';
$string['emailconfirmsmall'] = 'Thank you for submitting your answers to \'{$a->quizname}\'';
$string['emailconfirmsubject'] = 'Submission confirmation: {$a->quizname}';
$string['emailnotifybody'] = 'Dear {$a->username},
$string['emailnotifybody'] = 'Hi {$a->username},
{$a->studentname} has completed
\'{$a->quizname}\' ({$a->quizurl})
in course \'{$a->coursename}\'
{$a->studentname} has completed \'{$a->quizname}\' ({$a->quizurl}) in course \'{$a->coursename}\'.
You can review this attempt at {$a->quizreviewurl}.';
$string['emailnotifysmall'] = '{$a->studentname} has completed {$a->quizname}. See {$a->quizreviewurl}';
$string['emailnotifysubject'] = '{$a->studentname} has completed {$a->quizname}';
$string['emailoverduebody'] = 'Dear {$a->studentname},
$string['emailoverduebody'] = 'Hi {$a->studentname},
You started an attempt at \'{$a->quizname}\'
in course \'{$a->coursename}\', but you never submitted it. It should have been
submitted by {$a->attemptduedate}.
You started an attempt at \'{$a->quizname}\' in course \'{$a->coursename}\', but you never submitted it. It should have been submitted by {$a->attemptduedate}.
If you would still like to submit this attempt, please go to
{$a->attemptsummaryurl} and click the submit button.
You must do this before {$a->attemptgraceend}
otherwise your attempt will not be counted.';
If you would still like to submit this attempt, please go to {$a->attemptsummaryurl} and click the submit button. You must do this before {$a->attemptgraceend} otherwise your attempt will not be counted.';
$string['emailoverduesmall'] = 'You did not submit your attempt at {$a->quizname}. Please go to {$a->attemptsummaryurl} before {$a->attemptgraceend} if you would still like to submit.';
$string['emailoverduesubject'] = 'Attempt now overdue: {$a->quizname}';
$string['empty'] = 'Empty';

2
report/outline/lang/en/report_outline.php
View File

@ -28,7 +28,7 @@ $string['eventoutlinereportviewed'] = 'Outline report viewed';
$string['neverseen'] = 'Never seen';
$string['nocapability'] = 'Can not access user outline report';
$string['nologreaderenabled'] = 'No log reader enabled';
$string['numviews'] = '{$a->numviews} by {$a->distinctusers} users';
$string['numviews'] = '{$a->numviews} views by {$a->distinctusers} users';
$string['outline:view'] = 'View activity report';
$string['page-report-outline-x'] = 'Any outline report';
$string['page-report-outline-index'] = 'Course outline report';

16
report/outline/tests/behat/outline.feature
View File

@ -47,8 +47,8 @@ Feature: View an outline report
And I log in as "teacher1"
And I am on "Course 1" course homepage
When I navigate to "Activity report" node in "Course administration > Reports"
Then I should see "2 by 2 users" in the "Book name" "table_row"
And I should see "1 by 1 users" in the "Forum name" "table_row"
Then I should see "2 views by 2 users" in the "Book name" "table_row"
And I should see "1 views by 1 users" in the "Forum name" "table_row"
Scenario: View the outline report when only the standard log reader is enabled
Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
@ -68,8 +68,8 @@ Feature: View an outline report
And I log in as "admin"
And I am on "Course 1" course homepage
When I navigate to "Activity report" node in "Course administration > Reports"
Then I should see "2 by 2 users" in the "Book name" "table_row"
And I should see "1 by 1 users" in the "Forum name" "table_row"
Then I should see "2 views by 2 users" in the "Book name" "table_row"
And I should see "1 views by 1 users" in the "Forum name" "table_row"
Scenario: View the outline report when both the standard and legacy log readers are enabled
Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
@ -91,8 +91,8 @@ Feature: View an outline report
And I log in as "teacher1"
And I am on "Course 1" course homepage
When I navigate to "Activity report" node in "Course administration > Reports"
Then I should see "2 by 2 users" in the "Book name" "table_row"
And I should see "1 by 1 users" in the "Forum name" "table_row"
Then I should see "2 views by 2 users" in the "Book name" "table_row"
And I should see "1 views by 1 users" in the "Forum name" "table_row"
Scenario: View the outline report when no log reader is enabled
Given I navigate to "Manage log stores" node in "Site administration > Plugins > Logging"
@ -116,7 +116,7 @@ Feature: View an outline report
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I navigate to "Activity report" node in "Course administration > Reports"
Then I should see "3 by 1 users" in the "Forum name" "table_row"
Then I should see "3 views by 1 users" in the "Forum name" "table_row"
And I should see "-" in the "Book name" "table_row"
Scenario: Multiple views from multiple users are identified as not distinct
@ -142,7 +142,7 @@ Feature: View an outline report
When I log in as "teacher1"
And I am on "Course 1" course homepage
And I navigate to "Activity report" node in "Course administration > Reports"
Then I should see "6 by 2 users" in the "Forum name" "table_row"
Then I should see "6 views by 2 users" in the "Forum name" "table_row"
And I should see "-" in the "Book name" "table_row"
Scenario: No views from any users