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

demo-organizations: Rename shortend versions of 'demo organization'. 

Rename existing shortened references to demo organizations, like
`is_demo_org` or `demo-org-warning`, that have been used in the
codebase so far and replace them to be like the `models.py`
variable: `Realm.demo_organization_scheduled_deletion_date`.
This commit is contained in:
Lauryn Menard 2022-08-03 22:13:25 +02:00 committed by Tim Abbott
parent 4beea6c210
commit 11adc0f37d
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/emails/account_registered.html
View File

@ -6,7 +6,7 @@
{% block content %}
{% if realm_creation %}
{% if is_demo_org %}
{% if is_demo_organization %}
<p>
{% trans demo_organizations_help_link="https://zulip.com/help/demo-organizations" %}Congratulations, you have created a new Zulip demo organization. Note
that this organization will be automatically deleted in 30 days. Learn more

2
templates/zerver/emails/account_registered.txt
View File

@ -1,7 +1,7 @@
{{ _('Welcome to Zulip!') }}
{% if realm_creation %}
{% if is_demo_org %}
{% if is_demo_organization %}
{% trans demo_organizations_help_link="https://zulip.com/help/demo-organizations" %} Congratulations, you have created a new demo Zulip organization. Note that this organization will be automatically deleted in 30 days. Learn more about demo organizations here: {{ demo_organizations_help_link }}!{% endtrans %}
{% else %}
{% trans %}Congratulations, you have created a new Zulip organization: {{ realm_name }}.{% endtrans %}

2
web/src/navbar_alerts.js
View File

@ -199,7 +199,7 @@ export function initialize() {
$(window).trigger("resize");
});
$(".hide-demo-org-notice").on("click", function () {
$(".hide-demo-organization-notice").on("click", function () {
$(this).closest(".alert").hide();
$(window).trigger("resize");
});

2
web/templates/navbar_alerts/demo_organization_deadline.hbs
View File

@ -3,5 +3,5 @@
This is a <z-link>demo organization</z-link> and will be automatically deleted in {days_remaining} days.
{{#*inline "z-link"}}<a class="alert-link" href="/help/demo-organizations" target="_blank" rel="noopener noreferrer" role="button" tabindex=0>{{> @partial-block}}</a>{{/inline}}
{{/tr}}
<a class="alert-link hide-demo-org-notice" role="button" tabindex=0>{{t "Hide notice" }}</a>
<a class="alert-link hide-demo-organization-notice" role="button" tabindex=0>{{t "Hide notice" }}</a>
</div>

2
web/tests/navbar_alerts.test.js
View File

@ -99,7 +99,7 @@ test("server_upgrade_alert hide_duration_expired", ({override}) => {
assert.equal(navbar_alerts.should_show_server_upgrade_notification(ls), false);
});
test("demo_org_days_remaining", ({override}) => {
test("demo_organization_days_remaining", ({override}) => {
const start_time = new Date(1620327447050); // Thursday 06/5/2021 07:02:27 AM (UTC+0)
const high_priority_deadline = addDays(start_time, 5);

2
zerver/lib/email_notifications.py
View File

@ -782,7 +782,7 @@ def send_account_registered_email(user: UserProfile, realm_creation: bool = Fals
realm_creation=realm_creation,
email=user.delivery_email,
is_realm_admin=user.is_realm_admin,
is_demo_org=user.realm.demo_organization_scheduled_deletion_date is not None,
is_demo_organization=user.realm.demo_organization_scheduled_deletion_date is not None,
)
account_registered_context["getting_organization_started_link"] = (