Skip to content

Commit

Permalink
MDL-53632 competency: Consistently use the terms frameworks, plans, ...
Browse files Browse the repository at this point in the history
- Templates: 'Learning plan templates'
- Plans: 'Learning plans'
- Frameworks: 'Competency frameworks'

When the context, or sentence, is already stating that we are talking
about 'learning plans' or 'competencies', it may sound redundant to
repeat those terms, therefore we can simply refer to 'Templates',
'Plans', and 'Frameworks'.
  • Loading branch information
Frederic Massart committed Apr 18, 2016
1 parent d580b62 commit 746da8b
Show file tree
Hide file tree
Showing 12 changed files with 91 additions and 91 deletions.
72 changes: 36 additions & 36 deletions admin/tool/lp/lang/en/tool_lp.php
Expand Up @@ -39,19 +39,19 @@
$string['addnewuserevidence'] = 'Add new evidence';
$string['addtemplatecompetencies'] = 'Add competencies to learning plan template';
$string['aisrequired'] = '\'{$a}\' is required';
$string['aplanswerecreated'] = '{$a} plans were created.';
$string['aplanswerecreatedmoremayrequiresync'] = '{$a} plans were created, more will be created during the next synchronization.';
$string['aplanswerecreated'] = '{$a} learning plans were created.';
$string['aplanswerecreatedmoremayrequiresync'] = '{$a} learning plans were created, more will be created during the next synchronization.';
$string['assigncohorts'] = 'Assign cohorts';
$string['averageproficiencyrate'] = 'The average proficiency rate for completed plans based on this template is {$a} %';
$string['averageproficiencyrate'] = 'The average proficiency rate for completed learning plans based on this template is {$a} %';
$string['cancelreviewrequest'] = 'Cancel review request';
$string['cannotaddrules'] = 'This competency cannot be configured.';
$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New user plans can not be created: this template\'s due date has, or is about to, expire.';
$string['cannotcreateuserplanswhentemplatehidden'] = 'New user plans can not be created while this template is hidden.';
$string['cannotcreateuserplanswhentemplateduedateispassed'] = 'New learning plans can not be created: this template\'s due date has, or is about to, expire.';
$string['cannotcreateuserplanswhentemplatehidden'] = 'New learning plans can not be created while this template is hidden.';
$string['category'] = 'Category';
$string['chooserating'] = 'Choose a rating...';
$string['cohortssyncedtotemplate'] = 'Cohorts synced to this template';
$string['cohortssyncedtotemplate'] = 'Cohorts synced to this learning plan template';
$string['competenciesforframework'] = 'Competencies for {$a}';
$string['competenciesmostoftennotproficient'] = 'Competencies most often not proficient in completed plans';
$string['competenciesmostoftennotproficient'] = 'Competencies most often not proficient in completed learning plans';
$string['competenciesmostoftennotproficientincourse'] = 'Competencies most often not proficient in this course';
$string['competencycannotbedeleted'] = 'The competency \'{$a}\' can not be deleted';
$string['competencycreated'] = 'Competency created';
Expand All @@ -60,7 +60,7 @@
$string['competencyframeworkcreated'] = 'Competency framework created.';
$string['competencyframeworkname'] = 'Name';
$string['competencyframeworkroot'] = 'No parent (Top level competency)';
$string['competencyframeworks'] = 'Competency Frameworks';
$string['competencyframeworks'] = 'Competency frameworks';
$string['competencyframeworkupdated'] = 'Competency framework updated.';
$string['competencyoutcome_complete'] = 'Mark as complete';
$string['competencyoutcome_evidence'] = 'Attach an evidence';
Expand All @@ -70,26 +70,26 @@
$string['competencyrule'] = 'Competency rule';
$string['competencyupdated'] = 'Competency updated';
$string['completeplan'] = 'Complete this learning plan';
$string['completeplanconfirm'] = 'Set the plan \'{$a}\' to completed? The current status of all the users competencies in this plan will be recorded, and the plan will become read only.';
$string['completeplanconfirm'] = 'Set the learning plan \'{$a}\' to completed? The current status of all the users competencies in this plan will be recorded, and the plan will become read only.';
$string['configurecoursecompetencysettings'] = 'Configure course competencies';
$string['configurescale'] = 'Configure scales';
$string['coursecompetencies'] = 'Course competencies';
$string['coursecompetencyratingsarenotpushedtouserplans'] = 'Competency ratings in this course do not affect individual learning plans.';
$string['coursecompetencyratingsarepushedtouserplans'] = 'Competency ratings in this course are updated immediately in individual learning plans.';
$string['coursecompetencyratingsquestion'] = 'When a course competency is rated, does the rating update the competency in the users learning plans, or is it only applied to the course?';
$string['coursecompetencyratingsarenotpushedtouserplans'] = 'Competency ratings in this course do not affect learning plans.';
$string['coursecompetencyratingsarepushedtouserplans'] = 'Competency ratings in this course are updated immediately in learning plans.';
$string['coursecompetencyratingsquestion'] = 'When a course competency is rated, does the rating update the competency in the learning plans, or is it only applied to the course?';
$string['coursesusingthiscompetency'] = 'Courses linked to this competency';
$string['coveragesummary'] = '{$a->competenciescoveredcount} of {$a->competenciescount} competencies are covered ( {$a->coveragepercentage} % )';
$string['createplans'] = 'Create plans';
$string['createplans'] = 'Create learning plans';
$string['createlearningplans'] = 'Create learning plans';
$string['crossreferencedcompetencies'] = 'Cross-referenced competencies';
$string['default'] = 'Default';
$string['deletecompetency'] = 'Delete competency \'{$a}\'?';
$string['deletecompetencyframework'] = 'Delete competency framework \'{$a}\'?';
$string['deletecompetencyparenthasrule'] = 'Delete competency \'{$a}\'? This will also remove the rule set on its parent.';
$string['deleteplan'] = 'Delete plan \'{$a}\'?';
$string['deleteplans'] = 'Delete the plans';
$string['deleteplan'] = 'Delete learning plan \'{$a}\'?';
$string['deleteplans'] = 'Delete the learning plans';
$string['deletetemplate'] = 'Delete learning plan template \'{$a}\'?';
$string['deletetemplatewithplans'] = 'This learning plan template has user plans associated. You have to indicate how to process those plans.';
$string['deletetemplatewithplans'] = 'This template has learning plans associated. You have to indicate how to process those plans.';
$string['deletethisplan'] = 'Delete this learning plan';
$string['deletethisuserevidence'] = 'Delete this evidence';
$string['deleteuserevidence'] = 'Delete the evidence of prior learning \'{$a}\'?';
Expand All @@ -110,7 +110,7 @@
$string['hidden'] = 'Hidden';
$string['hiddenhint'] = '(hidden)';
$string['idnumber'] = 'Id number';
$string['inheritfromframework'] = 'Inherit from framework (default)';
$string['inheritfromframework'] = 'Inherit from competency framework (default)';
$string['itemstoadd'] = 'Items to add';
$string['jumptocompetency'] = 'Jump to competency';
$string['jumptouser'] = 'Jump to user';
Expand Down Expand Up @@ -139,40 +139,40 @@
$string['movecompetencywillresetrules'] = 'Moving the competency will remove the rules set on its parent and destination. Do you want to continune?';
$string['moveframeworkafter'] = 'Move competency framework after \'{$a}\'';
$string['movetonewparent'] = 'Relocate';
$string['myplans'] = 'My plans';
$string['myplans'] = 'My learning plans';
$string['nfiles'] = '{$a} file(s)';
$string['noactivities'] = 'No activities';
$string['nocompetencies'] = 'No competencies have been created in this framework.';
$string['nocompetenciesincourse'] = 'No competencies have been linked to this course.';
$string['nocompetenciesintemplate'] = 'No competencies have been linked to this template.';
$string['nocompetenciesintemplate'] = 'No competencies have been linked to this learning plan template.';
$string['nocompetencyframeworks'] = 'No competency frameworks have been created yet.';
$string['nocompetencyselected'] = 'No competency selected';
$string['nocrossreferencedcompetencies'] = 'No other competencies have been cross-referenced to this competency.';
$string['noevidence'] = 'No evidence';
$string['nofiles'] = 'No files';
$string['nolinkedcourses'] = 'No courses are linked to this competency';
$string['noparticipants'] = 'No participants found.';
$string['noplanswerecreated'] = 'No plans were created.';
$string['noplanswerecreated'] = 'No learning plans were created.';
$string['notemplates'] = 'No learning plan templates have been created yet.';
$string['nourl'] = 'No URL';
$string['nouserevidence'] = 'No evidence of prior learning have been added yet.';
$string['nouserplans'] = 'No learning plans have been created yet.';
$string['oneplanwascreated'] = 'A plan was created';
$string['oneplanwascreated'] = 'A learning plan was created';
$string['outcome'] = 'Outcome';
$string['path'] = 'Path:';
$string['parentcompetency'] = 'Parent';
$string['parentcompetency_edit'] = 'Edit parent';
$string['parentcompetency_help'] = 'Define the parent under which the competency will be added. It can either be another competency within the same framework, or the root of the competency framework for a top level competency.';
$string['planapprove'] = 'Make active';
$string['plancompleted'] = 'Plan completed';
$string['plancompleted'] = 'Learning plan completed';
$string['plancreated'] = 'Learning plan created';
$string['plandescription'] = 'Description';
$string['planname'] = 'Name';
$string['plantemplate'] = 'Select template';
$string['plantemplate'] = 'Select learning plan template';
$string['plantemplate_help'] = 'A learning plan created from a template will contain a list of competencies that match the template. Updates to the template will be reflected in any plan created from that template.';
$string['planunapprove'] = 'Send back to draft';
$string['planupdated'] = 'Learning plan updated';
$string['pluginname'] = 'Learning Plans';
$string['pluginname'] = 'Learning plans';
$string['points'] = 'Points';
$string['pointsgivenfor'] = 'Points given for \'{$a}\'';
$string['proficient'] = 'Proficient';
Expand All @@ -181,9 +181,9 @@
$string['ratecomment'] = 'Evidence notes';
$string['rating'] = 'Rating';
$string['ratingaffectsonlycourse'] = 'Rating a competency only updates the competency in this course';
$string['ratingaffectsuserplans'] = 'Rating a competency also updates the competency in all of the users learning plans';
$string['ratingaffectsuserplans'] = 'Rating a competency also updates the competency in all of the learning plans';
$string['reopenplan'] = 'Reopen this learning plan';
$string['reopenplanconfirm'] = 'Reopen the plan \'{$a}\'? The status of the users competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
$string['reopenplanconfirm'] = 'Reopen the learning plan \'{$a}\'? The status of the users competencies that was recorded at the time the plan was previously completed will be deleted, and the plan will become active again.';
$string['requestreview'] = 'Request review';
$string['reviewer'] = 'Reviewer';
$string['reviewstatus'] = 'Review status';
Expand All @@ -195,7 +195,7 @@
$string['selectcohortstosync'] = 'Select cohorts to sync';
$string['selectcompetencymovetarget'] = 'Select a location to move this competency to:';
$string['selectedcompetency'] = 'Selected competency';
$string['selectuserstocreateplansfor'] = 'Select users to create plans for';
$string['selectuserstocreateplansfor'] = 'Select users to create learning plans for';
$string['sendallcompetenciestoreview'] = 'Send all competencies in review for evidence of prior learning \'{$a}\'';
$string['sendcompetenciestoreview'] = 'Send competencies for review';
$string['shortname'] = 'Name';
Expand Down Expand Up @@ -250,25 +250,25 @@
$string['taxonomy_selected_proficiency'] = 'Selected proficiency';
$string['taxonomy_selected_skill'] = 'Selected skill';
$string['taxonomy_selected_value'] = 'Selected value';
$string['template'] = 'Template';
$string['template'] = 'Learning plan template';
$string['templatebased'] = 'Template based';
$string['templatecohortnotsyncedwhileduedateispassed'] = 'Cohorts will not be synchronized while the template\'s due date is passed.';
$string['templatecohortnotsyncedwhilehidden'] = 'Cohorts will not be synchronized while this template is hidden.';
$string['templatecompetencies'] = 'Template competencies';
$string['templatecompetencies'] = 'Learning plan template competencies';
$string['templatecreated'] = 'Learning plan template created';
$string['templatename'] = 'Name';
$string['templates'] = 'Learning plan templates';
$string['templateupdated'] = 'Learning plan template updated';
$string['totalrequiredtocomplete'] = 'Total required to complete';
$string['unlinkcompetencycourse'] = 'Unlink the competency \'{$a}\' from the course?';
$string['unlinkcompetencyplan'] = 'Unlink the competency \'{$a}\' from the plan?';
$string['unlinkcompetencytemplate'] = 'Unlink the competency \'{$a}\' from the template?';
$string['unlinkplanstemplate'] = 'Unlink the plans from template';
$string['unlinkplantemplate'] = 'Unlink from template';
$string['unlinkplantemplateconfirm'] = 'Unlink the plan \'{$a}\' from its template? Any change made to the template will no longer be applied to the plan. This action can not be undone.';
$string['unlinkcompetencyplan'] = 'Unlink the competency \'{$a}\' from the learning plan?';
$string['unlinkcompetencytemplate'] = 'Unlink the competency \'{$a}\' from the learning plan template?';
$string['unlinkplanstemplate'] = 'Unlink the learning plans from their template';
$string['unlinkplantemplate'] = 'Unlink from learning plan template';
$string['unlinkplantemplateconfirm'] = 'Unlink the learning plan \'{$a}\' from its template? Any change made to the template will no longer be applied to the plan. This action can not be undone.';
$string['uponcoursecompletion'] = 'Upon course completion:';
$string['uponcoursemodulecompletion'] = 'Upon activity completion:';
$string['usercompetencyfrozen'] = 'This record is now frozen. It reflects the state of the user\'s competency when their plan was marked as complete.';
$string['usercompetencyfrozen'] = 'This record is now frozen. It reflects the state of the user\'s competency when their learning plan was marked as complete.';
$string['userevidence'] = 'Evidence of prior learning';
$string['userevidencecreated'] = 'Evidence of prior learning created';
$string['userevidencedescription'] = 'Description';
Expand All @@ -284,4 +284,4 @@
$string['xcompetencieslinkedoutofy'] = '{$a->x} out of {$a->y} competencies linked to courses';
$string['xcompetenciesproficientoutofy'] = '{$a->x} out of {$a->y} competencies are proficient';
$string['xcompetenciesproficientoutofyincourse'] = 'You are proficient in {$a->x} out of {$a->y} competencies in this course.';
$string['xplanscompletedoutofy'] = '{$a->x} out of {$a->y} plans completed for this template';
$string['xplanscompletedoutofy'] = '{$a->x} out of {$a->y} learning plans completed for this template';
4 changes: 2 additions & 2 deletions admin/tool/lp/lib.php
Expand Up @@ -36,8 +36,8 @@ function tool_lp_extend_navigation_course($navigation, $course, $coursecontext)
return;
}

// Just a link to course report.
$title = get_string('coursecompetencies', 'tool_lp');
// Just a link to course competency.
$title = get_string('competencies', 'core_competency');
$path = new moodle_url("/admin/tool/lp/coursecompetencies.php", array('courseid' => $course->id));
$settingsnode = navigation_node::create($title,
$path,
Expand Down
14 changes: 7 additions & 7 deletions admin/tool/lp/tests/behat/framework_crud.feature
Expand Up @@ -9,10 +9,10 @@ Feature: Manage competency frameworks
And I am on site homepage
And I expand "Site administration" node
When I expand "Competencies" node
Then I should see "Competency Frameworks"
Then I should see "Competency frameworks"

Scenario: Create a new framework
Given I follow "Competency Frameworks"
Given I follow "Competency frameworks"
And I should see "List of competency frameworks"
And I click on "Add new competency framework" "button"
And I should see "General"
Expand All @@ -34,7 +34,7 @@ Feature: Manage competency frameworks
Given the following lp "frameworks" exist:
| shortname | idnumber |
| Science Year-2 | sc-y-2 |
And I follow "Competency Frameworks"
And I follow "Competency frameworks"
And I should see "Science Year-2"
When I click on "Science Year-2" "link"
Then I should see "Science Year-2"
Expand All @@ -43,7 +43,7 @@ Feature: Manage competency frameworks
Given the following lp "frameworks" exist:
| shortname | idnumber |
| Science Year-3 | sc-y-3 |
And I follow "Competency Frameworks"
And I follow "Competency frameworks"
And I should see "Science Year-3"
And I click on "Edit" of edit menu in the "Science Year-3" row
And the field "Name" matches value "Science Year-3 "
Expand All @@ -57,7 +57,7 @@ Feature: Manage competency frameworks
Given the following lp "frameworks" exist:
| shortname | idnumber |
| Science Year-4 | sc-y-4 |
And I follow "Competency Frameworks"
And I follow "Competency frameworks"
And I should see "Science Year-4"
And I should see "sc-y-4"
And I click on "Delete" of edit menu in the "Science Year-4" row
Expand Down Expand Up @@ -90,7 +90,7 @@ Scenario: Edit a framework with competencies in user competency
| user | competency |
| admin | Comp1 |
| admin | Comp2 |
And I follow "Competency Frameworks"
And I follow "Competency frameworks"
And I should see "Science Year-5"
And I click on "Edit" of edit menu in the "Science Year-5" row
And the field "Name" matches value "Science Year-5 "
Expand Down Expand Up @@ -120,7 +120,7 @@ Scenario: Edit a framework with competencies in user competency plan
| user | competency | plan |
| admin | Comp1 | Plan Science-6 |
| admin | Comp2 | Plan Science-6 |
And I follow "Competency Frameworks"
And I follow "Competency frameworks"
And I should see "Science Year-6"
And I click on "Edit" of edit menu in the "Science Year-6" row
And the field "Name" matches value "Science Year-6 "
Expand Down
6 changes: 3 additions & 3 deletions admin/tool/lp/tests/behat/plan_crud.feature
Expand Up @@ -32,8 +32,8 @@ Feature: Manage plearning plan
And I click on ".template-userplans" "css_element" in the "Science template" "table_row"
And I click on ".form-autocomplete-downarrow" "css_element"
And I click on "Admin" item in the autocomplete list
When I click on "Create plans" "button"
Then I should see "A plan was created"
When I click on "Create learning plans" "button"
Then I should see "A learning plan was created"
And I should see "Admin User" in the "Science template" "table_row"

Scenario: Create a learning plan from template cohort
Expand All @@ -59,7 +59,7 @@ Feature: Manage plearning plan
And I click on ".form-autocomplete-downarrow" "css_element"
And I click on "cohort plan" item in the autocomplete list
When I click on "Add cohorts" "button"
Then I should see "2 plans were created."
Then I should see "2 learning plans were created."
And I follow "Learning plan templates"
And I click on ".template-userplans" "css_element" in the "Science template cohort" "table_row"
And I should see "Student 1"
Expand Down
2 changes: 1 addition & 1 deletion admin/tool/lp/tests/behat/template_crud.feature
Expand Up @@ -30,7 +30,7 @@ Feature: Manage plearning plan templates
And I should see "Science template Year-2"
When I click on "Science template Year-2" "link"
Then I should see "Science template Year-2"
And I should see "Template competencies"
And I should see "Learning plan template competencies"

Scenario: Edit a learning plan template
Given the following lp "templates" exist:
Expand Down
2 changes: 1 addition & 1 deletion competency/tests/api_test.php
Expand Up @@ -3866,7 +3866,7 @@ public function test_grade_competency_in_course_permissions() {
// Give permission to view competencies.
$dg->role_assign($canviewucrole, $teacher1->id, $c1ctx->id);
accesslib_clear_all_caches_for_unit_testing();
$this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'Set competency grade',
$this->assertExceptionWithGradeCompetencyInCourse('required_capability_exception', 'Set competency rating',
$c1->id, $student1->id, $comp1->get_id());

// Give permission to rate.
Expand Down
2 changes: 1 addition & 1 deletion competency/tests/external_test.php
Expand Up @@ -2670,7 +2670,7 @@ public function test_grade_competency_in_plan() {

$evidence = external::grade_competency_in_plan($plan->get_id(), $c1->get_id(), 1, 'Evil note');

$this->assertEquals('The competency grade was manually set in the plan \'Evil\'.', $evidence->description);
$this->assertEquals('The competency rating was manually set in the learning plan \'Evil\'.', $evidence->description);
$this->assertEquals('A', $evidence->gradename);
$this->assertEquals('Evil note', $evidence->note);

Expand Down

0 comments on commit 746da8b

Please sign in to comment.