Automatic merge from release/4.1 -> release/4.1+1

* commit '86cb40e50c386e0c01110b8fa7e750155d611238':
  INT-19097: Open Forums cannot be viewed with the French Language pack in 4.1

Author: Mr Bot

lang/en/hsuforum.php

@@ -736,6 +736,7 @@
 $string['inprivatereplyto'] = 'in private reply to';
 $string['options'] = 'Options';
 $string['articledateformat'] = '%l:%M%P %b %e, %Y';
+$string['userdateformat'] = '%l:%M%P %b %e, %Y';
 $string['postdeleted'] = 'Post deleted';
 $string['postcreated'] = 'Post created';
 $string['cannnotdeletesinglediscussion'] = 'Sorry, but you are not allowed to delete that discussion!';

renderer.php

@@ -340,7 +340,7 @@ public function discussion($cm, $discussion, $post, $fullthread, array $posts =
         if (!property_exists($discussion, 'unread') or empty($discussion->unread)) {
             $discussion->unread = '-';
         }
-        $format = get_string('articledateformat', 'hsuforum');
+        $format = get_string('userdateformat', 'hsuforum');
 
         $groups = groups_get_all_groups($course->id, 0, $cm->groupingid);
         $group = '';
@@ -491,7 +491,7 @@ public function post($cm, $discussion, $post, $canreply = false, $parent = null,
         $data->fullname       = $postuser->fullname;
         $data->subject        = property_exists($post, 'breadcrumb') ? $post->breadcrumb : $this->raw_post_subject($post);
         $data->message        = $this->post_message($post, $cm, $search);
-        $data->created        = userdate($post->created, get_string('articledateformat', 'hsuforum'));
+        $data->created        = userdate($post->created, get_string('userdateformat', 'hsuforum'));
         $data->rawcreated     = $post->created;
         $data->privatereply   = $post->privatereply;
         $data->imagesrc       = $postuser->user_picture->get_url($this->page)->out();