Commit 20771da7 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Bug 1583428: Shorten "Confirm registration" description"

parents 81e1b601 0eb34ab3
......@@ -298,6 +298,7 @@ $siteoptionform = array(
'title' => get_string('requireregistrationconfirm', 'admin'),
'description' => get_string('requireregistrationconfirmdescription1', 'admin'),
'defaultvalue' => get_config('requireregistrationconfirm'),
'help' => true,
'usersallowedmultipleinstitutions' => array(
'type' => 'switchbox',
......@@ -445,7 +445,7 @@ $string['updatesiteoptions'] = 'Update site options';
$string['usersallowedmultipleinstitutions'] = 'Users allowed multiple institutions';
$string['usersallowedmultipleinstitutionsdescription1'] = 'Allow users to be members of several institutions at the same time.';
$string['requireregistrationconfirm'] = 'Confirm registration';
$string['requireregistrationconfirmdescription1'] = 'All new self-registered user accounts must be approved by an institution administrator before they will become active. Otherwise, each institution can decide whether or not to require confirmation for new accounts registering in that institution.';
$string['requireregistrationconfirmdescription1'] = 'Force all institutions to approve new self-registered accounts.';
$string['userscanchooseviewthemes'] = 'Users can choose page themes';
$string['userscanchooseviewthemesdescription1'] = 'Allow users to select a theme when editing or creating a portfolio page. The page will be displayed to other users using the selected theme.';
$string['userscanhiderealnames'] = 'Users can hide real names';
<!-- @license GNU GPL version 3 or later -->
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Require 'Confirm registrations'</h3>
<p>If your site or any institution on it allow self-registration, you may wish
to use this setting. It will require an administrator to approve users who
self-register on the site, preventing people who are not allowed on the site,
e.g. spammers, from creating accounts unnoticed.</p>
<p>If you do not use this setting and allow self-registration, institutions can
decide whether to require account confirmation or not for self-registering
<p>When you don't use "Confirm registration" either for the entire site or on
an institution by institution basis, user accounts are created even when an
institution administrator does not approve a person registering for their
institution. The account would be created in the default site, the "No institution".</p>
<p>Self-registration without any administrator approval may be useful for sites
that are open to the public for registration. Institutions though should always
consider using the registration confirmation to only give access to their members.</p>
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