From fef31614d35e6a6443299310666b1f964d6b1e83 Mon Sep 17 00:00:00 2001 From: Vector73 Date: Thu, 9 May 2024 16:58:48 +0530 Subject: [PATCH] zerver: Replace occurrences of uri with url in other templates. This commit replaces occurrences of realm_uri with realm_url in "context_processors.py" and related templates. With by-hand translation updates for German (also updated in Transifex) to avoid breaking the i18n system tests that use some modified strings. Co-authored-by: Junyao Chen --- templates/zerver/accounts_home.html | 2 +- templates/zerver/invalid_email.html | 6 +++--- templates/zerver/login.html | 2 +- templates/zerver/no_spare_licenses.html | 2 +- templates/zerver/register.html | 2 +- templates/zerver/unsubscribe_success.html | 4 ++-- zerver/context_processors.py | 11 +++++------ 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/templates/zerver/accounts_home.html b/templates/zerver/accounts_home.html index be95e9038f..8644f6c72f 100644 --- a/templates/zerver/accounts_home.html +++ b/templates/zerver/accounts_home.html @@ -25,7 +25,7 @@ page can be easily identified in it's respective JavaScript file -->
{{ realm_name }}
-
{{ realm_uri }}
+
{{ realm_url }}
diff --git a/templates/zerver/invalid_email.html b/templates/zerver/invalid_email.html index 78e6aacecd..f27bfe261f 100644 --- a/templates/zerver/invalid_email.html +++ b/templates/zerver/invalid_email.html @@ -21,13 +21,13 @@ {{ _("The email address you are trying to sign up with is not valid.") }} {% endif %} {% if closed_domain %} - {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using emails with your email domain.{% endtrans %} + {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using emails with your email domain.{% endtrans %} {% endif %} {% if disposable_emails_not_allowed %} - {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using disposable email addresses.{% endtrans %} + {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using disposable email addresses.{% endtrans %} {% endif %} {% if email_contains_plus %} - {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using emails that contain "+".{% endtrans %} + {% trans %}The organization you are trying to join, {{ realm_name }}, does not allow signups using emails that contain "+".{% endtrans %} {% endif %} {% if invalid_email %} {{ _("Please sign up using a valid email address.") }} diff --git a/templates/zerver/login.html b/templates/zerver/login.html index 313b782707..147d6c5db9 100644 --- a/templates/zerver/login.html +++ b/templates/zerver/login.html @@ -25,7 +25,7 @@ page can be easily identified in it's respective JavaScript file. -->
{{ realm_name }}
-
{{ realm_uri }}
+
{{ realm_url }}
diff --git a/templates/zerver/no_spare_licenses.html b/templates/zerver/no_spare_licenses.html index 46cb35384c..85b482b556 100644 --- a/templates/zerver/no_spare_licenses.html +++ b/templates/zerver/no_spare_licenses.html @@ -13,7 +13,7 @@

- {% trans %}New members cannot currently join {{ realm_name }} because all Zulip Cloud licenses are in use.{% endtrans %} + {% trans %}New members cannot currently join {{ realm_name }} because all Zulip Cloud licenses are in use.{% endtrans %}

{{ _("Please contact the person who invited you and ask them to increase the number of licenses, then try again.") }} diff --git a/templates/zerver/register.html b/templates/zerver/register.html index 851af234a9..fd8316d48a 100644 --- a/templates/zerver/register.html +++ b/templates/zerver/register.html @@ -73,7 +73,7 @@ Form is validated both client-side using jquery-validation (see signup.js) and s

{{ realm_name }}
-
{{ realm_uri }}
+
{{ realm_url }}
{% endif %} diff --git a/templates/zerver/unsubscribe_success.html b/templates/zerver/unsubscribe_success.html index 22ce2834d4..5e235b6fde 100644 --- a/templates/zerver/unsubscribe_success.html +++ b/templates/zerver/unsubscribe_success.html @@ -18,7 +18,7 @@

{% trans %} You've successfully unsubscribed from Zulip {{ subscription_type }} emails for - {{ realm_name }}. + {{ realm_name }}. {% endtrans %}

@@ -26,7 +26,7 @@

{% trans %} You can undo this change or review your preferences in your - notification settings. + notification settings. {% endtrans %}

{% endif %} diff --git a/zerver/context_processors.py b/zerver/context_processors.py index 45ac6e81fd..1c93ce2ffb 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -118,11 +118,11 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]: realm = get_realm_from_request(request) if realm is None: - realm_uri = settings.ROOT_DOMAIN_URI + realm_url = settings.ROOT_DOMAIN_URI realm_name = None realm_icon = None else: - realm_uri = realm.url + realm_url = realm.url realm_name = realm.name realm_icon = get_realm_icon_url(realm) @@ -190,8 +190,7 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]: "only_sso": settings.ONLY_SSO, "external_host": settings.EXTERNAL_HOST, "external_url_scheme": settings.EXTERNAL_URI_SCHEME, - "realm_uri": realm_uri, - "realm_url": realm_uri, + "realm_url": realm_url, "realm_name": realm_name, "realm_icon": realm_icon, "root_domain_url": settings.ROOT_DOMAIN_URI, @@ -218,9 +217,9 @@ def zulip_default_context(request: HttpRequest) -> Dict[str, Any]: "corporate_enabled": corporate_enabled, } - context["PAGE_METADATA_URL"] = f"{realm_uri}{request.path}" + context["PAGE_METADATA_URL"] = f"{realm_url}{request.path}" if realm is not None and realm.icon_source == realm.ICON_UPLOADED: - context["PAGE_METADATA_IMAGE"] = urljoin(realm_uri, realm_icon) + context["PAGE_METADATA_IMAGE"] = urljoin(realm_url, realm_icon) return context