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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-02-26 17:13:12 +01:00
commit d2ac7726eb
15 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
View file

@ -31,7 +31,7 @@ $string['addcategory'] = 'Add category';
$string['addnewdefaults'] = 'Add a new module default';
$string['addpurpose'] = 'Add purpose';
$string['approve'] = 'Approve';
$string['approvedrequestsubmitted'] = 'Your request has been submitted and will be processed soon';
$string['approvedrequestsubmitted'] = 'Your request has been submitted and will be processed soon.';
$string['approverequest'] = 'Approve request';
$string['automaticdatadeletionapproval'] = 'Automatic data deletion request approval';
$string['automaticdatadeletionapproval_desc'] = 'If enabled, data deletion requests are automatically approved.<br/>Note that the automatic approval will only apply to new data deletion requests with this setting enabled. Existing data deletion requests pending approval will still have to be manually approved by the privacy officer.';

2
admin/tool/dataprivacy/tests/behat/datadelete.feature
View file

@ -248,5 +248,5 @@ Feature: Data delete from the privacy API
And I follow "Profile" in the user menu
And I follow "Delete my account"
When I press "Save changes"
Then I should see "Your request has been submitted and will be processed soon"
Then I should see "Your request has been submitted and will be processed soon."
And I should see "Approved" in the "Delete all of my personal data" "table_row"

2
admin/tool/dataprivacy/tests/behat/dataexport.feature
View file

@ -159,5 +159,5 @@ Feature: Data export from the privacy API
And I follow "Profile" in the user menu
And I follow "Export all of my personal data"
When I press "Save changes"
Then I should see "Your request has been submitted and will be processed soon"
Then I should see "Your request has been submitted and will be processed soon."
And I should see "Approved" in the "Export all of my personal data" "table_row"

3
admin/tool/mobile/lang/en/tool_mobile.php
View file

@ -45,11 +45,14 @@ $string['custommenuitems_desc'] = 'Additional items can be added to the app\'s m
Link-opening methods are: app (for linking to an activity supported by the app), inappbrowser (for opening a link in a browser without leaving the app), browser (for opening the link in the device default browser outside the app) and embedded (for displaying the link in an iframe in a new page in the app).
When items are missing a translation for a given language, they will use other languages as fallback unless "_only" is appended to the language code.
For example:
<pre>
App help|https://someurl.xyz/help|inappbrowser
My grades|https://someurl.xyz/local/mygrades/index.php|embedded|en
Mis calificaciones|https://someurl.xyz/local/mygrades/index.php|embedded|es
You will only see this in English|https://someurl.xyz/english|browser|en_only
</pre>';
$string['darkmode'] = 'Dark mode';
$string['disabledfeatures'] = 'Disabled features';