From ae09cccf5a243d086ce86d8b46fae94b147fea1e Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Wed, 21 Nov 2018 13:06:52 +0100 Subject: [PATCH] MDL-64149 core_badges: Remove and deprecate unused strings --- lang/en/badges.php | 6 +++--- lang/en/deprecated.txt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/en/badges.php b/lang/en/badges.php index e347eda7441..435c7c8190d 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -71,8 +71,6 @@ $string['archivehelp'] = '

This option means that the badge will be marked as

If you would like your users to retain access to the earned badges it is important to select this option instead of fully deleting badges.

'; $string['attachment'] = 'Attach badge to message'; $string['attachment_help'] = 'If enabled, an issued badge will be attached to the recipient\'s email for download. (Attachments must be enabled in Site administration / Server / Email / Outgoing mail configuration to use this option.)'; -$string['authorimage'] = 'Image author'; -$string['authorimage_help'] = 'Author of the image, must be an URL.'; $string['award'] = 'Award badge'; $string['awardedtoyou'] = 'Issued to me'; $string['awardoncron'] = 'Access to the badges was successfully enabled. Too many users can instantly earn this badge. To ensure site performance, this action will take some time to process.'; @@ -278,7 +276,6 @@ $string['error:clone'] = 'Cannot clone the badge.'; $string['error:duplicatename'] = 'Badge with such name already exists in the system.'; $string['error:externalbadgedoesntexist'] = 'Badge not found'; $string['error:guestuseraccess'] = 'You are currently using guest access. To see badges you need to log in with your user account.'; -$string['error:invalidbadgeurl'] = 'Invalid issuer URL format. The URL should have a prefix http:// or https://.'; $string['error:invalidcriteriatype'] = 'Invalid criteria type.'; $string['error:invalidexpiredate'] = 'Expiry date has to be in the future.'; $string['error:invalidexpireperiod'] = 'Expiry period cannot be negative or equal 0.'; @@ -537,3 +534,6 @@ $string['error:badjson'] = 'The connection attempt returned invalid data.'; $string['error:noassertion'] = 'No assertion was returned by Persona. You may have closed the dialog before completing the login process.'; $string['error:personaneedsjs'] = 'Currently, Javascript is required to connect to your backpack. If you can, enable Javascript and reload the page.'; $string['signinwithyouremail'] = 'Sign in with your email'; + +// Deprecated since Moodle 3.6. +$string['error:invalidbadgeurl'] = 'Invalid issuer URL format. The URL should have a prefix http:// or https://.'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index c1939efae55..ff428c21ff7 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -138,4 +138,5 @@ messagedselecteduserfailed,core eventmessagecontactblocked,core_message eventmessagecontactunblocked,core_message userisblockingyou,core_message -userisblockingyounoncontact,core_message \ No newline at end of file +userisblockingyounoncontact,core_message +error:invalidbadgeurl,core_badges \ No newline at end of file