settings: Fix bug in "Default user settings" section.

There was no heading for "Time format" setting in the
"Default user settings" section and thus no save-discard
widget to update the setting. This commit fixes the bug
and changes the heading to be only "Time" since there is
no realm-level default of language setting.

This bug was introduced in adb612a0b4.
This commit is contained in:
Sahil Batra
2021-11-09 17:06:40 +05:30
committed by Tim Abbott
parent 41ddf29e76
commit 4a1153b06c
3 changed files with 11 additions and 6 deletions

View File

@@ -307,7 +307,7 @@ async function change_language(page: Page, language_data_code: string): Promise<
}
async function check_language_setting_status(page: Page): Promise<void> {
await page.waitForSelector("#user-display-settings .language-settings-status .reload_link", {
await page.waitForSelector("#user-display-settings .lang-time-settings-status .reload_link", {
visible: true,
});
}
@@ -356,7 +356,9 @@ async function test_default_language_setting(page: Page): Promise<void> {
await page.goto("http://zulip.zulipdev.com:9981/#settings"); // get back to normal language.
await page.waitForSelector(display_settings_section, {visible: true});
await page.click(display_settings_section);
await page.waitForSelector("#user-display-settings .language-settings-status", {visible: true});
await page.waitForSelector("#user-display-settings .lang-time-settings-status", {
visible: true,
});
await page.waitForSelector("#user-display-settings .setting_default_language", {visible: true});
}

View File

@@ -112,7 +112,7 @@ export function set_up(settings_panel) {
change_display_setting(
data,
container.find(".language-settings-status"),
container.find(".lang-time-settings-status"),
$t_html(
{
defaultMessage:

View File

@@ -1,13 +1,16 @@
<form class="display-settings-form">
<div class="lang-time-settings {{#if for_realm_settings}}org-subsection-parent{{else}}subsection-parent{{/if}}">
{{#unless for_realm_settings}}
<!-- this is inline block so that the alert notification can sit beside
it. If there's not an alert, don't make it inline-block.-->
<div class="subsection-header inline-block">
{{#if for_realm_settings}}
<h3>{{t "Time" }}</h3>
{{else}}
<h3>{{t "Language and time" }}</h3>
{{> settings_save_discard_widget section_name="language-settings" show_only_indicator=true }}
{{/if}}
{{> settings_save_discard_widget section_name="lang-time-settings" show_only_indicator=(not for_realm_settings) }}
</div>
{{#unless for_realm_settings}}
<div class="input-group">
<label class="inline-block title">{{t "Language" }}</label>
<button type="button" class="setting_default_language button btn-link rounded small inline-block">