From 2067c71a932a45db4566196353e006a084799a04 Mon Sep 17 00:00:00 2001
From: palashb01 <palash.baderia@outlook.com>
Date: Sat, 4 Mar 2023 19:19:02 +0530
Subject: [PATCH] display_settings: Rename and update the 'language-time'
 section.

Rename the 'language-time' title to 'General'. As the 'language-time'
section no longer exists, replace the 'lang-time-settings' classname
with the 'general-settings' classname in the 'settings_display.js' file.

Updated the 'change-the-time-format.md' and 'change-your-language.md'
documentation files to reflect these changes.

To pass the puppeteer_test Replaced the 'lang-time-settings-status'
classname to 'general-settings-status' inside 'settings.test.ts' file.
---
 help/change-the-time-format.md              |  2 +-
 help/change-your-language.md                |  2 +-
 web/e2e-tests/settings.test.ts              |  4 ++--
 web/src/settings_display.js                 |  2 +-
 web/templates/settings/display_settings.hbs | 10 +++-------
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/help/change-the-time-format.md b/help/change-the-time-format.md
index de73f82b20..f5161e3282 100644
--- a/help/change-the-time-format.md
+++ b/help/change-the-time-format.md
@@ -9,7 +9,7 @@ format (e.g. 5:00 PM) or a 24-hour format (e.g. 17:00).
 
 {settings_tab|display-settings}
 
-1. Under **Language and time**, select your preferred option from the
+1. Under **General**, select your preferred option from the
 **Time format** dropdown.
 
 {end_tabs}
diff --git a/help/change-your-language.md b/help/change-your-language.md
index ed6952726f..c3ec3d5749 100644
--- a/help/change-your-language.md
+++ b/help/change-your-language.md
@@ -13,7 +13,7 @@ messages you receive.
 
 {settings_tab|display-settings}
 
-1. Under **Language and time**, click the button under **Language**.
+1. Under **General**, click the button under **Language**.
 
 1. Select a language.
 
diff --git a/web/e2e-tests/settings.test.ts b/web/e2e-tests/settings.test.ts
index ed8792cd46..526ba07a3f 100644
--- a/web/e2e-tests/settings.test.ts
+++ b/web/e2e-tests/settings.test.ts
@@ -347,7 +347,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 .lang-time-settings-status .reload_link", {
+    await page.waitForSelector("#user-display-settings .general-settings-status .reload_link", {
         visible: true,
     });
 }
@@ -400,7 +400,7 @@ 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 .lang-time-settings-status", {
+    await page.waitForSelector("#user-display-settings .general-settings-status", {
         visible: true,
     });
     await page.waitForSelector("#user-display-settings .language_selection_button", {
diff --git a/web/src/settings_display.js b/web/src/settings_display.js
index f8290303dc..7db0537963 100644
--- a/web/src/settings_display.js
+++ b/web/src/settings_display.js
@@ -98,7 +98,7 @@ function user_default_language_modal_post_render() {
 
             change_display_setting(
                 data,
-                $("#settings_content").find(".lang-time-settings-status"),
+                $("#settings_content").find(".general-settings-status"),
                 $t_html(
                     {
                         defaultMessage:
diff --git a/web/templates/settings/display_settings.hbs b/web/templates/settings/display_settings.hbs
index 3bfd67aa63..4a576a21bb 100644
--- a/web/templates/settings/display_settings.hbs
+++ b/web/templates/settings/display_settings.hbs
@@ -1,14 +1,10 @@
 <form class="display-settings-form">
-    <div class="lang-time-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
+    <div class="general-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
         <!-- 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>
-            {{/if}}
-            {{> settings_save_discard_widget section_name="lang-time-settings" show_only_indicator=(not for_realm_settings) }}
+            <h3>{{t "General" }}</h3>
+            {{> settings_save_discard_widget section_name="general-settings" show_only_indicator=(not for_realm_settings) }}
         </div>
         {{#unless for_realm_settings}}
             {{> language_selection_widget