From dbab30b12709a9080c676c8bbdd2d989394837e8 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 3 Oct 2016 12:59:32 +0800
Subject: [PATCH] MDL-55767 competency: Deprecate langstring and replace

---
 competency/classes/invalid_persistent_exception.php | 3 ++-
 lang/en/competency.php                              | 5 ++++-
 lang/en/deprecated.txt                              | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/competency/classes/invalid_persistent_exception.php b/competency/classes/invalid_persistent_exception.php
index 44975b8818e..53133ad09aa 100644
--- a/competency/classes/invalid_persistent_exception.php
+++ b/competency/classes/invalid_persistent_exception.php
@@ -42,7 +42,8 @@ class invalid_persistent_exception extends \moodle_exception {
             $debuginfo[] = "$key: $message";
             $forhumans[] = $message;
         }
-        parent::__construct('invalidpersistent', 'core_competency', null, implode(', ', $forhumans), implode(' - ', $debuginfo));
+        parent::__construct('invalidpersistenterror', 'core_competency', null,
+                implode(', ', $forhumans), implode(' - ', $debuginfo));
     }
 
 }
diff --git a/lang/en/competency.php b/lang/en/competency.php
index 550538c8393..b7ffe885e9d 100644
--- a/lang/en/competency.php
+++ b/lang/en/competency.php
@@ -103,7 +103,7 @@ $string['evidence_manualoverrideincourse'] = 'The competency rating was manually
 $string['evidence_manualoverrideinplan'] = 'The competency rating was manually set in the learning plan \'{$a}\'.';
 $string['invalidevidencedesc'] = 'Invalid evidence description';
 $string['invalidgrade'] = 'Invalid rating';
-$string['invalidpersistent'] = 'Error: {$a}';
+$string['invalidpersistenterror'] = 'Error: {$a}';
 $string['invalidplan'] = 'Invalid learning plan';
 $string['invalidtaxonomy'] = 'Invalid taxonomy: {$a}';
 $string['invalidurl'] = 'The URL is not valid. Make sure it starts with \'http://\' or \'https://\'.';
@@ -151,3 +151,6 @@ $string['usercompetencystatus_idle'] = 'Idle';
 $string['usercompetencystatus_inreview'] = 'In review';
 $string['usercompetencystatus_waitingforreview'] = 'Waiting for review';
 $string['userplans'] = 'Learning plans';
+
+// Deprecated since Moodle 3.2.
+$string['invalidpersistent'] = 'Invalid persistent';
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 9d20c6445f5..b5986aa41bb 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -32,4 +32,5 @@ downloadexcel,core_table
 downloadods,core_table
 downloadoptions,core_table
 downloadtsv,core_table
-downloadxhtml,core_table
\ No newline at end of file
+downloadxhtml,core_table
+invalidpersistent,core_competency