moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-75553-master' of https://github.com/junpataleta/moodle

Browse source
This commit is contained in:
Jun Pataleta 2022-09-07 12:59:42 +08:00
commit adba94a873
33 changed files with 133 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/data/field/checkbox/lang/en/datafield_checkbox.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Checkbox';
$string['fieldtypelabel'] = 'Checkbox field';
$string['privacy:metadata'] = 'The Checkbox field component does not store any personal data itself, it uses tables defined in mod_data.';
$string['pluginname'] = 'Checkboxes';
$string['fieldtypelabel'] = 'Checkboxes';
$string['privacy:metadata'] = 'The Checkboxes field component doesn\'t store any personal data; it uses tables defined in mod_data.';

4
mod/data/field/date/lang/en/datafield_date.php
View file

@ -25,5 +25,5 @@
*/
$string['pluginname'] = 'Date';
$string['fieldtypelabel'] = 'Date field';
$string['privacy:metadata'] = 'The Date field component does not store any personal data, it uses tables defined in mod_data.';
$string['fieldtypelabel'] = 'Date';
$string['privacy:metadata'] = 'The Date field component doesn\'t store any personal data; it uses tables defined in mod_data.';

4
mod/data/field/file/lang/en/datafield_file.php
View file

@ -25,5 +25,5 @@
*/
$string['pluginname'] = 'File';
$string['fieldtypelabel'] = 'File field';
$string['privacy:metadata'] = 'The File field component does not store any personal data, it uses tables defined in mod_data.';
$string['fieldtypelabel'] = 'File';
$string['privacy:metadata'] = 'The File field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/latlong/lang/en/datafield_latlong.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Latlong';
$string['fieldtypelabel'] = 'Latitude/longitude field';
$string['privacy:metadata'] = 'The Latitude/longitude field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Coordinates';
$string['fieldtypelabel'] = 'Coordinates';
$string['privacy:metadata'] = 'The Coordinates field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/menu/lang/en/datafield_menu.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Menu';
$string['fieldtypelabel'] = 'Menu field';
$string['privacy:metadata'] = 'The Menu field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Dropdown list';
$string['fieldtypelabel'] = 'Dropdown list';
$string['privacy:metadata'] = 'The Dropdown list field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/multimenu/lang/en/datafield_multimenu.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Multimenu';
$string['fieldtypelabel'] = 'Multiple-selection menu field';
$string['privacy:metadata'] = 'The Multiple-selection menu field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Multi-select list';
$string['fieldtypelabel'] = 'Multi-select list';
$string['privacy:metadata'] = 'The Multi-select list field component doesn\'t store any personal data, it uses tables defined in mod_data';

4
mod/data/field/number/lang/en/datafield_number.php
View file

@ -25,5 +25,5 @@
*/
$string['pluginname'] = 'Number';
$string['fieldtypelabel'] = 'Number field';
$string['privacy:metadata'] = 'The Number field component does not store any personal data, it uses tables defined in mod_data.';
$string['fieldtypelabel'] = 'Number';
$string['privacy:metadata'] = 'The Number field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/picture/lang/en/datafield_picture.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Picture';
$string['fieldtypelabel'] = 'Picture field';
$string['privacy:metadata'] = 'The Picture field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Image';
$string['fieldtypelabel'] = 'Image';
$string['privacy:metadata'] = 'The Image field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/radiobutton/lang/en/datafield_radiobutton.php
View file

@ -24,7 +24,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Radio button';
$string['fieldtypelabel'] = 'Radio button field';
$string['privacy:metadata'] = 'The Radio button field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Radio buttons';
$string['fieldtypelabel'] = 'Radio buttons';
$string['privacy:metadata'] = 'The Radio buttons field component doesn\'t store any personal data; it uses tables defined in mod_data.';

6
mod/data/field/text/lang/en/datafield_text.php
View file

@ -24,6 +24,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$string['pluginname'] = 'Text input';
$string['fieldtypelabel'] = 'Text field';
$string['privacy:metadata'] = 'The Text field component does not store any personal data, it uses tables defined in mod_data.';
$string['pluginname'] = 'Short text';
$string['fieldtypelabel'] = 'Short text';
$string['privacy:metadata'] = 'The Short text field component doesn\'t store any personal data; it uses tables defined in mod_data.';

4
mod/data/field/textarea/lang/en/datafield_textarea.php
View file

@ -27,5 +27,5 @@
$string['maxbytes'] = 'Maximum embedded file size (bytes)';
$string['maxbytes_desc'] = 'If set to zero will be unlimited by default';
$string['pluginname'] = 'Text area';
$string['fieldtypelabel'] = 'Textarea field';
$string['privacy:metadata'] = 'The Textarea field component does not store any personal data, it uses tables defined in mod_data.';
$string['fieldtypelabel'] = 'Text area';
$string['privacy:metadata'] = 'The Text area field component doesn\'t store any personal data; it uses tables defined in mod_data.';

4
mod/data/field/url/lang/en/datafield_url.php
View file

@ -26,5 +26,5 @@
$string['pluginname'] = 'URL';
$string['openlinkinnewwindow'] = 'Open link in new window';
$string['fieldtypelabel'] = 'URL field';
$string['privacy:metadata'] = 'The URL field component does not store any personal data, it uses tables defined in mod_data.';
$string['fieldtypelabel'] = 'URL';
$string['privacy:metadata'] = 'The URL field component doesn\'t store any personal data; it uses tables defined in mod_data.';

22
mod/data/lang/en/data.php
View file

@ -96,7 +96,7 @@ $string['data:exportuserinfo'] = 'Export user information';
$string['data:managecomments'] = 'Manage comments';
$string['data:manageentries'] = 'Manage entries';
$string['data:managetemplates'] = 'Manage templates';
$string['data:manageuserpresets'] = 'Manage all template presets';
$string['data:manageuserpresets'] = 'Manage presets';
$string['data:rate'] = 'Rate entries';
$string['data:readentry'] = 'Read entries';
$string['data:viewalluserpresets'] = 'View presets from all users';
@ -206,7 +206,7 @@ $string['headerjstemplate'] = 'Defines custom Javascript for manipulating the wa
$string['headerlisttemplate'] = 'Defines browsing interface for multiple entries';
$string['headerrsstemplate'] = 'Defines appearance of entries in RSS feeds';
$string['headersingletemplate'] = 'Defines browsing interface for a single entry';
$string['checkbox'] = 'Checkbox';
$string['checkbox'] = 'Checkboxes';
$string['id'] = 'Entry ID';
$string['chooseexportfields'] = 'Choose the fields you wish to export';
$string['chooseexportformat'] = 'Choose the format you wish to export to';
@ -241,7 +241,7 @@ $string['invalidrecord'] = 'Incorrect record';
$string['invalidurl'] = 'The URL you just entered is not valid';
$string['jstemplate'] = 'Javascript template';
$string['latitude'] = 'Latitude';
$string['latlong'] = 'Latitude/longitude';
$string['latlong'] = 'Coordinates';
$string['latlongboth'] = 'Both latitude and longitude are required.';
$string['latlongdownloadallhint'] = 'Download link for all entries as KML';
$string['latlongkmllabelling'] = 'How to label items in KML files (Google Earth)';
@ -265,18 +265,18 @@ $string['menuchoose'] = 'Choose...';
$string['missingdata'] = 'Data id or object must be provided to field class';
$string['missingfield'] = 'Programmer error: You must specify field and/or data when defining field class.';
$string['modulename'] = 'Database';
$string['modulename_help'] = 'The database activity module enables participants to create, maintain and search a collection of entries (i.e. records). The structure of the entries is defined by the teacher as a number of fields. Field types include checkbox, radio buttons, drop-down menu, text area, URL, picture and uploaded file.
$string['modulename_help'] = 'Database enables participants to create, maintain, and search a collection of entries.
The visual layout of information when listing, viewing or editing database entries may be controlled by database templates. Database activities may be shared between courses as presets and a teacher may also import and export database entries.
The structure of the entries is defined using different types of fields, such as short text, dropdown list, text area, URL, image, or file.
If the database auto-linking filter is enabled, any entries in a database will be automatically linked where the words or phrases appear within the course.
As a teacher, you can comment and rate entries. You can also allow students to rate and comment on entries (peer evaluation). Ratings can be aggregated to form a final grade, which is recorded in the gradebook.
A teacher can allow comments on entries. Entries can also be rated by teachers or students (peer evaluation). Ratings can be aggregated to form a final grade which is recorded in the gradebook.
If the Database auto-linking filter is enabled, any entries in a database will be automatically linked where the words or phrases appear within the course.
Database activities have many uses, such as
You can use Database to:
* A collaborative collection of web links, books, book reviews, journal references etc
* For displaying student-created photos, posters, websites or poems for peer comment and review.';
* Create a collaborative collection of links, books, book reviews, journal references, etc.
* Display student-created photos, posters, websites or poems for peer comment and review.';
$string['modulename_link'] = 'mod/data/view';
$string['modulenameplural'] = 'Databases';
$string['more'] = 'More';
@ -408,7 +408,7 @@ $string['templates'] = 'Templates';
$string['templatesnavigation'] = 'Templates tertiary navigation';
$string['templatesaved'] = 'Template saved';
$string['text'] = 'Text';
$string['textarea'] = 'Textarea';
$string['textarea'] = 'Text area';
$string['timeadded'] = 'Time added';
$string['timemodified'] = 'Time modified';
$string['todatabase'] = 'to this database.';

8
mod/data/tests/behat/add_entries.feature
View file

@ -23,10 +23,10 @@ Feature: Users can add entries to database activities
@javascript
Scenario: Students can add entries to a database
Given I am on the "Course 1" course page logged in as teacher1
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test field name |
| Field description | Test field description |
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test field 2 name |
| Field description | Test field 2 description |
# To generate the default templates.
@ -94,7 +94,7 @@ Feature: Users can add entries to database activities
And I set the following fields to these values:
| Maximum number of entries | 2 |
And I press "Save and display"
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test1 |
And I navigate to "Templates" in current page administration
And I press "Save template"
@ -135,7 +135,7 @@ Feature: Users can add entries to database activities
And I should not see "Add entry"
When I log out
And I am on the "Test database name" "data activity" page logged in as teacher1
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test field name |
| Field description | Test field description |
And I log out

2
mod/data/tests/behat/data_activity_completion.feature
View file

@ -34,7 +34,7 @@ Feature: View activity completion in the database activity
| Require view | 1 |
| Require grade | 1 |
And I press "Save and display"
And I add a "Text input" field to "Music history" database and I fill the form with:
And I add a "Short text" field to "Music history" database and I fill the form with:
| Field name | Instrument types |
And I navigate to "Templates" in current page administration
And I press "Save template"

2
mod/data/tests/behat/data_activity_completion_pass_grade.feature
View file

@ -48,7 +48,7 @@ Feature: Completion pass grade
| completionentriesenabled | 1 |
| completionentries | 2 |
And I press "Save and display"
And I add a "Text input" field to "Music history" database and I fill the form with:
And I add a "Short text" field to "Music history" database and I fill the form with:
| Field name | Instrument types |
And I navigate to "Templates" in current page administration
And I press "Save template"

4
mod/data/tests/behat/manageapproved.feature
View file

@ -27,7 +27,7 @@ Feature: Users can edit approved entries in database activities
| approval | 1 |
| manageapproved | 1 |
And I am on the "Test database name" "data activity" page logged in as teacher1
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test field name |
| Field description | Test field description |
# To generate the default templates.
@ -59,7 +59,7 @@ Feature: Users can edit approved entries in database activities
| approval | 1 |
| manageapproved | 0 |
And I am on the "Test database name" "data activity" page logged in as teacher1
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Test field name |
| Field description | Test field description |
# To generate the default templates.

38
mod/data/tests/behat/required_entries.feature
View file

@ -21,7 +21,7 @@ Feature: Users can be required to specify certain fields when adding entries to
| data | Test database name | n | C1 | data1 |
And I log in as "teacher1"
And I am on "Course 1" course homepage
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Base Text input |
| Required | yes |
| Field description | Base Text input |
@ -42,11 +42,11 @@ Feature: Users can be required to specify certain fields when adding entries to
RTOC Option 2
"""
And I press "Add"
And I add a "Latlong" field to "Test database name" database and I fill the form with:
| Field name | Required Latlong |
| Field description | Required Latlong |
And I add a "Coordinates" field to "Test database name" database and I fill the form with:
| Field name | Required Coordinates |
| Field description | Required Coordinates |
| Required | yes |
And I add a "Menu" field to "Test database name" database and I fill the form with:
And I add a "Dropdown list" field to "Test database name" database and I fill the form with:
| Field name | Required Menu |
| Field description | Required Menu |
| Required | yes |
@ -60,7 +60,7 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field description | Required Radio |
| Required | yes |
| Options | Required Radio Option 1 |
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Required Text input |
| Field description | Required Text input |
| Required | yes |
@ -72,13 +72,13 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field name | Required URL |
| Field description | Required URL |
| Required | yes |
And I add a "Multimenu" field to "Test database name" database and I fill the form with:
And I add a "Multi-select list" field to "Test database name" database and I fill the form with:
| Field name | Required Multimenu |
| Field description | Required Multimenu |
| Required | yes |
| Options | Option 1 |
And I follow "Fields"
And I select "Multimenu" from the "newtype" singleselect
And I select "Multi-select list" from the "newtype" singleselect
And I set the following fields to these values:
| Field name | Required Two-Option Multimenu |
| Field description | Required Two-Option Multimenu |
@ -93,10 +93,10 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field name | Not required Checkbox |
| Field description | Not required Checkbox |
| Options | Not required Checkbox Option 1 |
And I add a "Latlong" field to "Test database name" database and I fill the form with:
| Field name | Not required Latlong |
| Field description | Not required Latlong |
And I add a "Menu" field to "Test database name" database and I fill the form with:
And I add a "Coordinates" field to "Test database name" database and I fill the form with:
| Field name | Not required Coordinates |
| Field description | Not required Coordinates |
And I add a "Dropdown list" field to "Test database name" database and I fill the form with:
| Field name | Not required Menu |
| Field description | Not required Menu |
| Options | Option 1 |
@ -107,7 +107,7 @@ Feature: Users can be required to specify certain fields when adding entries to
| Field name | Not required Radio |
| Field description | Not required Radio |
| Options | Not required Radio Option 1 |
And I add a "Text input" field to "Test database name" database and I fill the form with:
And I add a "Short text" field to "Test database name" database and I fill the form with:
| Field name | Not required Text input |
| Field description | Not required Text input |
And I add a "Text area" field to "Test database name" database and I fill the form with:
@ -116,7 +116,7 @@ Feature: Users can be required to specify certain fields when adding entries to
And I add a "URL" field to "Test database name" database and I fill the form with:
| Field name | Not required URL |
| Field description | Not required URL |
And I add a "Multimenu" field to "Test database name" database and I fill the form with:
And I add a "Multi-select list" field to "Test database name" database and I fill the form with:
| Field name | Not required Multimenu |
| Field description | Not required Multimenu |
| Options | Option 1 |
@ -131,7 +131,7 @@ Feature: Users can be required to specify certain fields when adding entries to
And I press "Save"
Then ".alert" "css_element" should exist in the "Required Checkbox" "table_row"
And ".alert" "css_element" should exist in the "Required Two-Option Checkbox" "table_row"
And ".alert" "css_element" should exist in the "Required Latlong" "table_row"
And ".alert" "css_element" should exist in the "Required Coordinates" "table_row"
And ".alert" "css_element" should exist in the "Required Menu" "table_row"
And ".alert" "css_element" should exist in the "Required Number" "table_row"
And ".alert" "css_element" should exist in the "Required Radio" "table_row"
@ -141,7 +141,7 @@ Feature: Users can be required to specify certain fields when adding entries to
And ".alert" "css_element" should exist in the "Required Multimenu" "table_row"
And ".alert" "css_element" should exist in the "Required Two-Option Multimenu" "table_row"
And ".alert" "css_element" should not exist in the "Not required Checkbox" "table_row"
And ".alert" "css_element" should not exist in the "Not required Latlong" "table_row"
And ".alert" "css_element" should not exist in the "Not required Coordinates" "table_row"
And ".alert" "css_element" should not exist in the "Not required Menu" "table_row"
And ".alert" "css_element" should not exist in the "Not required Number" "table_row"
And ".alert" "css_element" should not exist in the "Not required Radio" "table_row"
@ -220,10 +220,10 @@ Feature: Users can be required to specify certain fields when adding entries to
| Required URL | http://example.com/ |
| Required Multimenu | 1 |
| Required Two-Option Multimenu | 1 |
And I set the field with xpath "//div[@title='Not required Latlong']//tr[td/label[normalize-space(.)='Latitude']]/td/input" to "20"
And I set the field with xpath "//div[@title='Not required Coordinates']//tr[td/label[normalize-space(.)='Latitude']]/td/input" to "20"
And I press "Save"
Then ".alert" "css_element" should exist in the "Required Latlong" "table_row"
And ".alert" "css_element" should exist in the "Not required Latlong" "table_row"
Then ".alert" "css_element" should exist in the "Required Coordinates" "table_row"
And ".alert" "css_element" should exist in the "Not required Coordinates" "table_row"
Scenario: A student filling in number and text fields with zero will not see an error.
Given I log in as "student1"

2
mod/feedback/lang/en/feedback.php
View file

@ -87,7 +87,7 @@ $string['depending_help'] = 'It is possible to show an item depending on the val
$string['dependitem'] = 'Dependence item';
$string['dependvalue'] = 'Dependence value';
$string['description'] = 'Description';
$string['do_not_analyse_empty_submits'] = 'Do not analyse empty submits';
$string['do_not_analyse_empty_submits'] = 'Omit empty submits in analysis';
$string['dropdown'] = 'Multiple choice - single answer allowed (drop-down menu)';
$string['dropdownlist'] = 'Multiple choice - single answer (drop-down menu)';
$string['dropdownrated'] = 'Drop-down menu (rated)';

6
mod/feedback/tests/behat/multichoice.feature
View file

@ -153,7 +153,7 @@ Feature: Testing multichoice questions in feedback
And I click on "Edit questions" "link" in the "[role=main]" "css_element"
And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I choose "Edit question" in the open action menu
And I set the field "Do not analyse empty submits" to "Yes"
And I set the field "Omit empty submits in analysis" to "Yes"
And I press "Save changes to question"
And I am on the "Learning experience" "feedback activity" page
And I navigate to "Analysis" in current page administration
@ -293,7 +293,7 @@ Feature: Testing multichoice questions in feedback
And I click on "Edit questions" "link" in the "[role=main]" "css_element"
And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I choose "Edit question" in the open action menu
And I set the field "Do not analyse empty submits" to "Yes"
And I set the field "Omit empty submits in analysis" to "Yes"
And I press "Save changes to question"
And I am on the "Learning experience" "feedback activity" page
And I navigate to "Analysis" in current page administration
@ -412,7 +412,7 @@ Feature: Testing multichoice questions in feedback
And I click on "Edit questions" "link" in the "[role=main]" "css_element"
And I open the action menu in "//div[contains(@class, 'feedback_itemlist') and contains(.,'multichoice1')]" "xpath_element"
And I choose "Edit question" in the open action menu
And I set the field "Do not analyse empty submits" to "Yes"
And I set the field "Omit empty submits in analysis" to "Yes"
And I press "Save changes to question"
And I am on the "Learning experience" "feedback activity" page
And I navigate to "Analysis" in current page administration