Commit eb80727a authored by Nigel McNie's avatar Nigel McNie
Browse files

Corrected a couple of spelling mistakes in error language strings. Moved...

Corrected a couple of spelling mistakes in error language strings. Moved wwwroot URLs into the language strings as proper interpolated get_string parameters.
parent 2c567acd
......@@ -66,13 +66,13 @@ $institution = new Institution();
try {
$institution->findByWwwroot($remotewwwroot);
} catch (ParamOutOfRangeException $e) {
throw new ParameterException(get_string('errnoxmlrcpwwwroot','auth'). htmlentities($remotewwwroot, ENT_QUOTES, 'UTF-8'));
throw new ParameterException(get_string('errnoxmlrpcwwwroot','auth', $remotewwwroot));
}
$instances = auth_get_auth_instances_for_wwwroot($remotewwwroot);
if (empty($instances)) {
throw new ParameterException(get_string('errnoauthinstances','auth'). htmlentities($remotewwwroot, ENT_QUOTES, 'UTF-8'));
throw new ParameterException(get_string('errnoauthinstances','auth', $remotewwwroot));
}
// If the user is already logged in as someone, log them out. That way, if
......@@ -111,7 +111,7 @@ if ($res == true) {
}
if ($rpcconfigured === false) {
throw new XmlrpcUserNotFoundException(get_string('errnoxmlrcpinstances','auth').htmlentities($remotewwwroot, ENT_QUOTES, 'UTF-8'));
throw new XmlrpcUserNotFoundException(get_string('errnoxmlrpcinstances','auth', $remotewwwroot));
} else {
throw new XmlrpcUserNotFoundException(get_string('errnoxmlrpcuser','auth'));
}
......
......@@ -57,10 +57,10 @@ $string['application'] = 'Application';
$string['cantretrievekey'] = 'An error occurred while retrieving the public key from the remote server.<br>Please ensure that the Application and WWW Root fields are correct, and that networking is enabled on the remote host.';
$string['errorcertificateinvalidwwwroot'] = 'This certificate claims to be for %s, but you are trying to use it for %s.';
$string['errnoauthinstances'] = 'We don\'t seem to have any authentication plugin instances configured for the host at ';
$string['errnoauthinstances'] = 'We don\'t seem to have any authentication plugin instances configured for the host at %s';
$string['errornotvalidsslcertificate'] = 'This is not a valid SSL Certificate';
$string['errnoxmlrcpinstances'] = 'We don\'t seem to have any XMLRPC authentication plugin instances configured for the host at ';
$string['errnoxmlrcpwwwroot'] = 'We don\'t have a record for any host at ';
$string['errnoxmlrpcinstances'] = 'We don\'t seem to have any XMLRPC authentication plugin instances configured for the host at %s';
$string['errnoxmlrpcwwwroot'] = 'We don\'t have a record for any host at %s';
$string['errnoxmlrpcuser'] = "We were unable to authenticate you at this time. Possible reasons might be:
* Your SSO session might have expired. Go back to the other application and click the link to sign into Mahara again.
......
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