MDL-31193 display the correct and translated token valid until date

moodle · May 3, 2013 · 2af34ab · 2af34ab
1 parent 95190fd
commit 2af34ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -7946,7 +7946,7 @@ public function output_html($data, $query='') {
 
                 $validuntil = '';
                 if (!empty($token->validuntil)) {
-                    $validuntil = date("F j, Y"); //TODO: language support (look for moodle function)
+                    $validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
                 }
 
                 $iprestriction = '';

diff --git a/webservice/renderer.php b/webservice/renderer.php
@@ -332,7 +332,7 @@ public function user_webservice_tokens_box($tokens, $userid, $documentation = fa
 
                 $validuntil = '';
                 if (!empty($token->validuntil)) {
-                    $validuntil = date("F j, Y"); //TODO MDL-31193 language support (look for moodle function)
+                    $validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
                 }
 
                 $tokenname = $token->name;