diff --git a/static/js/settings.js b/static/js/settings.js index 16f4164724..9a384249dc 100644 --- a/static/js/settings.js +++ b/static/js/settings.js @@ -92,7 +92,7 @@ function _setup_page() { zuliprc: 'zuliprc', flaskbotrc: 'flaskbotrc', timezones: moment.tz.names(), - server_uri: page_params.server_uri, + root_domain_uri: page_params.root_domain_uri, }); $(".settings-box").html(settings_tab); diff --git a/static/templates/settings/bot-settings.handlebars b/static/templates/settings/bot-settings.handlebars index dbf0747e6f..12231fb962 100644 --- a/static/templates/settings/bot-settings.handlebars +++ b/static/templates/settings/bot-settings.handlebars @@ -1,7 +1,7 @@
- {{#tr this}}Looking for our Integrations or API documentation?{{/tr}} + {{#tr this}}Looking for our Integrations or API documentation?{{/tr}}
diff --git a/templates/zerver/accounts_accept_terms.html b/templates/zerver/accounts_accept_terms.html index 7d35c12098..795c2a22bb 100644 --- a/templates/zerver/accounts_accept_terms.html +++ b/templates/zerver/accounts_accept_terms.html @@ -38,7 +38,7 @@ the registration flow has its own (nearly identical) copy of the fields below in #} - {% trans %}I agree to the Terms of Service.{% endtrans %} + {% trans %}I agree to the Terms of Service.{% endtrans %} {% if form.terms.errors %} {% for error in form.terms.errors %} diff --git a/templates/zerver/config_error.html b/templates/zerver/config_error.html index 2f591661c7..0816480956 100644 --- a/templates/zerver/config_error.html +++ b/templates/zerver/config_error.html @@ -28,11 +28,11 @@ {% endif %} {% if google_error %} - {{ render_markdown_path('zerver/google-error.md', {"server_uri": server_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }} + {{ render_markdown_path('zerver/google-error.md', {"root_domain_uri": root_domain_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }} {% endif %} {% if github_error %} - {{ render_markdown_path('zerver/github-error.md', {"server_uri": server_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }} + {{ render_markdown_path('zerver/github-error.md', {"root_domain_uri": root_domain_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }} {% endif %}

After making your changes, remember to restart diff --git a/templates/zerver/footer.html b/templates/zerver/footer.html index 6a191b39bb..d08902ae3e 100644 --- a/templates/zerver/footer.html +++ b/templates/zerver/footer.html @@ -26,10 +26,10 @@

diff --git a/templates/zerver/github-error.md b/templates/zerver/github-error.md index 0e9fe9a134..18193d1beb 100644 --- a/templates/zerver/github-error.md +++ b/templates/zerver/github-error.md @@ -1,7 +1,7 @@ You are using the **GitHub auth backend**, but it is not properly configured. Please check the following: -You have added `{{ server_uri }}/complete/github/` as the callback URL +You have added `{{ root_domain_uri }}/complete/github/` as the callback URL in the OAuth application in GitHub. You can create OAuth apps from [GitHub's developer site](https://github.com/settings/developers). diff --git a/templates/zerver/google-error.md b/templates/zerver/google-error.md index e4493337ba..01e8ebceeb 100644 --- a/templates/zerver/google-error.md +++ b/templates/zerver/google-error.md @@ -5,7 +5,7 @@ configured. Please check the following: You can create OAuth2 apps at [the Google developer console](https://console.developers.google.com). * You have configured your OAuth2 client to allow redirects to your -server's Google auth URL: `{{ server_uri }}/accounts/login/google/done/`. +server's Google auth URL: `{{ root_domain_uri }}/accounts/login/google/done/`. * You have set `GOOGLE_OAUTH2_CLIENT_ID` in `{{ settings_path }}` and `google_oauth2_client_secret` in `{{ secrets_path }}`. diff --git a/templates/zerver/landing_nav.html b/templates/zerver/landing_nav.html index cb2b3a096a..bc71c1e7f0 100644 --- a/templates/zerver/landing_nav.html +++ b/templates/zerver/landing_nav.html @@ -1,6 +1,6 @@