Commit df4604db authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1676106: Change "OAuth" to "External apps""

parents 358982a6 77495feb
......@@ -220,10 +220,10 @@ $string['unabletoruntestclient'] = 'Web service test client needs to be run unde
//oauth server registry
$string['accesstokens'] = 'OAuth access tokens';
$string['notokens'] = 'You have no application tokens';
$string['oauth'] = 'OAuth';
$string['externalapps'] = 'External apps';
$string['oauth1'] = 'OAuth1.x';
$string['oauthv1sregister'] = 'OAuth service registration';
$string['userapplications'] = 'OAuth consumer keys';
$string['externalappsregister'] = 'Registration of external apps';
$string['userapplications1'] = 'Settings for external applications';
$string['accessto'] = 'Access to';
$string['application'] = 'Application';
$string['callback'] = 'Callback URI';
......
......@@ -125,7 +125,7 @@ class PluginAuthWebservice extends PluginAuth {
'webservices/oauthconfig' => array(
'path' => 'webservices/oauthconfig',
'url' => 'webservice/admin/oauthv1sregister.php',
'title' => get_string('oauth', 'auth.webservice'),
'title' => get_string('externalapps', 'auth.webservice'),
'weight' => 40,
),
'webservices/logs' => array(
......
......@@ -16,7 +16,7 @@ define('SECTION_PAGE', 'oauth');
require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('webservices_title', 'auth.webservice'));
define('SUBSECTIONHEADING', get_string('oauthv1sregister', 'auth.webservice'));
define('SUBSECTIONHEADING', get_string('externalappsregister', 'auth.webservice'));
require_once(get_config('docroot') . 'webservice/libs/oauth-php/OAuthServer.php');
require_once(get_config('docroot') . 'webservice/libs/oauth-php/OAuthStore.php');
......@@ -531,7 +531,7 @@ function webservice_server_list_form($sopts, $iopts) {
// fieldset for managing service function list
'register_server' => array(
'type' => 'fieldset',
'legend' => get_string('userapplications', 'auth.webservice'),
'legend' => get_string('userapplications1', 'auth.webservice'),
'elements' => array(
'sflist' => array(
'type' => 'html',
......
......@@ -105,7 +105,7 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
And I choose "Clean URLs" in "Extensions" from administration menu
# Checking Web services Menu and submenu
And I choose "Configuration" in "Web services" from administration menu
And I choose "OAuth" in "Web services" from administration menu
And I choose "External apps" in "Web services" from administration menu
And I choose "Logs" in "Web services" from administration menu
And I choose "Test client" in "Web services" from administration menu
And I choose "Application connections" in "Web services" from administration menu
......
......@@ -35,7 +35,7 @@ Scenario: Creating a page with content in it (Bug 1426983)
And I press "Add"
And I press "Save"
# Adding external media block - but cancel out
And I expand "External" node
And I expand "External" node in the "div#content-editor-foldable" "css_element"
And I wait "1" seconds
And I follow "External media"
And I press "Add"
......
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