Commit 7cf66563 authored by Aaron Wells's avatar Aaron Wells
Browse files

Bug 1620879: Language string changes 

plus fix for non custom service groups edit button to have right side
border

behatnotneeded

Change-Id: Ib760673905f022823038a1240c87dc12f8714444
parent a617b3c2

htdocs/auth/webservice/lang/en.utf8/auth.webservice.php

+4 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ $string['externalservice'] = 'External service'; 
$string['function'] = 'Function';

$string['generalstructure'] = 'General structure';

$string['information'] = 'Information';

$string['invalidlogin'] = 'Failed to login; check username and password';

$string['invalidlogin'] = 'Failed to log you in. Please check your username and password.';

$string['invalidaccount'] = 'Invalid web services account: Check service user configuration';

$string['invalidextparam'] = 'Invalid external API parameter: %s';

$string['invalidextresponse'] = 'Invalid external API response: %s';
@@ -331,7 +331,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';
@@ -385,5 +385,5 @@ $string['groupnotexist'] = 'Group "%s" does not exist'; 
$string['instmustset'] = 'institution must be set for "%s"';

$string['nogroup'] = 'no group specified';

$string['membersinvalidaction'] = 'invalid action "%s" for user "%s" on group "%s"';

$string['passwordmustbechangedviawebsite'] = 'You need to change your password. Please log in to you Mahara site in a web browser in order to update your password.';

$string['featuredisabled'] = 'This web services feature has not been enabled for this site. Please contact your site administrator for more information.';
 
$string['passwordmustbechangedviawebsite'] = 'You need to change your password. Please log in via a web browser in order to update your password.';

$string['featuredisabled'] = 'This web services feature is not enabled. Please contact your site administrator for more information.';

htdocs/module/mobileapi/lang/en.utf8/module.mobileapi.php

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ $string['autoconfiguredesc'] = 'Automatically enable settings and configurations 
$string['autoconfiguretitle'] = 'Auto-configure mobile apps API?';

$string['configstep'] = 'Conguration item';

$string['configstepstatus'] = 'Status';

$string['manualtokensdesc'] = 'Users can manually generate webservice access tokens, in order to copy and paste them into an app. (Normally an app should be able to generate the tokens for users automatically, but some auth plugins may not make that possible.)';

$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['manualtokenstitle'] = 'Manual token generation';

$string['mobileapiserviceexists'] = 'Mobile API service group is registered';

$string['mobileapiserviceconfigured'] = 'Mobile API service enabled, "%s" disabled, "%s" enabled';
@@ -30,10 +30,10 @@ $string['webserviceproviderenabled'] = 'Incoming web service requests allowed'; 
// User management of webservice access tokens

$string['mytokensmenutitle'] = 'Apps';

$string['mytokenspagetitle'] = 'Applications';

$string['mytokenspagedesc'] = 'These applications can access your Mahara account.';

$string['mytokenspagedesc'] = 'These applications can access your account.';

$string['nopersonaltokens'] = 'You have not granted access to any applications.';

$string['clientinfo'] = 'App';

$string['token'] = 'Access Token';

$string['token'] = 'Access token';

$string['tokencreated'] = 'Created';

$string['tokenmanuallycreated'] = 'Manually created';

$string['clientnotspecified'] = '(Unknown)';

htdocs/theme/raw/sass/components/_btn-group.scss

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
    div:first-child {

        display: inline-block;

    }

    div.first {

        .btn {

            display: inline-block;

            border-bottom-right-radius: 0;

            border-top-right-radius: 0;

        }

    }

    div.last {

        display: inline-block;

        margin: 0;

htdocs/webservice/admin/index.php

+6 −6
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ function webservice_function_groups_form() { 
                        'action'     => array('type' => 'hidden', 'value' => 'edit'),

                        'submit'     => array(

                            'type'  => 'button',

                            'class' => 'btn-default btn-sm',

                            'class' => 'btn-default btn-sm' . ($iscustomservice ? ' first' : ''),

                            'usebuttontag' => true,

                            'value'   => '<span class="'.$editicon.'"></span>' . get_string('edit', 'mahara'),

                            'elementtitle' => get_string('edit'),
@@ -636,7 +636,7 @@ function webservice_function_groups_form() { 
                                'submit'     => array(

                                    'type'  => 'button',

                                    'usebuttontag' => true,

                                    'class' => 'btn-default btn-sm',

                                    'class' => 'btn-default btn-sm last',

                                    'value'   => '<span class="'.$deleteicon.'"></span>' . get_string('delete', 'mahara'),

                                    'elementtitle' => get_string('delete'),

                                ),
@@ -862,7 +862,7 @@ function webservice_tokens_form() { 
                        'submit'     => array(

                            'type'  => 'button',

                            'usebuttontag' => true,

                            'class' => 'btn-default btn-sm',

                            'class' => 'btn-default btn-sm first',

                            'value'   => '<span class="'.$editicon.'"></span>' . get_string('edit'),

                            'elementtitle' => get_string('editspecific', 'mahara', $token->tokenid),

                        ),
@@ -881,7 +881,7 @@ function webservice_tokens_form() { 
                        'submit'     => array(

                            'type'  => 'button',

                            'usebuttontag' => true,

                            'class' => 'btn-default btn-sm',

                            'class' => 'btn-default btn-sm last',

                            'value'   => '<span class="'.$deleteicon.'"></span>' . get_string('delete'),

                            'elementtitle' => get_string('deletespecific', 'mahara', $token->tokenid),

                        ),
@@ -1122,7 +1122,7 @@ function webservice_users_form() { 
                        'submit'     => array(

                            'type'  => 'button',

                            'usebuttontag' => true,

                            'class' => 'btn-default btn-sm',

                            'class' => 'btn-default btn-sm first',

                            'value'   => '<span class="'. $editicon.'" role="presentation" aria-hidden="true"></span>' . get_string('edit'),

                            'elementtitle' => get_string('editspecific', 'mahara', $user->username),

                        ),
@@ -1141,7 +1141,7 @@ function webservice_users_form() { 
                        'submit'     => array(

                            'type'  => 'button',

                            'usebuttontag' => true,

                            'class' => 'btn-default btn-sm',

                            'class' => 'btn-default btn-sm last',

                            'value'   => '<span class="'.$deleteicon.'" role="presentation" aria-hidden="true"></span>' . get_string('delete'),

                            'elementtitle' => get_string('deletespecific', 'mahara', $user->username),

                        ),