Commit 1881391a authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Robert Lyon

Bug 1677087: Various lang string updates

Some string IDs changed so that they are
picked up by the translators while others
aren't changed when they are just changes
for English.

behatnotneeded

Change-Id: I9afb8980492937f361e6e35361245c689b5a4413
parent ff4a9a9d
......@@ -303,13 +303,13 @@ function delete_validate(Pieform $form, $values) {
$users = $values['users'];
// Not allowed to bulk delete yourself
if (is_array($users) && in_array($USER->get('id'), $users)) {
$form->set_error(null, get_string('unabletodeleteself', 'admin'));
$form->set_error(null, get_string('unabletodeleteself1', 'admin'));
}
// Not allowed to remove all site admins
$siteadmins = count_records_sql("SELECT COUNT(admin) FROM {usr}
WHERE id NOT IN (" . join(',', array_map('db_quote', $users)) . ") AND admin = 1", array());
if (!$siteadmins) {
$form->set_error(null, get_string('unabletodeletealladmins', 'admin'));
$form->set_error(null, get_string('unabletodeletealladmins1', 'admin'));
}
}
......
......@@ -543,7 +543,7 @@ function edituser_site_submit(Pieform $form, $values) {
try {
if ($authobj->user_exists($values['username'])) {
// set an error message if it is already in use
$SESSION->add_error_msg(get_string('usernameexists', 'account'));
$SESSION->add_error_msg(get_string('usernameexists1', 'account'));
}
} catch (AuthUnknownUserException $e) {
// update the username otherwise
......
<!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>SAML metadata for the Identity Provider (IdP) to connect to</h3>
<p>This element requires the XML formatted metadata for the IdP that you want to connect to.</p>
<p>If you are adding a new IdP please select "Add new Identity Provider" from "Available Identity Providers" and add in the relevant metadata to "Institution Identity Provider SAML metadata" field.</p>
<p>Otherwise select an existing IdP from "Available Identity Providers". If you make any changes to the metadata, it will be updated for the other institutions using that metadata. Therefore, be careful what you change.</p>
<p>This element requires the XML formatted metadata for the IdP that you want
to connect to.</p>
<p>If you add a new IdP, please select "Add new Identity Provider" from
"Available Identity Providers" and add in the relevant metadata to the
"Institution Identity Provider SAML metadata" field.</p>
<p>Otherwise, select an existing IdP from "Available Identity Providers". If
you make any changes to the metadata, it will be updated for the other
institutions using that metadata as well. Therefore, be careful what you
change.</p>
......@@ -94,6 +94,7 @@ $string['webservice_master_switches'] = 'Enable web service functionality';
$string['connectionsswitch'] = 'Switch managed client connections on or off';
$string['manage_protocols1'] = 'Enable or disable protocols supported as a web services provider:';
$string['protocol'] = 'Protocol';
$string['oauth'] = 'OAuth';
$string['rest'] = 'REST';
$string['soap'] = 'SOAP';
$string['xmlrpc'] = 'XML-RPC';
......@@ -331,7 +332,7 @@ $string['servicenamelabel'] = 'Name';
$string['servicenamedesc'] = 'A human-readable name for this service group.';
$string['serviceshortnamelabel'] = 'Short name';
$string['serviceshortnamedesc'] = 'A machine-readable name for this service group. This is the name that will be used if an external service needs to refer to this service group.';
$string['servicecomponentnote'] = 'This service provides functionality for the component: %s';
$string['servicecomponentnote'] = 'This service provides functionality for the component "%s"';
$string['simpleauthlog'] = 'Simple authentication login';
$string['step'] = 'Step';
$string['testclient'] = 'Web service test client';
......@@ -355,7 +356,7 @@ $string['accessdenied'] = 'access denied';
$string['accessdeniedforinst'] = ' access denied for institution "%s"';
$string['accessdeniedforinstuser'] = ' access denied for institution "%s" with user "%s"';
$string['accessdeniedforinstgroup'] = ' access denied for institution "%s" on group "%s"';
$string['usernameexists'] = 'Username already exists "%s"';
$string['usernameexists1'] = 'Username "%s" already exists.';
$string['invalidauthtype'] = 'Invalid authentication type "%s"';
$string['invalidauthtypeuser'] = 'Invalid authentication type "%s" with user "%s"';
$string['invalidsocialprofile'] = 'Invalid social profile "%s"';
......
......@@ -4,7 +4,7 @@
* @package mahara
* @subpackage blocktype-watchlist
* @author Catalyst IT Ltd
* @author Gregor An¸elj <gregor.anzelj@gmail.com>
* @author Gregor Anželj <gregor.anzelj@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
*
......
......@@ -135,7 +135,7 @@ try {
}
else {
// mysql
throw new ConfigSanityException(get_string('mysqlmodulenolongersupported', 'error'));
throw new ConfigSanityException(get_string('mysqlmodulenolongersupported1', 'error'));
}
}
......
......@@ -84,9 +84,9 @@ $string['newviewaccessmessagenoownerviews'] = 'You have been added to the access
$string['newcollectionaccesssubject'] = 'New access to collection "%s"';
$string['newviewaccesssubject1'] = 'New access to page "%s"';
$string['newviewaccesssubjectviews'] = 'New access to pages "%s"';
$string['messageaccessfromto'] = 'Access to this page is restricted until %s and will end on %s.';
$string['messageaccessfrom'] = 'Access to this page is restricted until %s.';
$string['messageaccessto'] = 'Access to this page will end on %s.';
$string['messageaccessfromto1'] = 'You can view this page between %s and %s.';
$string['messageaccessfrom1'] = 'You can view this page after %s.';
$string['messageaccessto1'] = 'You can view this page until %s.';
$string['viewmodified'] = 'has changed their page';
$string['ongroup'] = 'on group';
......
......@@ -1149,8 +1149,8 @@ $string['selectedusers'] = 'Selected users';
$string['remoteuser'] = 'Remote username';
$string['userreports'] = 'User reports';
$string['userreportsdescription'] = 'View or download information about the users you selected on the search page.';
$string['unabletodeleteself'] = 'Unable to bulk delete yourself';
$string['unabletodeletealladmins'] = 'Not allowed to bulk delete all the site admins';
$string['unabletodeleteself1'] = 'You are not allowed to delete yourself.';
$string['unabletodeletealladmins1'] = 'You are not allowed to delete all site administrators.';
// general stuff
$string['notificationssaved'] = 'Notification settings saved';
......@@ -1270,41 +1270,40 @@ $string['cli_close_site_siteclosed'] = 'Site closed for maintenance.';
$string['cli_close_site_siteopen'] = 'Site open.';
// Languange update script
$string['cli_backupdir_notwritable'] = 'Language backup directory "%s" is not writable.';
$string['cli_langpack'] = 'List by language code eg "de,pt_BR,fr"';
$string['cli_langpack_backup'] = 'Backup the language directory before updating (optional).';
$string['cli_backupdir_notwritable'] = 'The language backup directory "%s" is not writable.';
$string['cli_langpack'] = 'List by language code, e.g. "de,pt_BR,fr".';
$string['cli_langpack_backup'] = 'Optional: Back up the language directory before updating.';
$string['cli_langpack_backup_done'] = 'Backup of language "%s" done';
$string['cli_langpack_backup_failed'] = '*** WARNING *** Unable to make backup of "%s"';
$string['cli_langpack_en'] = 'No need to update english langpack as the strings are defined in Mahara itself. You can set special lang strings in local/lang/';
$string['cli_langpack_en'] = 'You do not need to update the English langpack as the strings are defined in Mahara itself. You can set special lang strings in local/lang/.';
$string['cli_langpack_extract_done'] = 'Copied new "%s" langpack into place';
$string['cli_langpack_extract_failed'] = '*** WARNING *** Unable to extract files from "%s"
- reason: %s';
$string['cli_langpack_extract_failed'] = '*** WARNING *** Unable to extract files from "%s". Reason: %s';
$string['cli_langpack_info'] = 'To update your language packs via the command line.
You can:
1) Install / update langpacks by listing the languages by their code, eg de = German, fr = French like so
1) Install or update langpacks by listing the languages by their code, e.g. de = German, fr = French:
sudo -u www-data php admin/cli/sync_langpacks.php -l=de,fr
This will make a backup of the existing language (if exists) into the dataroot langpacks_backup directory.
This will make a backup of the existing language (if it already exists) into the dataroot langpacks_backup directory.
2) If you don\'t want to make backups then add the -b=false flag, eg
2) If you don\'t want to make backups, then add the -b=false flag:
sudo -u www-data php admin/cli/sync_langpacks.php -l=de,fr -b=false
3) If you need to rollback the backups you can use the -r=true flag, eg
3) If you need to rollback the backups, you can use the -r=true flag:
sudo -u www-data php admin/cli/sync_langpacks.php -l=de,fr -r=true
It will ignore trying to update the \'en\' language as that is set within the Mahara system itself';
It will ignore trying to update the \'en\' language as that is set within Mahara itself.';
$string['cli_langpack_missing'] = 'No langpacks specified';
$string['cli_langpack_revert'] = 'Revert to last backed up version of language.';
$string['cli_langdir_notwritable'] = 'Language directory "%s" is not writable.';
$string['cli_langpack_revert'] = 'Revert to last backed up version of the language.';
$string['cli_langdir_notwritable'] = 'The language directory "%s" is not writable.';
$string['cli_language_make_backup'] = 'Make a backup? %s';
$string['cli_language_status'] = 'Language "%s" already installed: %s';
$string['cli_language_status'] = 'The language "%s" is already installed: %s';
$string['cli_langpack_url'] = 'Language pack URL "%s"';
$string['cli_langpack_url_failed'] = '*** WARNING *** Language pack for "%s" does not exist/can not be downloaded. Return code: %s';
$string['cli_langpack_url_failed'] = '*** WARNING *** Language pack for "%s" does not exist or cannot be downloaded. Return code: %s';
$string['cli_langpack_upload'] = 'Saving language pack "%s" to temp directory';
$string['cli_restore_done'] = 'Restored backup of "%s" done';
$string['cli_restore_warning'] = '*** WARNING *** Unable to restore backup of "%s"';
$string['cli_tmpdir_notwritable'] = 'Temporary upload directory "%s" is not writable.';
$string['cli_tmpdir_notwritable'] = 'The temporary upload directory "%s" is not writable.';
$string['cli_lang_branch'] = 'Mahara series version to fetch langpacks for series "%s"';
$string['withselectedcontentexport'] = 'Re-queue items into export queue';
$string['withselectedcontentdelete'] = 'Delete selected items from export queue';
$string['withselectedcontentexport'] = 'Re-queue items into the export queue';
$string['withselectedcontentdelete'] = 'Delete selected items from the export queue';
......@@ -16,7 +16,7 @@ $string['phpversion'] = 'Mahara will not run on PHP < %s. Please upgrade your PH
$string['jsonextensionnotloaded'] = 'Your server configuration does not include the JSON extension. Mahara requires this in order to send some data to and from the browser. Please make sure that it is loaded in php.ini or install it if it is not installed.';
$string['pgsqldbextensionnotloaded'] = 'Your server configuration does not include the pgsql extension. Mahara requires this in order to store data in a relational database. Please make sure that it is loaded in php.ini or install it if it is not installed.';
$string['mysqldbextensionnotloaded'] = 'Your server configuration does not include the mysqli or mysql extension. Mahara requires this in order to store data in a relational database. Please make sure that it is loaded in php.ini or install it if it is not installed.';
$string['mysqlmodulenolongersupported'] = 'Your server configuration does not include the mysqli extension. Please make sure that it is loaded in php.ini or install it if it is not installed. Mahara will not be supporting mysql extension from version 16.10';
$string['mysqlmodulenolongersupported1'] = 'Your server configuration does not include the mysqli extension. Please make sure that it is loaded in php.ini or install it if it is not installed. Mahara stopped supporting the mysql extension in version 16.10';
$string['unknowndbtype'] = 'Your server configuration references an unknown database type. Valid values are "postgres" and "mysql". Please change the database type setting in config.php.';
$string['domextensionnotloaded'] = 'Your server configuration does not include the dom extension. Mahara requires this in order to parse XML data from a variety of sources.';
$string['xmlextensionnotloaded'] = 'Your server configuration does not include the %s extension. Mahara requires this in order to parse XML data from a variety of sources. Please make sure that it is loaded in php.ini or install it if it is not installed.';
......
......@@ -2,7 +2,8 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Pages and collections</h3>
<h4>Pages</h4>
<p>A page contains a selection of artefacts which you arrange and present to others. These may include:</p>
<p>A page contains a selection of artefacts which you arrange and present to
others. These may include:</p>
<ul>
<li>selected files</li>
<li>résumé details</li>
......@@ -14,5 +15,7 @@
</uL>
<p>You can re-use the artefacts that you collected under "Content" in as many pages as you wish.</p>
<h4>Collections</h4>
<p>A collection is a set of pages that are linked to one another and have the same access permissions. You can create as many collections as you like, but a page cannot appear in more than one collection.</p>
<p>You can create a collection from scratch or copy an existing one - either one of your own or one from another user that is copyable to you.</p>
<p>A collection is a set of pages that are linked to one another and have the
same access permissions. You can create as many collections as you like, but a page cannot appear in more than one collection.</p>
<p>You can create a collection from scratch or copy an existing one - either
one of your own or one from another user that is copyable to you.</p>
......@@ -26,6 +26,7 @@ $string['moveitemup'] = 'Move up';
$string['moveitemdown'] = 'Move down';
$string['edit'] = 'Edit';
$string['editspecific'] = 'Edit "%s"';
$string['managespecific'] = 'Manage "%s"';
$string['connectspecific'] = 'Connect "%s"';
$string['editing'] = 'Editing';
$string['settingsspecific'] = 'Settings for "%s"';
......@@ -83,11 +84,16 @@ $string['tab'] = 'tab';
$string['selected'] = 'selected';
$string['admin'] = 'Admin';
$string['menu'] = 'Menu';
$string['adminmenu'] = 'Administration Menu';
$string['usermenu'] = 'User Menu';
$string['adminmenu'] = 'Administration menu';
$string['usermenu'] = 'User menu';
// nav tool tips
$string['profilepage'] = "Profile page";
$string['mainmenu'] = "Main menu";
$string['showmainmenu'] = "Show main menu";
$string['showadminmenu'] = "Show administration menu";
$string['showusermenu'] = "Show user menu";
$string['showsearch'] = "Show search";
$string['showmenu'] = "Show menu for %s";
$string['at'] = 'at';
$string['From'] = 'From';
......@@ -253,8 +259,8 @@ $string['accesstotallydenied_institutionsuspended'] = 'Your institution %s has b
Please contact your institution for help.';
$string['accesstotallydenied_institutionexpired'] = 'Your institution %s has expired. Until it is unexpired, you will not be able to log in to %s.
Please contact your institution for help.';
$string['accesstotallydenied_institutioninactive'] = 'Your institution %s authenticcation method is inactive. Until it is made active, you will not be able to log in to %s.
Please contact your institution for help.';
$string['accesstotallydenied_institutioninactive'] = 'The authentication method for institution "%s" is inactive. Until it is made active, you will not be able to log in to %s.
Please contact your institution administrator for help.';
$string['accessforbiddentoadminsection'] = 'You are forbidden from accessing the administration section.';
$string['accountdeleted'] = 'Sorry, your account has been deleted. You can <a href="%scontact.php">contact the site administrator</a>.';
$string['accountexpired'] = 'Sorry, your account has expired. You can <a href="%scontact.php">contact the site administrator</a> to have it reactivated.';
......
......@@ -250,8 +250,8 @@ $string['editblockspagedescription'] = '<p>Drag and drop content blocks from the
$string['displayview'] = 'Display page';
$string['editthisview'] = 'Edit this page';
$string['expandcontract'] = 'Expand / Contract list of block types';
$string['returntoinstitutionpages'] = 'Return to institution pages';
$string['returntositepages'] = 'Return to site pages';
$string['returntoinstitutionportfolios'] = 'Return to institution pages and collections';
$string['returntositeportfolios'] = 'Return to site pages and collections';
$string['success.addblocktype'] = 'Added block successfully';
$string['err.addblocktype'] = 'Could not add the block to your page';
......
......@@ -1408,13 +1408,13 @@ class ActivityTypeViewAccess extends ActivityType {
$accessdates = activity_get_viewaccess_user_dates($this->view, $user->id);
$accessdatemessage = '';
if (!empty($accessdates['mindate']) && !empty($accessdates['maxdate'])) {
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessfromto', 'activity', $accessdates['mindate'], $accessdates['maxdate']);
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessfromto1', 'activity', $accessdates['mindate'], $accessdates['maxdate']);
}
else if (!empty($accessdates['mindate'])) {
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessfrom', 'activity', $accessdates['mindate']);
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessfrom1', 'activity', $accessdates['mindate']);
}
else if (!empty($accessdates['maxdate'])) {
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessto', 'activity', $accessdates['maxdate']);
$accessdatemessage .= get_string_from_language($user->lang, 'messageaccessto1', 'activity', $accessdates['maxdate']);
}
else {
$accessdatemessage = false;
......
......@@ -12,17 +12,17 @@
defined('INTERNAL') || die();
$string['autoconfiguredesc'] = 'Automatically enable settings and configurations needed for LTI.';
$string['autoconfiguretitle'] = 'Auto-configure LTI?';
$string['autocreateusers'] = 'Auto-create users?';
$string['autocreationnotenabled'] = 'Auto-creation of user accounts not enabled';
$string['autoconfiguretitle'] = 'Auto-configure LTI';
$string['autocreateusers'] = 'Auto-create users';
$string['autocreationnotenabled'] = 'Auto-creation of user accounts is not enabled';
$string['configstep'] = 'Conguration item';
$string['configstepstatus'] = 'Status';
$string['ltiserviceexists'] = 'LTI service group is registered';
$string['noticeenabled'] = 'The LTI API is currently enabled.';
$string['noticenotenabled'] = 'The LTI API is <b>not</b> currently enabled.';
$string['ltiserviceexists'] = 'The LTI service group is registered.';
$string['noticeenabled'] = 'The LTI API is enabled.';
$string['noticenotenabled'] = 'The LTI API is <b>not</b> enabled.';
$string['oauthprotocolenabled'] = 'OAuth protocol enabled';
$string['restprotocolenabled'] = 'REST protocol enabled';
$string['usernameexists'] = 'Username already exists "%s"';
$string['webserviceauthdisabled'] = 'Webservice auth is not enabled for this institution';
$string['usernameexists1'] = 'Username "%s" already exists.';
$string['webserviceauthdisabled'] = 'Web service authentication is not enabled for this institution';
$string['webserviceproviderenabled'] = 'Incoming web service requests allowed';
$string['institutiondenied'] = 'Access to \'%s\' denied. Please contact your institution admin.';
$string['institutiondenied'] = 'Access to \'%s\' is denied. Please contact your institution administrator.';
......@@ -150,7 +150,7 @@ class module_lti_launch extends external_api {
// Make sure that the username doesn't already exist
if (get_record('usr', 'username', $user->email)) {
$USER->logout();
throw new WebserviceInvalidParameterException(get_string('usernameexists', 'module.lti', $user->email));
throw new WebserviceInvalidParameterException(get_string('usernameexists1', 'module.lti', $user->email));
}
$user->username = $user->email;
......
......@@ -12,15 +12,15 @@
defined('INTERNAL') || die();
$string['autoconfiguredesc'] = 'Automatically enable settings and configurations needed for the mobile apps API.';
$string['autoconfiguretitle'] = 'Auto-configure mobile apps API?';
$string['autoconfiguretitle'] = 'Auto-configure mobile apps API';
$string['configstep'] = 'Conguration item';
$string['configstepstatus'] = 'Status';
$string['manualtokensdesc'] = 'Users can generate webservice access tokens manually in order to copy and paste them into an app. Normally, an app should be able to generate the tokens for users automatically. However, some auth plugins may not allow for that.';
$string['manualtokensdesc'] = 'Users can generate web service access tokens manually in order to copy and paste them into an app. Normally, an app should be able to generate the tokens for users automatically. However, some authentication plugins may not allow for that.';
$string['manualtokenstitle'] = 'Manual token generation';
$string['mobileapiserviceexists'] = 'Mobile API service group is registered';
$string['mobileapiserviceconfigured'] = 'Mobile API service enabled, "%s" disabled, "%s" enabled';
$string['noticeenabled'] = 'The Mahara mobile apps API is currently enabled.';
$string['noticenotenabled'] = 'The Mahara mobile apps API is <b>not</b> currently enabled.';
$string['noticeenabled'] = 'The Mahara mobile apps API is enabled.';
$string['noticenotenabled'] = 'The Mahara mobile apps API is <b>not</b> enabled.';
$string['notreadylabel'] = 'Not ready';
$string['readylabel'] = 'Ready';
$string['restprotocolenabled'] = 'REST protocol enabled';
......@@ -38,4 +38,4 @@ $string['tokencreated'] = 'Created';
$string['tokenmanuallycreated'] = 'Manually created';
$string['clientnotspecified'] = '(Unknown)';
$string['generateusertoken'] = 'Generate an app access token';
$string['appaccessrevoked'] = 'Access revoked';
\ No newline at end of file
$string['appaccessrevoked'] = 'Access revoked';
......@@ -44,13 +44,13 @@
<div class="nav-toggle-area">
{if $MAINNAV}
<button class="main-nav-toggle navbar-toggle collapsed" role="button" data-toggle="collapse" data-target=".nav-main" aria-expanded="false" aria-controls="nav-main" title='{str tag="mainmenu"}'>
<span class="sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="sr-only">{str tag="showmainmenu"}</span>
<span class="icon icon-bars icon-lg" role="presentation" aria-hidden="true"></span>
</button>
{/if}
{if $MAINNAVADMIN}
<button class="admin-toggle navbar-toggle collapsed" role="button" data-toggle="collapse" data-target=".nav-main-admin" aria-expanded="false" aria-controls="nav-main-admin" title='{str tag="adminmenu"}'>
<span class="sr-only">{str tag="show"} {str tag="adminmenu"}</span>
<span class="sr-only">{str tag="showadminmenu"}</span>
<span class="icon icon-wrench icon-large" role="presentation" aria-hidden="true"></span>
</button>
{/if}
......@@ -59,7 +59,7 @@
<img src="{profile_icon_url user=$USER maxheight=25 maxwidth=25}">
</a>
<button class="user-toggle navbar-toggle" role="button" data-toggle="collapse" data-target=".nav-main-user" aria-expanded="false" aria-controls="nav-main-user" title='{str tag="usermenu"}'>
<span class="sr-only">{str tag="show"} {str tag="usermenu"}</span>
<span class="sr-only">{str tag="showusermenu"}</span>
<span class="icon icon-chevron-down collapsed"></span>
</button>
{/if}
......@@ -67,7 +67,7 @@
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
<button class="search-toggle navbar-toggle collapsed" role="button" data-toggle="collapse" data-target=".navbar-form" aria-expanded="false" aria-controls="navbar-form">
<span class="icon icon-search icon-lg" role="presentation" aria-hidden="true"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="search"}</span>
<span class="nav-title sr-only">{str tag="showsearch"}</span>
</button>
{/if}
</div>
......
......@@ -20,7 +20,7 @@
{if $item.submenu}
<button type="button" class="navbar-showchildren navbar-toggle dropdown-toggle {if !$item.selected}collapsed{/if}" data-toggle="collapse" data-parent="nav" data-target="#childmenu-{$dwoo.foreach.menu.index}">
<span class="icon icon-chevron-down" role="presentation" aria-hidden="true"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="nav-title sr-only">{str tag="showmenu" section="mahara" arg1="$item.title"}</span>
</button>
{/if}
{if $item.submenu}
......@@ -72,7 +72,7 @@
{if $item.submenu}
<button type="button" class="navbar-showchildren navbar-toggle dropdown-toggle {if !$item.selected}collapsed{/if}" data-toggle="collapse" data-parent="navadmin" data-target="#adminchildmenu-{$dwoo.foreach.menu.index}">
<span class="icon icon-chevron-down" role="presentation" aria-hidden="true"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="nav-title sr-only">{str tag="showmenu" section="mahara" arg1="$item.title"}</span>
</button>
{/if}
{if $item.submenu}
......@@ -133,7 +133,7 @@
{if $item.submenu}
<button type="button" class="navbar-showchildren navbar-toggle dropdown-toggle {if !$item.selected}collapsed{/if}" data-toggle="collapse" data-parent="navuser" data-target="#userchildmenu-{$dwoo.foreach.menu.index}">
<span class="icon icon-chevron-down" role="presentation" aria-hidden="true"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="nav-title sr-only">{str tag="showmenu" section="mahara" arg1="$item.title"}</span>
</button>
{/if}
{if $item.submenu}
......
......@@ -59,10 +59,10 @@
{if $institution}
{if $institution == 'mahara'}
<a class="btn btn-default" href="{$WWWROOT}admin/site/views.php">
{str tag=returntositepages section=view}
{str tag=returntositeportfolios section=view}
{else}
<a class="btn btn-default" href="{$WWWROOT}view/institutionviews.php?institution={$institution}">
{str tag=returntoinstitutionpages section=view}
{str tag=returntoinstitutionportfolios section=view}
{/if}
<span class="icon icon-arrow-circle-right right" role="presentation" aria-hidden="true"></span>
</a>
......
......@@ -43,7 +43,7 @@
{if $MAINNAV}
<!-- Brand and toggle get grouped for better mobile display -->
<button type="button" class="menu-toggle navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-main">
<span class="sr-only">{str tag="show"} {str tag="menu"}</span>
<span class="sr-only">{str tag="showmainmenu"}</span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
<span class="icon-bar" role="presentation"></span>
......@@ -52,7 +52,7 @@
{if !$nosearch && ($LOGGEDIN || $publicsearchallowed)}
<button type="button" class="navbar-toggle search-toggle collapsed" data-toggle="collapse" data-target=".navbar-form">
<span class="icon icon-search" role="presentation" aria-hidden="true"></span>
<span class="nav-title sr-only">{str tag="show"} {str tag="search"}</span>
<span class="nav-title sr-only">{str tag="showsearch"}</span>
</button>
{/if}
<div id="logo-area" class="logo-area">
......
......@@ -422,8 +422,8 @@ function webservice_server_list_form($sopts, $iopts) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-xs',
'value' => '<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('editspecific', 'mahara', $consumer->id) . '</span>',
'elementtitle' => get_string('edit'),
'value' => '<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span><span class="sr-only">' . get_string('editspecific', 'mahara', $consumer->application_title) . '</span>',
'elementtitle' => get_string('editspecific', 'mahara', $consumer->application_title),
),
),
))
......@@ -442,8 +442,8 @@ function webservice_server_list_form($sopts, $iopts) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-xs',
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('deletespecific', 'mahara', $consumer->id).'</span>',
'elementtitle' => get_string('deletespecific', 'mahara', $consumer->id),
'value' => '<span class="icon icon-trash icon-lg text-danger" role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('deletespecific', 'mahara', $consumer->application_title).'</span>',
'elementtitle' => get_string('deletespecific', 'mahara', $consumer->application_title),
),
),
)),
......@@ -481,8 +481,8 @@ function webservice_server_list_form($sopts, $iopts) {
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default btn-xs',
'value' => '<span class="icon icon-cog icon-lg " role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('editspecific', 'mahara', $consumer->application_title).'</span>',
'elementtitle' => get_string('editspecific', 'mahara', $consumer->application_title),
'value' => '<span class="icon icon-cog icon-lg " role="presentation" aria-hidden="true"></span><span class="sr-only">'.get_string('managespecific', 'mahara', $consumer->application_title).'</span>',
'elementtitle' => get_string('managespecific', 'mahara', $consumer->application_title),
),
),
));
......
......@@ -245,7 +245,7 @@ class mahara_user_external extends external_api {
foreach ($params['users'] as $user) {
// Make sure that the username doesn't already exist
if (get_record('usr', 'username', $user['username'])) {
throw new WebserviceInvalidParameterException(get_string('usernameexists', 'auth.webservice', $user['username']));
throw new WebserviceInvalidParameterException(get_string('usernameexists1', 'auth.webservice', $user['username']));
}
// check the institution is allowed
......
......@@ -7,11 +7,10 @@ Feature: Creating users and an institution enrolling users and changing their pa
Scenario: Creating an Institution assigning users and changing their passwords
# Log in as Admin
Given I log in as "admin" with password "Kupuhipa1"
# Verifying log in was successful
# Verifying login was successful
And I should see "Admin User"
# Creating an Institution
And I click on "Show Administration Menu"
And I follow "Institutions"
And I choose "Settings" in "Institutions" from administration menu
And I press "Add institution"
And I fill in the following:
| Institution name | Institution One |
......
@javascript @core @core_administration
Feature: Broken string in user accesslist report
In order to make sure user can read the strings
As an admin
......@@ -14,8 +15,7 @@ Background:
Scenario: Accessing language string (Bug 1449350)
Given I log in as "admin" with password "Kupuhipa1"
And I click on "Show Administration Menu"
And I follow "Users"
And I choose "User search" in "Users" from administration menu
And I check "selectusers_2"
And I press "Get reports"
When I press "Access list"
......
@javascript @core @core_administration
Feature: The admin homepage
Test the forms on the admin homepage
As an admin
......@@ -6,8 +7,7 @@ So I can make sure I can close/open site or clear cache
Scenario: Closing the site
Given I log in as "admin" with password "Kupuhipa1"
And I click on "Show Administration Menu"
And I follow "Admin home"
And I choose "Admin home" from administration menu
# Verifying I'm on the right page
And I should see "Register your Mahara site"
And I scroll to the base of id "close_site"
......
......@@ -6,7 +6,6 @@ I need to expand all the fieldsets
Scenario: Expanding all the fieldsets
Given I log in as "admin" with password "Kupuhipa1"
And I click on "Show Administration Menu"
And I follow "Configure site"
And I choose "Site options" in "Configure site" from administration menu
Then I expand all fieldsets
And I should see "Event log expiry"
......@@ -15,8 +15,7 @@ Scenario: Confirm that multiple notification choices are available (Bug #1299993
# Verifying log in was successful
And I should see "Admin User"
# Navigating to notification settings
When I click on "Show Administration Menu"
And I follow "Configure site"
And I choose "Site options" in "Configure site" from administration menu
And I follow "Notification settings"
# Verifying "None" option is not available for these notifications
And the "System message" field should not contain "None"
......
......@@ -10,7 +10,7 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
# Verifying log in was successful
And I should see "Admin User"
# Checking Content Menu
And I click on "Show Menu"
And I click on "Show main menu"
When I follow "Content"
# Checking About me tabs
And I follow "Contact information"
......@@ -47,22 +47,22 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
And I choose "Institution membership" in "Groups" from main menu
And I choose "Topics" in "Groups" from main menu
# Checking messages
# And I click on "Show User Menu" # problem with chrome driver clicking on user icon instead
# And I click on "Show user menu" # problem with chrome driver clicking on user icon instead
# And I follow "mail"
And I choose "mail" from user menu by id
And I follow "Inbox" in the ".arrow-bar" "css_element"
And I follow "Sent"
And I follow "Compose"
# Checking Homepage
And I click on "Show Menu"
And I click on "Show main menu"
And I follow "Dashboard"
# Checking Administration
# Checking Admin home Menu and submenu
# Checking admin home menu and submenu
And I choose "Register" in "Admin home" from administration menu
And I choose "Site statistics" in "Admin home" from administration menu
And I follow "Logins"
And I choose "Overview" in "Admin home" from administration menu
# Checking Configure site Menu and submenu
# Checking Configure site menu and submenu
And I choose "Site options" in "Configure site" from administration menu
And I choose "Static pages" in "Configure site" from administration menu
And I choose "Menus" in "Configure site" from administration menu
......@@ -111,6 +111,6 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
And I choose "Application connections" in "Web services" from administration menu
And I choose "Connection manager" in "Web services" from administration menu
# The test should be completed once if Return to site works successfully
And I click on "Show Menu"
And I click on "Show main menu"
And I follow "Dashboard"
And I should see "Admin User"
......@@ -6,8 +6,7 @@ I need to be able to access mathslate in Tinymce
Scenario: Making adjustments to the mathslate plugin for mahara (Bug 1472446)
Given I log in as "admin" with password "Kupuhipa1"
And I click on "Show Administration Menu"
And I follow "Configure site"
And I choose "Site options" in "Configure site" from administration menu
And I follow "General settings"
And I enable the switch "Enable MathJax"
And I press "Update site options"
......
......@@ -10,8 +10,7 @@ Scenario: Creating an institution (selenium test)
# Verifying log in successful
And I should see "Admin User"
# Creating an Institution
And I click on "Show Administration Menu"
And I follow "Institutions"
And I choose "Settings" in "Institutions" from administration menu
And I press "Add institution"
And I fill in the following:
| Institution name | Institution One |
......
......@@ -9,8 +9,7 @@
Given the following "users" exist:
| username | password | email | firstname | lastname | institution | authname | role |
| userA | Kupuhipa1 | test01@example.com | Pete | Mc | mahara | internal | member |
And I click on "Show Administration Menu"
And I follow "Users"
And I choose "User search" in "Users" from administration menu
And I follow "Pete"
And I follow "Send message"
Then I should see "Recipients *"
......
@javascript @core @core_view @core_portfolio
@javascript @core @core_view @core_portfolio @menu
Feature: Checking the correct menu items are available for each user
In order to make sure the correct menu items are available
As every user
......@@ -22,17 +22,17 @@ Given the following "users" exist:
Scenario: Checking menu items are available as a student (Bug 1467368)
Given I log in as "userA" with password "Kupuhipa1"
# Checking the main menu navigation headings
When I click on "Show Menu"
When I click on "Show main menu"
And I follow "Dashboard"
Then I should not see "Administration" in the "#main-nav-admin" "css_element"
And I should not see "Site information" in the "#main-nav-admin" "css_element"
And I click on "Show Menu"
And I click on "Show main menu"
And I should see "Content" in the "#main-nav" "css_element"
And I should see "Portfolio" in the "#main-nav" "css_element"
And I should see "Groups" in the "#main-nav" "css_element"
# Checking the sub navigation in Content
When I follow "Content"
And I click on "Show Menu"
And I click on "Show main menu"
Then I should see "Profile" in the ".content" "css_element"
And I should see "Profile pictures" in the ".content" "css_element"
And I should see "Files" in the ".content" "css_element"
......@@ -42,7 +42,7 @@ Scenario: Checking menu items are available as a student (Bug 1467368)
And I should see "Notes" in the ".content" "css_element"