Merge "Better i18n for group editability date window strings (Bug #1017354)."

htdocs/lang/en.utf8/group.php

@@ -82,9 +82,9 @@ $string['windowstart'] = 'Start date';
 $string['windowstartdesc'] = 'Group cannot be edited by members before this date';
 $string['windowend'] = 'End date';
 $string['windowenddesc'] = 'Group cannot be edited by members after this date';
-$string['editwindowbetween'] = 'Between';
-$string['editwindowfrom'] = 'From';
-$string['editwindowuntil'] = 'Until';
+$string['editwindowbetween'] = 'Between %s and %s';
+$string['editwindowfrom'] = 'From %s';
+$string['editwindowuntil'] = 'Until %s';
 $string['groupadmins'] = 'Group administrators';
 $string['editroles'] = 'Create and edit pages';
 $string['editrolesdescription'] = 'Roles with permission to create and edit group pages.';

htdocs/lib/group.php

@@ -1491,13 +1491,13 @@ function group_format_editwindow($group) {
         $formatted = "";
     }
     else if (!empty($editwindowstart) && empty($editwindowend)) {
-        $formatted = get_string('editwindowfrom', 'group') . ' ' . format_date($editwindowstart, $dateformat);
+        $formatted = get_string('editwindowfrom', 'group', format_date($editwindowstart, $dateformat));
     }
     else if (empty($editwindowstart) && !empty($editwindowend)) {
-        $formatted = get_string('editwindowuntil', 'group') . ' ' . format_date($editwindowend, $dateformat);
+        $formatted = get_string('editwindowuntil', 'group', format_date($editwindowend, $dateformat));
     }
     else {
-        $formatted = get_string('editwindowbetween', 'group') . ' ' . format_date($editwindowstart, $dateformat) . " and " . format_date($editwindowend, $dateformat);
+        $formatted = get_string('editwindowbetween', 'group', format_date($editwindowstart, $dateformat), format_date($editwindowend, $dateformat));
     }
 
     return $formatted;