Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

register: Rename creating_new_team to creating_new_realm. 

This commit renames creating_new_team variable to
creating_new_realm as "realm" seems better to explain
new realm creation than "team".
This commit is contained in:
Sahil Batra 2023-03-01 09:09:26 +05:30 committed by Tim Abbott
parent ac01e3ee51
commit 4e01449cfd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/zerver/register.html
View File

@ -17,7 +17,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
<div class="center-block new-style" style="padding: 20px 0px"> <div class="center-block new-style" style="padding: 20px 0px">
<div class="pitch"> <div class="pitch">
{% if creating_new_team %} {% if creating_new_realm %}
<h1>{{ _('Create your organization') }}</h1> <h1>{{ _('Create your organization') }}</h1>
{% else %} {% else %}
<h1>{{ _('Create your account') }}</h1> <h1>{{ _('Create your account') }}</h1>
@ -32,7 +32,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
{{ csrf_input }} {{ csrf_input }}
<fieldset class="org-registration"> <fieldset class="org-registration">
{% if creating_new_team %} {% if creating_new_realm %}
<legend>{{ _('Your organization') }}</legend> <legend>{{ _('Your organization') }}</legend>
<div class="input-box"> <div class="input-box">
<div class="inline-block relative"> <div class="inline-block relative">
@ -104,10 +104,10 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
</fieldset> </fieldset>
<fieldset class="user-registration"> <fieldset class="user-registration">
{% if creating_new_team %} {% if creating_new_realm %}
<legend>{{ _('Your account') }}</legend> <legend>{{ _('Your account') }}</legend>
{% endif %} {% endif %}
{% if realm_name and not creating_new_team %} {% if realm_name and not creating_new_realm %}
<img class="avatar inline-block" src="{{ realm_icon }}" alt="" /> <img class="avatar inline-block" src="{{ realm_icon }}" alt="" />
<div class="info-box inline-block"> <div class="info-box inline-block">
<div class="organization-name">{{ realm_name }}</div> <div class="organization-name">{{ realm_name }}</div>
@ -121,7 +121,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
<input type="hidden" name="email_address_visibility" id="email_address_visibility"/> <input type="hidden" name="email_address_visibility" id="email_address_visibility"/>
<label for="id_email" class="inline-block label-title">{{ _('Email') }}</label> <label for="id_email" class="inline-block label-title">{{ _('Email') }}</label>
<div id="id_email">{{ email }}</div> <div id="id_email">{{ email }}</div>
{% if not creating_new_team %} {% if not creating_new_realm %}
<p id="new-user-email-address-visibility"> <p id="new-user-email-address-visibility">
<span class="current-selected-option"> <span class="current-selected-option">
{% if default_email_address_visibility == email_address_visibility_admins_only %} {% if default_email_address_visibility == email_address_visibility_admins_only %}
@ -298,7 +298,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
</div> </div>
</div> </div>
{% if not creating_new_team %} {% if not creating_new_realm %}
<div class="micromodal" id="change-email-address-visibility-modal" aria-hidden="true"> <div class="micromodal" id="change-email-address-visibility-modal" aria-hidden="true">
<div class="modal__overlay" tabindex="-1"> <div class="modal__overlay" tabindex="-1">
<div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title"> <div class="modal__container" role="dialog" aria-modal="true" aria-labelledby="dialog_title">

2
zerver/views/registration.py
View File

@ -514,7 +514,7 @@ def accounts_register(
# password_auth_enabled is normally set via our context processor, # password_auth_enabled is normally set via our context processor,
# but for the registration form, there is no logged in user yet, so # but for the registration form, there is no logged in user yet, so
# we have to set it here. # we have to set it here.
"creating_new_team": realm_creation, "creating_new_realm": realm_creation,
"password_required": password_auth_enabled(realm) and password_required, "password_required": password_auth_enabled(realm) and password_required,
"require_ldap_password": require_ldap_password, "require_ldap_password": require_ldap_password,
"password_auth_enabled": password_auth_enabled(realm), "password_auth_enabled": password_auth_enabled(realm),