MDL-16051 fixed confirmed string in user filters; merged from MOODLE_19_STABLE

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index b84154094130152129a2a55ce4ccf8d4eafd125a..3f4eb35e6e83a3cfdc4e30db1702b2109cbda59c 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -251,6 +251,7 @@ $string['configwarning'] = 'Be careful modifying these settings - strange values
 $string['configxmlstrictheaders'] = 'Set to on, each page will be generated using XML http headers and prolog, so browsers will show XHTML errors inline. This is only useful for developers.';
 $string['configzip'] = 'Indicate the location of your zip program (Unix only, optional).  If specified, this will be used to create zip archives on the server.  If you leave this blank, then Moodle will use internal routines.';
 $string['confirmation'] = 'Confirmation';
+$string['confirmed'] = 'Confirmed';
 $string['confirminstall'] = 'You are about to install language pack ($a), are you sure?';
 $string['cookiehttponly'] = 'Only http cookies';
 $string['cookiesecure'] = 'Secure cookies only';

diff --git a/user/filters/lib.php b/user/filters/lib.php
index 6fc8d83e2446b13327a97559666087ad00c779e3..d22d2a9ff0674f8f0e6245138c2b564ec2d3294f 100644 (file)
--- a/user/filters/lib.php
+++ b/user/filters/lib.php
@@ -104,7 +104,7 @@ class user_filtering {
             case 'email':       return new user_filter_text('email', get_string('email'), $advanced, 'email');
             case 'city':        return new user_filter_text('city', get_string('city'), $advanced, 'city');
             case 'country':     return new user_filter_select('country', get_string('country'), $advanced, 'country', get_list_of_countries(), $USER->country);
-            case 'confirmed':   return new user_filter_yesno('confirmed', get_string('confirm'), $advanced, 'confirmed');
+            case 'confirmed':   return new user_filter_yesno('confirmed', get_string('confirmed', 'admin'), $advanced, 'confirmed');
             case 'profile':     return new user_filter_profilefield('profile', get_string('profile'), $advanced);
             case 'courserole':  return new user_filter_courserole('courserole', get_string('courserole', 'filters'), $advanced);
             case 'systemrole':  return new user_filter_globalrole('systemrole', get_string('globalrole', 'role'), $advanced);