Skip to content

Commit 88e0aa6

Browse files
crazyservercrazyserver
committed
MOBILE-4676: Change lang strings to use LMS strings when available
1 parent b2998cc commit 88e0aa6

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

‎lang/en/local_moodlemobileapp.php‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949

5050
/* AUTO START */
5151
$string['addon.block_myoverview.browseallcourses'] = 'Browse all courses';
52-
$string['addon.block_myoverview.nocoursesenrolled'] = 'You\'re not enrolled in any courses yet.';
5352
$string['addon.block_myoverview.nocoursesenrolleddescription'] = 'Browse all available courses below and start learning.';
5453
$string['addon.block_myoverview.noresult'] = 'Your search didn\'t match any courses.';
5554
$string['addon.block_myoverview.noresultdescription'] = 'Try adjusting your filters or browse all courses below.';
@@ -85,12 +84,7 @@
8584
$string['addon.messages.errorwhileretrievingusers'] = 'Error while retrieving users from the server.';
8685
$string['addon.messages.messagenotsent'] = 'The message was not sent. Please try again later.';
8786
$string['addon.messages.newmessages'] = 'New messages';
88-
$string['addon.messages.nousersfound'] = 'No users found';
8987
$string['addon.messages.showdeletemessages'] = 'Show delete messages';
90-
$string['addon.messages.type_blocked'] = 'Blocked';
91-
$string['addon.messages.type_offline'] = 'Offline';
92-
$string['addon.messages.type_online'] = 'Online';
93-
$string['addon.messages.type_search'] = 'Search results';
9488
$string['addon.messages.type_strangers'] = 'Others';
9589
$string['addon.messages.useentertosenddescdesktop'] = 'If disabled, you can use Ctrl+Enter to send the message.';
9690
$string['addon.messages.useentertosenddescmac'] = 'If disabled, you can use Cmd+Enter to send the message.';
@@ -148,7 +142,6 @@
148142
$string['addon.mod_forum.errorloadingsortingorderdetails'] = 'Try changing the sorting order or going online to view this forum.';
149143
$string['addon.mod_forum.errorposttoallgroups'] = 'Could not create new discussion in all groups.';
150144
$string['addon.mod_forum.forumnodiscussionsyet'] = 'There are no discussions yet in this forum.';
151-
$string['addon.mod_forum.group'] = 'Group';
152145
$string['addon.mod_forum.numdiscussions'] = '{{numdiscussions}} discussions';
153146
$string['addon.mod_forum.numreplies'] = '{{numreplies}} replies';
154147
$string['addon.mod_forum.postingroup'] = 'Posting in group "{{groupname}}".';
@@ -168,7 +161,6 @@
168161
$string['addon.mod_glossary.errorloadingentry'] = 'An error occurred while loading the entry.';
169162
$string['addon.mod_glossary.errorloadingglossary'] = 'An error occurred while loading the glossary.';
170163
$string['addon.mod_glossary.noentriesfound'] = 'No entries were found.';
171-
$string['addon.mod_glossary.searchquery'] = 'Search query';
172164
$string['addon.mod_h5pactivity.downloadh5pfile'] = 'Download H5P file';
173165
$string['addon.mod_h5pactivity.errorgetactivity'] = 'Error getting H5P activity data.';
174166
$string['addon.mod_h5pactivity.filestatenotdownloaded'] = 'The H5P package is not downloaded. You need to download it to be able to use it.';
@@ -228,7 +220,6 @@
228220
$string['addon.mod_scorm.warningsynconlineincomplete'] = 'Some attempts couldn\'t be synchronised with the site because the last online attempt is not yet finished. Please finish the online attempt first.';
229221
$string['addon.mod_survey.cannotsubmitsurvey'] = 'Sorry, there was a problem submitting your survey. Please try again.';
230222
$string['addon.mod_survey.errorgetsurvey'] = 'Error getting survey data.';
231-
$string['addon.mod_survey.results'] = 'Results';
232223
$string['addon.mod_url.accessurl'] = 'Access the URL';
233224
$string['addon.mod_url.pointingtourl'] = 'URL that the resource points to.';
234225
$string['addon.mod_wiki.errorloadingpage'] = 'An error occurred while loading the page.';
@@ -245,7 +236,6 @@
245236
$string['addon.notes.warningnotenotsent'] = 'Couldn\'t add or delete note(s). {{error}}';
246237
$string['addon.notifications.allownotifications'] = 'Allow notifications';
247238
$string['addon.notifications.errorgetnotifications'] = 'Error getting notifications.';
248-
$string['addon.notifications.notifications'] = 'Notifications';
249239
$string['addon.notifications.playsound'] = 'Play sound';
250240
$string['addon.notifications.therearentnotificationsyet'] = 'There are no notifications.';
251241
$string['addon.notifications.typeofnotification'] = 'Type of notification';
@@ -359,7 +349,6 @@
359349
$string['core.courses.cannotretrievemorecategories'] = 'Categories deeper than level {{$a}} cannot be retrieved.';
360350
$string['core.courses.completeenrolmentbrowser'] = 'Complete enrolment in browser';
361351
$string['core.courses.downloadcourses'] = 'Download all courses';
362-
$string['core.courses.enrolme'] = 'Enrol me';
363352
$string['core.courses.errorloadcategories'] = 'An error occurred while loading categories.';
364353
$string['core.courses.errorloadcourses'] = 'An error occurred while loading courses.';
365354
$string['core.courses.errorloadplugins'] = 'The plugins required by this course could not be loaded correctly. Please reload the app to try again.';
@@ -420,7 +409,6 @@
420409
$string['core.exactalarmsturnedoffmessage'] = 'To make sure you don\'t miss any important alerts, turn on \'Alarms and reminders\' in your device\'s settings.';
421410
$string['core.filedeletedsuccessfully'] = 'You have deleted \'{{filename}}\' succesfully';
422411
$string['core.filenameexist'] = 'File name already exists: {{$a}}';
423-
$string['core.fileuploader.audio'] = 'Audio';
424412
$string['core.fileuploader.camera'] = 'Camera';
425413
$string['core.fileuploader.confirmuploadfile'] = 'You are about to upload {{size}}. Are you sure you want to continue?';
426414
$string['core.fileuploader.confirmuploadunknownsize'] = 'It was not possible to calculate the size of the upload. Are you sure you want to continue?';
@@ -831,3 +819,17 @@
831819
$string['addon.mod_quiz.finishnotsynced'] = 'Finished but not synchronised';
832820
$string['core.login.policyacceptmandatory'] = 'I understand and agree to the mandatory site policies';
833821
$string['core.login.sitepolicynotagreederror'] = 'Site policy not agreed.';
822+
823+
// Deprecated since v5.0.0
824+
$string['addon.block_myoverview.nocoursesenrolled'] = 'You\'re not enrolled in any courses yet.';
825+
$string['addon.messages.nousersfound'] = 'No users found';
826+
$string['addon.messages.type_blocked'] = 'Blocked';
827+
$string['addon.messages.type_offline'] = 'Offline';
828+
$string['addon.messages.type_online'] = 'Online';
829+
$string['addon.messages.type_search'] = 'Search results';
830+
$string['addon.mod_forum.group'] = 'Group';
831+
$string['addon.mod_glossary.searchquery'] = 'Search query';
832+
$string['addon.mod_survey.results'] = 'Results';
833+
$string['addon.notifications.notifications'] = 'Notifications';
834+
$string['core.courses.enrolme'] = 'Enrol me';
835+
$string['core.fileuploader.audio'] = 'Audio';

‎langindex.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"addon.block_myoverview.hiddencourses": "block_myoverview",
5050
"addon.block_myoverview.inprogress": "block_myoverview",
5151
"addon.block_myoverview.lastaccessed": "block_myoverview",
52-
"addon.block_myoverview.nocoursesenrolled": "local_moodlemobileapp",
52+
"addon.block_myoverview.nocoursesenrolled": "grades/notenrolled",
5353
"addon.block_myoverview.nocoursesenrolleddescription": "local_moodlemobileapp",
5454
"addon.block_myoverview.noresult": "local_moodlemobileapp",
5555
"addon.block_myoverview.noresultdescription": "local_moodlemobileapp",
@@ -312,7 +312,7 @@
312312
"addon.messages.noindividualconversations": "message",
313313
"addon.messages.nomessagesfound": "message",
314314
"addon.messages.noncontacts": "message",
315-
"addon.messages.nousersfound": "local_moodlemobileapp",
315+
"addon.messages.nousersfound": "moodle",
316316
"addon.messages.numparticipants": "message",
317317
"addon.messages.pendingcontactrequests": "message",
318318
"addon.messages.removecontact": "message",
@@ -326,10 +326,10 @@
326326
"addon.messages.selfconversationdefaultmessage": "message",
327327
"addon.messages.sendcontactrequest": "message",
328328
"addon.messages.showdeletemessages": "local_moodlemobileapp",
329-
"addon.messages.type_blocked": "local_moodlemobileapp",
330-
"addon.messages.type_offline": "local_moodlemobileapp",
331-
"addon.messages.type_online": "local_moodlemobileapp",
332-
"addon.messages.type_search": "local_moodlemobileapp",
329+
"addon.messages.type_blocked": "message/blockedusers",
330+
"addon.messages.type_offline": "message/offline",
331+
"addon.messages.type_online": "message/online",
332+
"addon.messages.type_search": "moodle/searchresults",
333333
"addon.messages.type_strangers": "local_moodlemobileapp",
334334
"addon.messages.unabletomessage": "message",
335335
"addon.messages.unblockuser": "message",
@@ -677,7 +677,7 @@
677677
"addon.mod_forum.favourites": "forum",
678678
"addon.mod_forum.favouriteupdated": "forum",
679679
"addon.mod_forum.forumnodiscussionsyet": "local_moodlemobileapp",
680-
"addon.mod_forum.group": "local_moodlemobileapp",
680+
"addon.mod_forum.group": "moodle",
681681
"addon.mod_forum.lastpost": "forum",
682682
"addon.mod_forum.lockdiscussion": "forum",
683683
"addon.mod_forum.lockupdated": "forum",
@@ -744,7 +744,7 @@
744744
"addon.mod_glossary.linking": "glossary",
745745
"addon.mod_glossary.modulenameplural": "glossary",
746746
"addon.mod_glossary.noentriesfound": "local_moodlemobileapp",
747-
"addon.mod_glossary.searchquery": "local_moodlemobileapp",
747+
"addon.mod_glossary.searchquery": "search/enteryoursearchquery",
748748
"addon.mod_glossary.tagarea_glossary_entries": "glossary",
749749
"addon.mod_h5pactivity.all_attempts": "h5pactivity",
750750
"addon.mod_h5pactivity.answer_checked": "h5pactivity",
@@ -1022,7 +1022,7 @@
10221022
"addon.mod_survey.ipreferthat": "survey",
10231023
"addon.mod_survey.modulenameplural": "survey",
10241024
"addon.mod_survey.responses": "survey",
1025-
"addon.mod_survey.results": "local_moodlemobileapp",
1025+
"addon.mod_survey.results": "choice",
10261026
"addon.mod_survey.surveycompletednograph": "survey",
10271027
"addon.mod_url.accessurl": "local_moodlemobileapp",
10281028
"addon.mod_url.modulenameplural": "url",
@@ -1141,7 +1141,7 @@
11411141
"addon.notifications.errorgetnotifications": "local_moodlemobileapp",
11421142
"addon.notifications.markallread": "moodle",
11431143
"addon.notifications.notificationpreferences": "message",
1144-
"addon.notifications.notifications": "local_moodlemobileapp",
1144+
"addon.notifications.notifications": "moodle",
11451145
"addon.notifications.playsound": "local_moodlemobileapp",
11461146
"addon.notifications.therearentnotificationsyet": "local_moodlemobileapp",
11471147
"addon.notifications.typeofnotification": "local_moodlemobileapp",
@@ -1668,7 +1668,7 @@
16681668
"core.courses.completeenrolmentbrowser": "local_moodlemobileapp",
16691669
"core.courses.courses": "moodle",
16701670
"core.courses.downloadcourses": "local_moodlemobileapp",
1671-
"core.courses.enrolme": "local_moodlemobileapp",
1671+
"core.courses.enrolme": "enrol",
16721672
"core.courses.errorloadcategories": "local_moodlemobileapp",
16731673
"core.courses.errorloadcourses": "local_moodlemobileapp",
16741674
"core.courses.errorloadplugins": "local_moodlemobileapp",
@@ -1821,7 +1821,7 @@
18211821
"core.filenotfound": "resource",
18221822
"core.fileuploader.addfiletext": "repository",
18231823
"core.fileuploader.attachedfiles": "repository",
1824-
"core.fileuploader.audio": "local_moodlemobileapp",
1824+
"core.fileuploader.audio": "tiny_media",
18251825
"core.fileuploader.audiotitle": "tiny_recordrtc",
18261826
"core.fileuploader.camera": "local_moodlemobileapp",
18271827
"core.fileuploader.confirmuploadfile": "local_moodlemobileapp",

0 commit comments

Comments
 (0)