Commit fa73315e authored by Aaron Wells's avatar Aaron Wells Committed by Jinelle Foley-Barnes
Browse files

Pluralizing some old lang strings (Bug 1513309)

behatnotneeded: Will be handled by existing test

Change-Id: I476a3cc7ff1e791bc24a60986841ad92f57d7bb6
parent 18f472e8
......@@ -86,10 +86,10 @@ if ($addtype == 'add') {
$n->message = '';
if (isset($groupstoaddmail)) {
$n->message .= get_string_from_language($lang, 'addedtogroupsmessage', 'group', display_name($USER, $userrecord), $groupstoaddmail);
$n->message .= get_string_from_language($lang, 'addedtongroupsmessage', 'group', count($groupstoadd), display_name($USER, $userrecord), $groupstoaddmail);
}
if (isset($groupstoremovemail)) {
$n->message .= get_string_from_language($lang, 'removedfromgroupsmessage', 'group', display_name($USER, $userrecord), $groupstoremovemail);
$n->message .= get_string_from_language($lang, 'removedfromngroupsmessage', 'group', count($groupstoremove), display_name($USER, $userrecord), $groupstoremovemail);
}
require_once(get_config('libroot') . 'activity.php');
......
......@@ -91,6 +91,6 @@ function addmembers_submit(Pieform $form, $values) {
'urltext' => hsc($group->name),
));
$SESSION->add_ok_msg(get_string('recommendationssent', 'group', count($values['users'])));
$SESSION->add_ok_msg(get_string('nrecommendationssent', 'group', count($values['users'])));
redirect(get_config('wwwroot') . $groupurl);
}
......@@ -111,7 +111,10 @@ $string['suggesttofriends'] = 'Recommend to friends';
$string['userstosendrecommendationsto'] = 'Users who will be sent a recommendation';
$string['suggestgroupnotificationsubject'] = '%s suggested you join a group';
$string['suggestgroupnotificationmessage'] = '%s suggested that you join the group "%s" on %s';
$string['recommendationssent'] = '%d recommendation(s) sent';
$string['nrecommendationssent'] = array(
0 => '1 recommendation sent',
1 => '%d recommendations sent',
);
$string['suggestinvitefriends'] = 'You cannot enable both friend invitations and recommendations.';
$string['suggestfriendsrequesterror'] = 'You can only enable friend recommendations on open or request groups.';
$string['editwindowendbeforestart'] = 'The end date must be after the start date.';
......@@ -120,8 +123,14 @@ $string['editgroupmembership'] = 'Edit group membership';
$string['editmembershipforuser'] = 'Edit membership for %s';
$string['changedgroupmembership'] = 'Group membership updated sucessfully.';
$string['changedgroupmembershipsubject'] = 'Your group memberships have been changed.';
$string['addedtogroupsmessage'] = "%s has added you to the group(s):\n\n%s\n\n.";
$string['removedfromgroupsmessage'] = "%s has removed you from the group(s):\n\n%s\n\n.";
$string['addedtongroupsmessage'] = array(
0 => "%2\$s has added you to the group:\n\n%3\$s\n\n",
1 => "%2\$s has added you to the groups:\n\n%3\$s\n\n",
);
$string['removedfromngroupsmessage'] = array(
0 => "%2\$s has removed you from the group:\n\n%3\$s\n\n",
1 => "%2\$s has removed you from the groups:\n\n%3\$s\n\n",
);
$string['cantremovememberfromgroup'] = "You cannot remove users from %s.";
$string['current'] = "Current";
$string['requests'] = "Requests";
......
......@@ -222,7 +222,10 @@ $string['blocknotinview'] = 'The block with ID "%d" is not in the page.';
$string['viewcreatedsuccessfully'] = 'Page created successfully';
$string['viewaccesseditedsuccessfully'] = 'Page access saved successfully';
$string['viewsavedsuccessfully'] = 'Page saved successfully';
$string['updatedaccessfornumviews'] = 'Access rules were updated for %d page(s)';
$string['updatedaccessfornumviews1'] = array(
'Access rules were updated for 1 page.',
'Access rules were updated for %d pages.',
);
$string['invalidcolumn'] = 'Column %s out of range';
......
......@@ -530,7 +530,7 @@ function editaccess_submit(Pieform $form, $values) {
}
}
$SESSION->add_ok_msg(get_string('updatedaccessfornumviews', 'view', count($toupdate)));
$SESSION->add_ok_msg(get_string('updatedaccessfornumviews1', 'view', count($toupdate)));
if ($view->get('owner')) {
redirect('/view/share.php');
......
......@@ -30,7 +30,7 @@ Scenario: Adding collection to group (Bug 1448807)
And I follow "Edit access"
And I select "group 01" from "accesslist[0][searchtype]"
And I press "Save"
Then I should see "Access rules were updated for 1 page(s)"
Then I should see "Access rules were updated for 1 page"
And I follow "Groups"
And I follow "group 01"
And I should see "Created"
......
......@@ -39,7 +39,7 @@ Scenario: Creating and accessing social media buttons (Bug 1448948)
And I follow "Share page"
And I select "Public" from "accesslist[0][searchtype]"
And I press "Save"
And I should see "Access rules were updated for 1 page(s)"
And I should see "Access rules were updated for 1 page"
And I follow "Logout"
# Logging in as userB to try see the buttons
Given I log in as "userB" with password "Kupuhipa1"
......
......@@ -39,7 +39,7 @@ Scenario: Create users and search for them (Bug 897586)
And I select "Public" from "accesslist[0][searchtype]"
And I press "Save"
# Verifying that both of the pages have been shared
And I should see "Access rules were updated for 2 page(s)"
And I should see "Access rules were updated for 2 pages."
And I follow "Logout"
# Log in as the second student user
And I log in as "jen" with password "mahara1"
......@@ -67,7 +67,7 @@ Scenario: Create users and search for them (Bug 897586)
And I select "Public" from "accesslist[0][searchtype]"
And I press "Save"
# Verifying that both of the pages have been shared
And I should see "Access rules were updated for 2 page(s)"
And I should see "Access rules were updated for 2 pages."
And I follow "Logout"
# Logging back in as admin to search for users on the shared with me page
And I log in as "admin" with password "Kupuhipa1"
......
Markdown is supported
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