Reorder institution and auth method in account settings (bug #911604)

This makes the drop-down consistent with the one in Upload CSV.

Change-Id: I4c44d1d26b28f3d297549c90881a880fa19a9b2f
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

htdocs/admin/users/edit.php

@@ -151,7 +151,7 @@ if (count($authinstances) > 1) {
     $external = false;
     foreach ($authinstances as $authinstance) {
         if ($USER->can_edit_institution($authinstance->name)) {
-            $options[$authinstance->id] = $authinstance->instancename . ' (' . $authinstance->displayname . ')';
+            $options[$authinstance->id] = $authinstance->displayname . ': ' . $authinstance->instancename;
             if ($authinstance->authname != 'internal') {
                 $external = true;
             }

htdocs/lang/en.utf8/help/forms/edituser_site.authinstance.html

 <h3>Authentication Method</h3>
 <p>All users have one primary method of authenticating to Mahara. In certain special cases, they can also have a secondary way of authenticating, but in most cases they have just one way.</p>
 <p>Here, you can choose what mechanism this user can use to authenticate to Mahara. Most of the time, you will not need to touch this, as it will be set correctly for you.</p>
-<p>In some circumstances, you might need a user to authenticate to Mahara using a different method to what they have previously used. For example, if they used to use LDAP but the LDAP server does not know about them any more, and they wish to continue to get access to their account, you could set this to a different method such as 'Internal (No Institution)'. The user will then be able to log in directly to Mahara without using the LDAP server - although you should use the 'reset password' field above to choose an initial password for them.</p>
+<p>In some circumstances, you might need a user to authenticate to Mahara using a different method to what they have previously used. For example, if they used to use LDAP but the LDAP server does not know about them any more, and they wish to continue to get access to their account, you could set this to a different method such as 'No Institution: Internal'. The user will then be able to log in directly to Mahara without using the LDAP server - although you should use the 'reset password' field above to choose an initial password for them.</p>