From 80e8e0061e8fd45fb7172b0b41a0fbf075db4153 Mon Sep 17 00:00:00 2001 From: Jake Dallimore Date: Tue, 21 Feb 2017 15:41:02 +0800 Subject: [PATCH] MDL-57429 badges: lang string deprecation for new email verify process Deprecated those lang strings used in the old Persona login process. --- lang/en/badges.php | 19 ++++++++++--------- lang/en/deprecated.txt | 9 ++++++++- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/lang/en/badges.php b/lang/en/badges.php index 110947280a8..fbc4434735c 100644 --- a/lang/en/badges.php +++ b/lang/en/badges.php @@ -90,10 +90,6 @@ $string['backpackconnectionresendemail'] = 'Resend verification email'; $string['backpackdetails'] = 'Backpack settings'; $string['backpackemail'] = 'Email address'; $string['backpackemail_help'] = 'The email address associated with your backpack. While you are connected, any badges earned on this site will be associated with this email address.'; -$string['personaconnection'] = 'Sign in with your email'; -$string['personaconnection_help'] = 'Persona is a system for identifying yourself across the web, using an email address that you own. The Open Badges backpack uses Persona as a login system, so to be able to connect to a backpack you will need a Persona account. - -For more information about Persona visit https://login.persona.org/about.'; $string['backpackemailverificationpending'] = 'Verification pending'; $string['backpackemailverifyemailbody'] = 'Hi, @@ -235,11 +231,9 @@ $string['enablebadges'] = 'Enable badges'; $string['error:backpackdatainvalid'] = 'The data return from the backpack was invalid.'; $string['error:backpackemailnotfound'] = 'The email \'{$a}\' is not associated with a backpack. You need to create a backpack for that account or sign in with another email address.'; $string['error:backpacknotavailable'] = 'Your site is not accessible from the Internet, so any badges issued from this site cannot be verified by external backpack services.'; -$string['error:backpackloginfailed'] = 'You could not be connected to an external backpack for the following reason: {$a}'; $string['error:backpackproblem'] = 'There was a problem connecting to your backpack service provider. Please try again later.'; $string['error:badgeawardnotfound'] = 'Cannot verify this awarded badge. This badge may have been revoked.'; $string['error:badgenotfound'] = 'Badge not found'; -$string['error:badjson'] = 'The connection attempt returned invalid data.'; $string['error:cannotact'] = 'Cannot activate the badge. '; $string['error:cannotawardbadge'] = 'Cannot award badge to a user.'; $string['error:cannotrevokebadge'] = 'Cannot revoke badge from a user.'; @@ -254,7 +248,6 @@ $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.'; $string['error:noactivities'] = 'There are no activities with completion criteria enabled in this course.'; -$string['error:noassertion'] = 'No assertion was returned by Persona. You may have closed the dialog before completing the login process.'; $string['error:nocourses'] = 'Course completion is not enabled for any of the courses in this site, so none can be displayed. Course completion may be enabled in the course settings.'; $string['error:nogroups'] = '

There are no public collections of badges available in your backpack.

Only public collections are shown, visit your backpack to create some public collections.

'; @@ -267,7 +260,6 @@ $string['error:nosuchrole'] = 'Warning: This role is no longer available.'; $string['error:nosuchuser'] = 'User with this email address does not have an account with the current backpack provider.'; $string['error:notifycoursedate'] = 'Warning: Badges associated with course and activity completions will not be issued until the course start date.'; $string['error:parameter'] = 'Warning: At least one parameter should be selected to ensure correct badge issuing workflow.'; -$string['error:personaneedsjs'] = 'Currently, Javascript is required to connect to your backpack. If you can, enable Javascript and reload the page.'; $string['error:requesttimeout'] = 'The connection request timed out before it could complete.'; $string['error:requesterror'] = 'The connection request failed (error code {$a}).'; $string['error:save'] = 'Cannot save the badge.'; @@ -391,7 +383,6 @@ $string['selectgroup_end'] = 'Only public collections are shown, https://login.persona.org/about.'; +$string['error:backpackloginfailed'] = 'You could not be connected to an external backpack for the following reason: {$a}'; +$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'; diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt index 306fdc00a2e..a9c6b619810 100644 --- a/lang/en/deprecated.txt +++ b/lang/en/deprecated.txt @@ -61,4 +61,11 @@ timesent,core_message userssearchresults,core_message loginpasswordautocomplete,core_admin loginpasswordautocomplete_help,core_admin -deletecomment,core \ No newline at end of file +deletecomment,core +personaconnection,core_badges +personaconnection_help,core_badges +error:noassertion,core_badges +error:personaneedsjs,core_badges +error:badjson,core_badges +error:backpackloginfailed,core_badges +signinwithyouremail,core_badges \ No newline at end of file