Commit 98a64040 authored by Melissa Draper's avatar Melissa Draper Committed by Gerrit Code Review
Browse files

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

parents 62264c6c d240a2f0
......@@ -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.';
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment