Commit d06be1a2 authored by Lisa Seeto's avatar Lisa Seeto Committed by Robert Lyon

Bug 1823791: Change plural to singular in "Share with" menu on "Edit access"

added new lang strings for singular terms and updated template.

behatnotneeded

Change-Id: I7321ae811d0c9d76401ef3a1f20589911aab0e93
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
(cherry picked from commit b50029ad)
parent dfd374da
......@@ -136,6 +136,9 @@ $string['registeredusers'] = 'Registered users';
$string['friends'] = 'Friends';
$string['groups'] = 'Groups';
$string['users'] = 'Users';
$string['friend'] = 'Friend';
$string['group'] = 'Group';
$string['user'] = 'User';
$string['everyoneingroup'] = 'Everyone in group';
$string['nospecialrole'] = 'No special role';
$string['peer'] = 'Peer';
......@@ -182,7 +185,6 @@ $string['viewvisitcount'] = array(
);
$string['profilenotshared'] = 'Full access to this user profile is restricted.';
$string['friend'] = 'Friend';
$string['profileicon'] = 'Profile picture';
$string['Updatedon'] = 'Updated on';
$string['Createdon'] = 'Created on';
......
......@@ -52,9 +52,9 @@
<option data-type="" {% if (!o.presets.type) { %}selected{% } %} value="">{%={{jstr tag=sharewith section=view}}%}</option>
<optgroup label="{%={{jstr tag=searchfor section=view}}%}">
<option data-search-option="true" id="friend" value="friend"{% if (o.presets.type == "friend") { %} selected{% } %}>{{str tag=friends section=view}}</option>
<option data-search-option="true" id="group" value="group"{% if (o.presets.type == "group") { %} selected{% } %}>{{str tag=groups}}</option>
<option data-search-option="true" id="user" value="user"{% if (o.presets.type == "user") { %} selected{% } %}>{{str tag=users}}</option>
<option data-search-option="true" id="friend" value="friend"{% if (o.presets.type == "friend") { %} selected{% } %}>{{str tag=friend section=view}}</option>
<option data-search-option="true" id="group" value="group"{% if (o.presets.type == "group") { %} selected{% } %}>{{str tag=group section=view}}</option>
<option data-search-option="true" id="user" value="user"{% if (o.presets.type == "user") { %} selected{% } %}>{{str tag=user section=view}}</option>
</optgroup>
<optgroup label="{%={{jstr tag=general section=view}}%}" id="potentialpresetitemssharewith">
......
......@@ -47,7 +47,7 @@ Scenario: Create users and search for them (Bug 897586)
And I choose "Shared by me" in "Share" from main menu
And I click on "Edit access" in "Page UserB_01" row
And I set the select2 value "Page UserB_03" for "editaccess_views"
And I select "Users" from "accesslist[0][searchtype]"
And I select "User" from "accesslist[0][searchtype]"
And I select "Admin User" from select2 search box in row number "1"
And I press "Save"
# Verifying that the page has been shared
......
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