Merge branch 'MDL-65540-master' of git://github.com/andrewnicols/moodle

moodle · May 10, 2019 · f49c1dc · f49c1dc
2 parents 04a6cd7 + c36c22d
commit f49c1dc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/admin/tool/dataprivacy/templates/my_data_requests.mustache b/admin/tool/dataprivacy/templates/my_data_requests.mustache
@@ -137,7 +137,7 @@
               }} data-status="{{status}}"{{!
               }}>
                 <td>{{typename}}</td>
-                <td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}</td>
+                <td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}</td>
                 <td><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></td>
                 <td>
                     <span class="badge {{statuslabelclass}}" title="{{statuslabeltitle}}">{{statuslabel}}</span>

diff --git a/admin/tool/dataprivacy/templates/request_details.mustache b/admin/tool/dataprivacy/templates/request_details.mustache
@@ -67,7 +67,8 @@
             <a href="mailto:{{foruser.email}}">{{foruser.email}}</a>
             <div class="clearfix mt-1 mb-1">
             <span class="float-left mr-1">
-                <strong>{{#str}}daterequesteddetail, tool_dataprivacy{{/str}}</strong> {{#userdate}} {{timecreated}}, {{#str}} strftimedatetime {{/str}} {{/userdate}}
+                <strong>{{#str}}daterequesteddetail, tool_dataprivacy{{/str}}</strong>
+                {{#userdate}} {{timecreated}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}
             </span>
                 <span class="float-left mr-1">
                 <strong>{{#str}}statusdetail, tool_dataprivacy{{/str}}</strong>

diff --git a/search/templates/index_requests.mustache b/search/templates/index_requests.mustache
@@ -79,13 +79,13 @@
                     <td>
                         {{#searcharea}} {{areaname}} {{/searcharea}}
                     </td>
-                    <td>{{#userdate}} {{timerequested}}, {{#str}} strftimedatetimeshort {{/str}} {{/userdate}}</td>
+                    <td>{{#userdate}} {{timerequested}}, {{#str}} strftimedatetimeshort, core_langconfig {{/str}} {{/userdate}}</td>
                     <td>
                         {{#partialarea}}
                             {{partialareaname}}:
                         {{/partialarea}}
                         {{#partialtime}}
-                            {{#userdate}} {{partialtime}}, {{#str}} strftimedatetimeshort {{/str}} {{/userdate}}
+                            {{#userdate}} {{partialtime}}, {{#str}} strftimedatetimeshort, core_langconfig {{/str}} {{/userdate}}
                         {{/partialtime}}
                     </td>
                     <td>