From e692f585585b6bd2308f43c7fa4455ea3ab3dbb3 Mon Sep 17 00:00:00 2001 From: Mark Nelson Date: Wed, 16 Apr 2014 18:29:18 -0700 Subject: [PATCH] MDL-43557 events: removed underscores from event string keys AMOS START MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy] MOV [event_cohort_created,cohort],[eventcohortcreated,cohort] MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort] MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort] MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort] MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort] MOV [event_group_created,group],[eventgroupcreated,group] MOV [event_group_deleted,group],[eventgroupdeleted,group] MOV [event_group_member_added,group],[eventgroupmemberadded,group] MOV [event_group_member_removed,group],[eventgroupmemberremoved,group] MOV [event_group_updated,group],[eventgroupupdated,group] MOV [event_grouping_created,group],[eventgroupingcreated,group] MOV [event_grouping_deleted,group],[eventgroupingdeleted,group] MOV [event_grouping_updated,group],[eventgroupingupdated,group] MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice] MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice] MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice] MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice] MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice] MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice] MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice] MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice] MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice] MOV [event_user_loggedin,auth],[eventuserloggedin,auth] MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file] MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext] MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book] MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book] MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book] MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book] MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp] MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print] MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print] MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat] MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat] MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice] MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice] MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice] MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum] MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop] AMOS END --- .../legacy/classes/event/legacy_logged.php | 2 +- .../store/legacy/lang/en/logstore_legacy.php | 2 +- lang/en/auth.php | 2 +- lang/en/cohort.php | 10 +++++----- lang/en/group.php | 16 ++++++++-------- lang/en/webservice.php | 18 +++++++++--------- lib/classes/event/cohort_created.php | 2 +- lib/classes/event/cohort_deleted.php | 2 +- lib/classes/event/cohort_member_added.php | 2 +- lib/classes/event/cohort_member_removed.php | 2 +- lib/classes/event/cohort_updated.php | 2 +- lib/classes/event/group_created.php | 2 +- lib/classes/event/group_deleted.php | 2 +- lib/classes/event/group_member_added.php | 2 +- lib/classes/event/group_member_removed.php | 2 +- lib/classes/event/group_updated.php | 2 +- lib/classes/event/grouping_created.php | 2 +- lib/classes/event/grouping_deleted.php | 2 +- lib/classes/event/grouping_updated.php | 2 +- lib/classes/event/user_loggedin.php | 2 +- .../event/webservice_function_called.php | 2 +- lib/classes/event/webservice_login_failed.php | 2 +- .../event/webservice_service_created.php | 2 +- .../event/webservice_service_deleted.php | 2 +- .../event/webservice_service_updated.php | 2 +- .../event/webservice_service_user_added.php | 2 +- .../event/webservice_service_user_removed.php | 2 +- lib/classes/event/webservice_token_created.php | 2 +- lib/classes/event/webservice_token_sent.php | 2 +- .../file/classes/event/assessable_uploaded.php | 2 +- .../file/lang/en/assignsubmission_file.php | 2 +- .../classes/event/assessable_uploaded.php | 2 +- .../lang/en/assignsubmission_onlinetext.php | 4 ++-- mod/book/classes/event/chapter_created.php | 2 +- mod/book/classes/event/chapter_deleted.php | 2 +- mod/book/classes/event/chapter_updated.php | 2 +- mod/book/classes/event/chapter_viewed.php | 2 +- mod/book/lang/en/book.php | 8 ++++---- .../classes/event/book_exported.php | 2 +- .../lang/en/booktool_exportimscp.php | 2 +- .../tool/print/classes/event/book_printed.php | 2 +- .../print/classes/event/chapter_printed.php | 2 +- mod/book/tool/print/lang/en/booktool_print.php | 4 ++-- mod/chat/classes/event/message_sent.php | 2 +- mod/chat/classes/event/sessions_viewed.php | 2 +- mod/chat/lang/en/chat.php | 4 ++-- mod/choice/classes/event/answer_submitted.php | 2 +- mod/choice/classes/event/answer_updated.php | 2 +- mod/choice/classes/event/report_viewed.php | 2 +- mod/choice/lang/en/choice.php | 6 +++--- .../classes/event/assessable_uploaded.php | 2 +- mod/forum/lang/en/forum.php | 2 +- mod/workshop/lang/en/workshop.php | 2 +- 53 files changed, 80 insertions(+), 80 deletions(-) diff --git a/admin/tool/log/store/legacy/classes/event/legacy_logged.php b/admin/tool/log/store/legacy/classes/event/legacy_logged.php index f485cca5e38..f37365f5100 100644 --- a/admin/tool/log/store/legacy/classes/event/legacy_logged.php +++ b/admin/tool/log/store/legacy/classes/event/legacy_logged.php @@ -33,7 +33,7 @@ class legacy_logged extends \core\event\base { } public static function get_name() { - return get_string('event_legacy_logged', 'logstore_legacy'); + return get_string('eventlegacylogged', 'logstore_legacy'); } public function get_description() { diff --git a/admin/tool/log/store/legacy/lang/en/logstore_legacy.php b/admin/tool/log/store/legacy/lang/en/logstore_legacy.php index 9e39406b8fc..1086cc6415f 100644 --- a/admin/tool/log/store/legacy/lang/en/logstore_legacy.php +++ b/admin/tool/log/store/legacy/lang/en/logstore_legacy.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['event_legacy_logged'] = 'Legacy event logged'; +$string['eventlegacylogged'] = 'Legacy event logged'; $string['loglegacy'] = 'Log legacy data'; $string['loglegacy_help'] = 'This plugin records log data to the legacy log table (mdl_log). This functionality has been replaced by newer, richer and more efficient logging plugins, so you should only run this plugin if you have old custom reports that directly query the old log table. Writing to the legacy logs will increase load, so it is recommended that you disable this plugin for performance reasons when it is not needed.'; $string['pluginname'] = 'Legacy log'; diff --git a/lang/en/auth.php b/lang/en/auth.php index 554849ccd8a..8c2fa939b9c 100644 --- a/lang/en/auth.php +++ b/lang/en/auth.php @@ -81,7 +81,7 @@ $string['errorminpasswordlower'] = 'Passwords must have at least {$a} lower case $string['errorminpasswordnonalphanum'] = 'Passwords must have at least {$a} non-alphanumeric character(s).'; $string['errorminpasswordupper'] = 'Passwords must have at least {$a} upper case letter(s).'; $string['errorpasswordupdate'] = 'Error updating password, password not changed'; -$string['event_user_loggedin'] = 'User has logged in'; +$string['eventuserloggedin'] = 'User has logged in'; $string['eventuserloggedinas'] = 'User logged in as another user'; $string['eventuserloginfailed'] = 'User login failed'; $string['forcechangepassword'] = 'Force change password'; diff --git a/lang/en/cohort.php b/lang/en/cohort.php index 44e659929ad..b7d94e65186 100644 --- a/lang/en/cohort.php +++ b/lang/en/cohort.php @@ -45,11 +45,11 @@ $string['delconfirm'] = 'Do you really want to delete cohort \'{$a}\'?'; $string['description'] = 'Description'; $string['duplicateidnumber'] = 'Cohort with the same ID number already exists'; $string['editcohort'] = 'Edit cohort'; -$string['event_cohort_created'] = 'Cohort created'; -$string['event_cohort_deleted'] = 'Cohort deleted'; -$string['event_cohort_member_added'] = 'User added to a cohort'; -$string['event_cohort_member_removed'] = 'User removed from a cohort'; -$string['event_cohort_updated'] = 'Cohort updated'; +$string['eventcohortcreated'] = 'Cohort created'; +$string['eventcohortdeleted'] = 'Cohort deleted'; +$string['eventcohortmemberadded'] = 'User added to a cohort'; +$string['eventcohortmemberremoved'] = 'User removed from a cohort'; +$string['eventcohortupdated'] = 'Cohort updated'; $string['external'] = 'External cohort'; $string['idnumber'] = 'Cohort ID'; $string['memberscount'] = 'Cohort size'; diff --git a/lang/en/group.php b/lang/en/group.php index 715634ef920..7fee0f78d63 100644 --- a/lang/en/group.php +++ b/lang/en/group.php @@ -69,14 +69,14 @@ $string['errorremovenotpermitted'] = 'You do not have permission to remove autom $string['errorselectone'] = 'Please select a single group before choosing this option'; $string['errorselectsome'] = 'Please select one or more groups before choosing this option'; $string['evenallocation'] = 'Note: To keep group allocation even, the actual number of members per group differs from the number you specified.'; -$string['event_group_created'] = 'Group created'; -$string['event_group_deleted'] = 'Group deleted'; -$string['event_group_member_added'] = 'Group member added'; -$string['event_group_member_removed'] = 'Group member removed'; -$string['event_group_updated'] = 'Group updated'; -$string['event_grouping_created'] = 'Grouping created'; -$string['event_grouping_deleted'] = 'Grouping deleted'; -$string['event_grouping_updated'] = 'Grouping updated'; +$string['eventgroupcreated'] = 'Group created'; +$string['eventgroupdeleted'] = 'Group deleted'; +$string['eventgroupmemberadded'] = 'Group member added'; +$string['eventgroupmemberremoved'] = 'Group member removed'; +$string['eventgroupupdated'] = 'Group updated'; +$string['eventgroupingcreated'] = 'Grouping created'; +$string['eventgroupingdeleted'] = 'Grouping deleted'; +$string['eventgroupingupdated'] = 'Grouping updated'; $string['existingmembers'] = 'Existing members: {$a}'; $string['filtergroups'] = 'Filter groups by:'; $string['group'] = 'Group'; diff --git a/lang/en/webservice.php b/lang/en/webservice.php index 00a61ed93c9..7924eb55bab 100644 --- a/lang/en/webservice.php +++ b/lang/en/webservice.php @@ -82,15 +82,15 @@ $string['errorcoursecontextnotvalid'] = 'You cannot execute functions in the cou $string['errorinvalidparam'] = 'The param "{$a}" is invalid.'; $string['errornotemptydefaultparamarray'] = 'The web service description parameter named \'{$a}\' is an single or multiple structure. The default can only be empty array. Check web service description.'; $string['erroroptionalparamarray'] = 'The web service description parameter named \'{$a}\' is an single or multiple structure. It can not be set as VALUE_OPTIONAL. Check web service description.'; -$string['event_webservice_function_called'] = 'Web service function called'; -$string['event_webservice_login_failed'] = 'Web service login failed'; -$string['event_webservice_service_created'] = 'Web service service created'; -$string['event_webservice_service_deleted'] = 'Web service service deleted'; -$string['event_webservice_service_updated'] = 'Web service service updated'; -$string['event_webservice_service_user_added'] = 'Web service service user added'; -$string['event_webservice_service_user_removed'] = 'Web service service user removed'; -$string['event_webservice_token_created'] = 'Web service token created'; -$string['event_webservice_token_sent'] = 'Web service token sent'; +$string['eventwebservice_function_called'] = 'Web service function called'; +$string['eventwebserviceloginfailed'] = 'Web service login failed'; +$string['eventwebserviceservicecreated'] = 'Web service service created'; +$string['eventwebserviceservicedeleted'] = 'Web service service deleted'; +$string['eventwebserviceserviceupdated'] = 'Web service service updated'; +$string['eventwebserviceserviceuseradded'] = 'Web service service user added'; +$string['eventwebserviceserviceuserremoved'] = 'Web service service user removed'; +$string['eventwebservicetokencreated'] = 'Web service token created'; +$string['eventwebservicetokensent'] = 'Web service token sent'; $string['execute'] = 'Execute'; $string['executewarnign'] = 'WARNING: If you press execute your database will be modified and changes can not be reverted automatically!'; $string['externalservice'] = 'External service'; diff --git a/lib/classes/event/cohort_created.php b/lib/classes/event/cohort_created.php index ee748e45425..743fb6bfd66 100644 --- a/lib/classes/event/cohort_created.php +++ b/lib/classes/event/cohort_created.php @@ -52,7 +52,7 @@ class cohort_created extends base { * @return string */ public static function get_name() { - return get_string('event_cohort_created', 'core_cohort'); + return get_string('eventcohortcreated', 'core_cohort'); } /** diff --git a/lib/classes/event/cohort_deleted.php b/lib/classes/event/cohort_deleted.php index 4b9c5207f60..570db4abe9f 100644 --- a/lib/classes/event/cohort_deleted.php +++ b/lib/classes/event/cohort_deleted.php @@ -52,7 +52,7 @@ class cohort_deleted extends base { * @return string */ public static function get_name() { - return get_string('event_cohort_deleted', 'core_cohort'); + return get_string('eventcohortdeleted', 'core_cohort'); } /** diff --git a/lib/classes/event/cohort_member_added.php b/lib/classes/event/cohort_member_added.php index a32c3419599..7252c77e2f9 100644 --- a/lib/classes/event/cohort_member_added.php +++ b/lib/classes/event/cohort_member_added.php @@ -52,7 +52,7 @@ class cohort_member_added extends base { * @return string */ public static function get_name() { - return get_string('event_cohort_member_added', 'core_cohort'); + return get_string('eventcohortmemberadded', 'core_cohort'); } /** diff --git a/lib/classes/event/cohort_member_removed.php b/lib/classes/event/cohort_member_removed.php index 6145fa29400..1fc7046823c 100644 --- a/lib/classes/event/cohort_member_removed.php +++ b/lib/classes/event/cohort_member_removed.php @@ -53,7 +53,7 @@ class cohort_member_removed extends base { * @return string */ public static function get_name() { - return get_string('event_cohort_member_removed', 'core_cohort'); + return get_string('eventcohortmemberremoved', 'core_cohort'); } /** diff --git a/lib/classes/event/cohort_updated.php b/lib/classes/event/cohort_updated.php index e02364351fc..29fa2dda531 100644 --- a/lib/classes/event/cohort_updated.php +++ b/lib/classes/event/cohort_updated.php @@ -52,7 +52,7 @@ class cohort_updated extends base { * @return string */ public static function get_name() { - return get_string('event_cohort_updated', 'core_cohort'); + return get_string('eventcohortupdated', 'core_cohort'); } /** diff --git a/lib/classes/event/group_created.php b/lib/classes/event/group_created.php index a9faa2467cb..d9dab7126c0 100644 --- a/lib/classes/event/group_created.php +++ b/lib/classes/event/group_created.php @@ -68,7 +68,7 @@ class group_created extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_group_created', 'group'); + return get_string('eventgroupcreated', 'group'); } /** diff --git a/lib/classes/event/group_deleted.php b/lib/classes/event/group_deleted.php index f1879fb8ede..41b1d7a06b6 100644 --- a/lib/classes/event/group_deleted.php +++ b/lib/classes/event/group_deleted.php @@ -68,7 +68,7 @@ class group_deleted extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_group_deleted', 'group'); + return get_string('eventgroupdeleted', 'group'); } /** diff --git a/lib/classes/event/group_member_added.php b/lib/classes/event/group_member_added.php index 674fd7e5356..4e6bbfca7ad 100644 --- a/lib/classes/event/group_member_added.php +++ b/lib/classes/event/group_member_added.php @@ -80,7 +80,7 @@ class group_member_added extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_group_member_added', 'group'); + return get_string('eventgroupmemberadded', 'group'); } /** diff --git a/lib/classes/event/group_member_removed.php b/lib/classes/event/group_member_removed.php index 3842a41859a..87336a8efeb 100644 --- a/lib/classes/event/group_member_removed.php +++ b/lib/classes/event/group_member_removed.php @@ -71,7 +71,7 @@ class group_member_removed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_group_member_removed', 'group'); + return get_string('eventgroupmemberremoved', 'group'); } /** diff --git a/lib/classes/event/group_updated.php b/lib/classes/event/group_updated.php index e5d61f9c209..518c139fc8f 100644 --- a/lib/classes/event/group_updated.php +++ b/lib/classes/event/group_updated.php @@ -68,7 +68,7 @@ class group_updated extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_group_updated', 'group'); + return get_string('eventgroupupdated', 'group'); } /** diff --git a/lib/classes/event/grouping_created.php b/lib/classes/event/grouping_created.php index e5a00e3d0e3..91960e43837 100644 --- a/lib/classes/event/grouping_created.php +++ b/lib/classes/event/grouping_created.php @@ -68,7 +68,7 @@ class grouping_created extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_grouping_created', 'group'); + return get_string('eventgroupingcreated', 'group'); } /** diff --git a/lib/classes/event/grouping_deleted.php b/lib/classes/event/grouping_deleted.php index a3d0efc5860..17079743a67 100644 --- a/lib/classes/event/grouping_deleted.php +++ b/lib/classes/event/grouping_deleted.php @@ -75,7 +75,7 @@ class grouping_deleted extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_grouping_deleted', 'group'); + return get_string('eventgroupingdeleted', 'group'); } /** diff --git a/lib/classes/event/grouping_updated.php b/lib/classes/event/grouping_updated.php index 2dfca364212..da21bb3208a 100644 --- a/lib/classes/event/grouping_updated.php +++ b/lib/classes/event/grouping_updated.php @@ -68,7 +68,7 @@ class grouping_updated extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_grouping_updated', 'group'); + return get_string('eventgroupingupdated', 'group'); } /** diff --git a/lib/classes/event/user_loggedin.php b/lib/classes/event/user_loggedin.php index 69668937fe3..772c4f994e0 100644 --- a/lib/classes/event/user_loggedin.php +++ b/lib/classes/event/user_loggedin.php @@ -67,7 +67,7 @@ class user_loggedin extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_user_loggedin', 'auth'); + return get_string('eventuserloggedin', 'auth'); } /** diff --git a/lib/classes/event/webservice_function_called.php b/lib/classes/event/webservice_function_called.php index b40cec2e61f..ad7e3e7c561 100644 --- a/lib/classes/event/webservice_function_called.php +++ b/lib/classes/event/webservice_function_called.php @@ -70,7 +70,7 @@ class webservice_function_called extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_function_called', 'webservice'); + return get_string('eventwebservicefunctioncalled', 'webservice'); } /** diff --git a/lib/classes/event/webservice_login_failed.php b/lib/classes/event/webservice_login_failed.php index 181dbb77190..b7e3025b9ec 100644 --- a/lib/classes/event/webservice_login_failed.php +++ b/lib/classes/event/webservice_login_failed.php @@ -74,7 +74,7 @@ class webservice_login_failed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_login_failed', 'webservice'); + return get_string('eventwebserviceloginfailed', 'webservice'); } /** diff --git a/lib/classes/event/webservice_service_created.php b/lib/classes/event/webservice_service_created.php index 46f5199157c..f906d951233 100644 --- a/lib/classes/event/webservice_service_created.php +++ b/lib/classes/event/webservice_service_created.php @@ -68,7 +68,7 @@ class webservice_service_created extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_service_created', 'webservice'); + return get_string('eventwebserviceservicecreated', 'webservice'); } /** diff --git a/lib/classes/event/webservice_service_deleted.php b/lib/classes/event/webservice_service_deleted.php index 517bea80311..41fdf3c5fc2 100644 --- a/lib/classes/event/webservice_service_deleted.php +++ b/lib/classes/event/webservice_service_deleted.php @@ -62,7 +62,7 @@ class webservice_service_deleted extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_service_deleted', 'webservice'); + return get_string('eventwebserviceservicedeleted', 'webservice'); } /** diff --git a/lib/classes/event/webservice_service_updated.php b/lib/classes/event/webservice_service_updated.php index dacc33bc72b..36355ebb197 100644 --- a/lib/classes/event/webservice_service_updated.php +++ b/lib/classes/event/webservice_service_updated.php @@ -62,7 +62,7 @@ class webservice_service_updated extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_service_updated', 'webservice'); + return get_string('eventwebserviceserviceupdated', 'webservice'); } /** diff --git a/lib/classes/event/webservice_service_user_added.php b/lib/classes/event/webservice_service_user_added.php index d27fdb1f9a8..8e775b78105 100644 --- a/lib/classes/event/webservice_service_user_added.php +++ b/lib/classes/event/webservice_service_user_added.php @@ -61,7 +61,7 @@ class webservice_service_user_added extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_service_user_added', 'webservice'); + return get_string('eventwebserviceserviceuseradded', 'webservice'); } /** diff --git a/lib/classes/event/webservice_service_user_removed.php b/lib/classes/event/webservice_service_user_removed.php index 95b71c59aa0..c421e46af0d 100644 --- a/lib/classes/event/webservice_service_user_removed.php +++ b/lib/classes/event/webservice_service_user_removed.php @@ -61,7 +61,7 @@ class webservice_service_user_removed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_service_user_removed', 'webservice'); + return get_string('eventwebserviceserviceuserremoved', 'webservice'); } /** diff --git a/lib/classes/event/webservice_token_created.php b/lib/classes/event/webservice_token_created.php index 1eda6b0d809..736804112b3 100644 --- a/lib/classes/event/webservice_token_created.php +++ b/lib/classes/event/webservice_token_created.php @@ -68,7 +68,7 @@ class webservice_token_created extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_token_created', 'webservice'); + return get_string('eventwebservicetokencreated', 'webservice'); } /** diff --git a/lib/classes/event/webservice_token_sent.php b/lib/classes/event/webservice_token_sent.php index e5498c5d27d..a43bdc12a85 100644 --- a/lib/classes/event/webservice_token_sent.php +++ b/lib/classes/event/webservice_token_sent.php @@ -59,7 +59,7 @@ class webservice_token_sent extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_webservice_token_sent', 'webservice'); + return get_string('eventwebservicetokensent', 'webservice'); } /** diff --git a/mod/assign/submission/file/classes/event/assessable_uploaded.php b/mod/assign/submission/file/classes/event/assessable_uploaded.php index ba79ba8b79f..1f3bdefb5e4 100644 --- a/mod/assign/submission/file/classes/event/assessable_uploaded.php +++ b/mod/assign/submission/file/classes/event/assessable_uploaded.php @@ -94,7 +94,7 @@ class assessable_uploaded extends \core\event\assessable_uploaded { * @return string */ public static function get_name() { - return get_string('event_assessable_uploaded', 'assignsubmission_file'); + return get_string('eventassessableuploaded', 'assignsubmission_file'); } /** diff --git a/mod/assign/submission/file/lang/en/assignsubmission_file.php b/mod/assign/submission/file/lang/en/assignsubmission_file.php index 65fe7a01e4e..70eb6a9399c 100644 --- a/mod/assign/submission/file/lang/en/assignsubmission_file.php +++ b/mod/assign/submission/file/lang/en/assignsubmission_file.php @@ -29,7 +29,7 @@ $string['default'] = 'Enabled by default'; $string['default_help'] = 'If set, this submission method will be enabled by default for all new assignments.'; $string['enabled'] = 'File submissions'; $string['enabled_help'] = 'If enabled, students are able to upload one or more files as their submission.'; -$string['event_assessable_uploaded'] = 'A file has been uploaded.'; +$string['eventassessableuploaded'] = 'A file has been uploaded.'; $string['file'] = 'File submissions'; $string['maxbytes'] = 'Maximum file size'; $string['maxfilessubmission'] = 'Maximum number of uploaded files'; diff --git a/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php b/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php index 2bf262d4f42..98bf3783ceb 100644 --- a/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php +++ b/mod/assign/submission/onlinetext/classes/event/assessable_uploaded.php @@ -87,7 +87,7 @@ class assessable_uploaded extends \core\event\assessable_uploaded { * @return string */ public static function get_name() { - return get_string('event_assessable_uploaded', 'assignsubmission_onlinetext'); + return get_string('eventassessableuploaded', 'assignsubmission_onlinetext'); } /** diff --git a/mod/assign/submission/onlinetext/lang/en/assignsubmission_onlinetext.php b/mod/assign/submission/onlinetext/lang/en/assignsubmission_onlinetext.php index 68ce4f54085..bb4e383fc91 100644 --- a/mod/assign/submission/onlinetext/lang/en/assignsubmission_onlinetext.php +++ b/mod/assign/submission/onlinetext/lang/en/assignsubmission_onlinetext.php @@ -27,7 +27,7 @@ $string['default'] = 'Enabled by default'; $string['default_help'] = 'If set, this submission method will be enabled by default for all new assignments.'; $string['enabled'] = 'Online text'; $string['enabled_help'] = 'If enabled, students are able to type rich text directly into an editor field for their submission.'; -$string['event_assessable_uploaded'] = 'An online text has been uploaded.'; +$string['eventassessableuploaded'] = 'An online text has been uploaded.'; $string['nosubmission'] = 'Nothing has been submitted for this assignment'; $string['onlinetext'] = 'Online text'; $string['onlinetextfilename'] = 'onlinetext.html'; @@ -39,4 +39,4 @@ $string['wordlimit'] = 'Word limit'; $string['wordlimit_help'] = 'If online text submissions are enabled, this is the maximum number ' . 'of words that each student will be allowed to submit.'; $string['wordlimitexceeded'] = 'The word limit for this assignment is {$a->limit} words and you ' . - 'are attempting to submit {$a->count} words. Please review your submission and try again.'; \ No newline at end of file + 'are attempting to submit {$a->count} words. Please review your submission and try again.'; diff --git a/mod/book/classes/event/chapter_created.php b/mod/book/classes/event/chapter_created.php index 71e6491b5da..9a6d00f9f6d 100644 --- a/mod/book/classes/event/chapter_created.php +++ b/mod/book/classes/event/chapter_created.php @@ -81,7 +81,7 @@ class chapter_created extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_chapter_created', 'mod_book'); + return get_string('eventchaptercreated', 'mod_book'); } /** diff --git a/mod/book/classes/event/chapter_deleted.php b/mod/book/classes/event/chapter_deleted.php index 80ddf7136cf..d2e1f258b5f 100644 --- a/mod/book/classes/event/chapter_deleted.php +++ b/mod/book/classes/event/chapter_deleted.php @@ -81,7 +81,7 @@ class chapter_deleted extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_chapter_deleted', 'mod_book'); + return get_string('eventchapterdeleted', 'mod_book'); } /** diff --git a/mod/book/classes/event/chapter_updated.php b/mod/book/classes/event/chapter_updated.php index 586d5aee2f0..bf295b73a12 100644 --- a/mod/book/classes/event/chapter_updated.php +++ b/mod/book/classes/event/chapter_updated.php @@ -81,7 +81,7 @@ class chapter_updated extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_chapter_updated', 'mod_book'); + return get_string('eventchapterupdated', 'mod_book'); } /** diff --git a/mod/book/classes/event/chapter_viewed.php b/mod/book/classes/event/chapter_viewed.php index 8a8dee07b98..007e5273ce5 100644 --- a/mod/book/classes/event/chapter_viewed.php +++ b/mod/book/classes/event/chapter_viewed.php @@ -81,7 +81,7 @@ class chapter_viewed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_chapter_viewed', 'mod_book'); + return get_string('eventchapterviewed', 'mod_book'); } /** diff --git a/mod/book/lang/en/book.php b/mod/book/lang/en/book.php index 33e96cda6b9..94359f81e08 100644 --- a/mod/book/lang/en/book.php +++ b/mod/book/lang/en/book.php @@ -46,10 +46,10 @@ $string['chapters'] = 'Chapters'; $string['chaptertitle'] = 'Chapter title'; $string['content'] = 'Content'; $string['editingchapter'] = 'Editing chapter'; -$string['event_chapter_created'] = 'Chapter created'; -$string['event_chapter_deleted'] = 'Chapter deleted'; -$string['event_chapter_updated'] = 'Chapter updated'; -$string['event_chapter_viewed'] = 'Chapter viewed'; +$string['eventchaptercreated'] = 'Chapter created'; +$string['eventchapterdeleted'] = 'Chapter deleted'; +$string['eventchapterupdated'] = 'Chapter updated'; +$string['eventchapterviewed'] = 'Chapter viewed'; $string['subchapter'] = 'Subchapter'; $string['nocontent'] = 'No content has been added to this book yet.'; $string['numbering'] = 'Chapter formatting'; diff --git a/mod/book/tool/exportimscp/classes/event/book_exported.php b/mod/book/tool/exportimscp/classes/event/book_exported.php index 310857614b3..a40a21113b8 100644 --- a/mod/book/tool/exportimscp/classes/event/book_exported.php +++ b/mod/book/tool/exportimscp/classes/event/book_exported.php @@ -79,7 +79,7 @@ class book_exported extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_book_exported', 'booktool_exportimscp'); + return get_string('eventbookexported', 'booktool_exportimscp'); } /** diff --git a/mod/book/tool/exportimscp/lang/en/booktool_exportimscp.php b/mod/book/tool/exportimscp/lang/en/booktool_exportimscp.php index 28daab04f43..27e7cc0e9f6 100644 --- a/mod/book/tool/exportimscp/lang/en/booktool_exportimscp.php +++ b/mod/book/tool/exportimscp/lang/en/booktool_exportimscp.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die; -$string['event_book_exported'] = 'Book exported'; +$string['eventbookexported'] = 'Book exported'; $string['exportimscp:export'] = 'Export book as IMS content package'; $string['generateimscp'] = 'Generate IMS CP'; $string['nochapters'] = 'No book chapters found, so unable to export to IMS CP.'; diff --git a/mod/book/tool/print/classes/event/book_printed.php b/mod/book/tool/print/classes/event/book_printed.php index f397d75fccc..0d680618966 100644 --- a/mod/book/tool/print/classes/event/book_printed.php +++ b/mod/book/tool/print/classes/event/book_printed.php @@ -79,7 +79,7 @@ class book_printed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_book_printed', 'booktool_print'); + return get_string('eventbookprinted', 'booktool_print'); } /** diff --git a/mod/book/tool/print/classes/event/chapter_printed.php b/mod/book/tool/print/classes/event/chapter_printed.php index 22cd9889d11..fa8e86f3f9c 100644 --- a/mod/book/tool/print/classes/event/chapter_printed.php +++ b/mod/book/tool/print/classes/event/chapter_printed.php @@ -82,7 +82,7 @@ class chapter_printed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_chapter_printed', 'booktool_print'); + return get_string('eventchapterprinted', 'booktool_print'); } /** diff --git a/mod/book/tool/print/lang/en/booktool_print.php b/mod/book/tool/print/lang/en/booktool_print.php index d5f24fde312..29f6464eea6 100644 --- a/mod/book/tool/print/lang/en/booktool_print.php +++ b/mod/book/tool/print/lang/en/booktool_print.php @@ -24,8 +24,8 @@ defined('MOODLE_INTERNAL') || die; -$string['event_book_printed'] = 'Book printed'; -$string['event_chapter_printed'] = 'Chapter printed'; +$string['eventbookprinted'] = 'Book printed'; +$string['eventchapterprinted'] = 'Chapter printed'; $string['pluginname'] = 'Book printing'; $string['printbook'] = 'Print book'; $string['printchapter'] = 'Print this chapter'; diff --git a/mod/chat/classes/event/message_sent.php b/mod/chat/classes/event/message_sent.php index 091a9998af3..3f4b5db15d2 100644 --- a/mod/chat/classes/event/message_sent.php +++ b/mod/chat/classes/event/message_sent.php @@ -61,7 +61,7 @@ class message_sent extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_message_sent', 'mod_chat'); + return get_string('eventmessagesent', 'mod_chat'); } /** diff --git a/mod/chat/classes/event/sessions_viewed.php b/mod/chat/classes/event/sessions_viewed.php index 18d3a7d4242..620d23e5da7 100644 --- a/mod/chat/classes/event/sessions_viewed.php +++ b/mod/chat/classes/event/sessions_viewed.php @@ -64,7 +64,7 @@ class sessions_viewed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_sessions_viewed', 'mod_chat'); + return get_string('eventsessionsviewed', 'mod_chat'); } /** diff --git a/mod/chat/lang/en/chat.php b/mod/chat/lang/en/chat.php index 74fc252ea1e..4931b59781b 100644 --- a/mod/chat/lang/en/chat.php +++ b/mod/chat/lang/en/chat.php @@ -64,8 +64,8 @@ $string['chatreport'] = 'Chat sessions'; $string['chat:talk'] = 'Talk in a chat'; $string['chattime'] = 'Next chat time'; $string['entermessage'] = "Enter your message"; -$string['event_message_sent'] = 'Message sent'; -$string['event_sessions_viewed'] = 'Sessions viewed'; +$string['eventmessagesent'] = 'Message sent'; +$string['eventsessionsviewed'] = 'Sessions viewed'; $string['idle'] = 'Idle'; $string['inputarea'] = 'Input area'; $string['invalidid'] = 'Could not find that chat room!'; diff --git a/mod/choice/classes/event/answer_submitted.php b/mod/choice/classes/event/answer_submitted.php index 7b71376c7cc..1016c8c2aec 100644 --- a/mod/choice/classes/event/answer_submitted.php +++ b/mod/choice/classes/event/answer_submitted.php @@ -74,7 +74,7 @@ class answer_submitted extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_answer_created', 'mod_choice'); + return get_string('eventanswercreated', 'mod_choice'); } /** diff --git a/mod/choice/classes/event/answer_updated.php b/mod/choice/classes/event/answer_updated.php index d8be3412a4c..dd8bc5fb259 100644 --- a/mod/choice/classes/event/answer_updated.php +++ b/mod/choice/classes/event/answer_updated.php @@ -74,7 +74,7 @@ class answer_updated extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_answer_updated', 'mod_choice'); + return get_string('eventanswerupdated', 'mod_choice'); } /** diff --git a/mod/choice/classes/event/report_viewed.php b/mod/choice/classes/event/report_viewed.php index 68beeeccb77..bf312b3b14d 100644 --- a/mod/choice/classes/event/report_viewed.php +++ b/mod/choice/classes/event/report_viewed.php @@ -50,7 +50,7 @@ class report_viewed extends \core\event\base { * @return string */ public static function get_name() { - return get_string('event_report_viewed', 'choice'); + return get_string('eventreportviewed', 'mod_choice'); } /** diff --git a/mod/choice/lang/en/choice.php b/mod/choice/lang/en/choice.php index 8a717a4c72a..10437c20d67 100644 --- a/mod/choice/lang/en/choice.php +++ b/mod/choice/lang/en/choice.php @@ -30,9 +30,9 @@ $string['completionsubmit'] = 'Show as complete when user makes a choice'; $string['displayhorizontal'] = 'Display horizontally'; $string['displaymode'] = 'Display mode for the options'; $string['displayvertical'] = 'Display vertically'; -$string['event_answer_created'] = 'Choice made'; -$string['event_answer_updated'] = 'Choice updated'; -$string['event_report_viewed'] = 'Choice report viewed'; +$string['eventanswercreated'] = 'Choice made'; +$string['eventanswerupdated'] = 'Choice updated'; +$string['eventreportviewed'] = 'Choice report viewed'; $string['expired'] = 'Sorry, this activity closed on {$a} and is no longer available'; $string['atleastoneoption'] = 'You need to provide at least one possible answer.'; $string['full'] = '(Full)'; diff --git a/mod/forum/classes/event/assessable_uploaded.php b/mod/forum/classes/event/assessable_uploaded.php index 13049e95bd1..bab3c6de338 100644 --- a/mod/forum/classes/event/assessable_uploaded.php +++ b/mod/forum/classes/event/assessable_uploaded.php @@ -89,7 +89,7 @@ class assessable_uploaded extends \core\event\assessable_uploaded { * @return string */ public static function get_name() { - return get_string('event_assessable_uploaded', 'mod_forum'); + return get_string('eventassessableuploaded', 'mod_forum'); } /** diff --git a/mod/forum/lang/en/forum.php b/mod/forum/lang/en/forum.php index fac1454151b..c72c07ebd0a 100644 --- a/mod/forum/lang/en/forum.php +++ b/mod/forum/lang/en/forum.php @@ -181,7 +181,7 @@ $string['erroremptymessage'] = 'Post message cannot be empty'; $string['erroremptysubject'] = 'Post subject cannot be empty.'; $string['errorenrolmentrequired'] = 'You must be enrolled in this course to access this content'; $string['errorwhiledelete'] = 'An error occurred while deleting record.'; -$string['event_assessable_uploaded'] = 'Some content has been posted.'; +$string['eventassessableuploaded'] = 'Some content has been posted.'; $string['everyonecanchoose'] = 'Everyone can choose to be subscribed'; $string['everyonecannowchoose'] = 'Everyone can now choose to be subscribed'; $string['everyoneisnowsubscribed'] = 'Everyone is now subscribed to this forum'; diff --git a/mod/workshop/lang/en/workshop.php b/mod/workshop/lang/en/workshop.php index c3dbf7cf20e..d7df58ff2a3 100644 --- a/mod/workshop/lang/en/workshop.php +++ b/mod/workshop/lang/en/workshop.php @@ -104,6 +104,7 @@ $string['evaluation'] = 'Grading evaluation'; $string['evaluationmethod'] = 'Grading evaluation method'; $string['evaluationmethod_help'] = 'The grading evaluation method determines how the grade for assessment is calculated. You can let it re-calculate grades repeatedly with different settings unless you are happy with the result.'; $string['evaluationsettings'] = 'Grading evaluation settings'; +$string['eventassessableuploaded'] = 'A submission has been uploaded.'; $string['eventassessmentevaluationsreset'] = 'Assessment evaluations reset'; $string['eventassessableuploaded'] = 'Assessable uploaded'; $string['eventassessmentevaluated'] = 'Assessment evaluated'; @@ -115,7 +116,6 @@ $string['eventsubmissionreassessed'] = 'Submission re-assessed'; $string['eventsubmissionupdated'] = 'Submission updated'; $string['eventsubmissionviewed'] = 'Submission viewed'; $string['eventphaseswitched'] = 'Phase switched'; -$string['event_assessable_uploaded'] = 'A submission has been uploaded.'; $string['example'] = 'Example submission'; $string['exampleadd'] = 'Add example submission'; $string['exampleassess'] = 'Assess example submission';