rename night mode to dark theme

zulip · Dec 14, 2022 · cd6f88e · cd6f88e
1 parent 082b202
commit cd6f88e
Show file tree

Hide file tree

Showing 60 changed files with 81 additions and 61 deletions.
diff --git a/src/reduxTypes.js b/src/reduxTypes.js
@@ -372,7 +372,7 @@ export type ThemeName = 'light' | 'dark';
  * To determine the actual theme to show the user, use a ThemeName;
  * see there for details.
  */
-export type ThemeSetting = 'default' | 'night';
+export type ThemeSetting = 'default' | 'dark';
 
 /** What browser the user has set to use for opening links in messages.
  *

diff --git a/src/settings/SettingsScreen.js b/src/settings/SettingsScreen.js
@@ -35,12 +35,12 @@ export default function SettingsScreen(props: Props): Node {
   const { navigation } = props;
 
   const handleThemeChange = useCallback(() => {
-    dispatch(setGlobalSettings({ theme: theme === 'default' ? 'night' : 'default' }));
+    dispatch(setGlobalSettings({ theme: theme === 'default' ? 'dark' : 'default' }));
   }, [theme, dispatch]);
 
   return (
     <Screen title="Settings">
-      <SwitchRow label="Dark theme" value={theme === 'night'} onValueChange={handleThemeChange} />
+      <SwitchRow label="Dark theme" value={theme === 'dark'} onValueChange={handleThemeChange} />
       <SwitchRow
         label="Open links with in-app browser"
         value={shouldUseInAppBrowser(browser)}

diff --git a/src/settings/__tests__/settingsReducer-test.js b/src/settings/__tests__/settingsReducer-test.js
@@ -79,12 +79,12 @@ describe('settingsReducer', () => {
     test('changes value of a key', () => {
       const action = deepFreeze({
         type: SET_GLOBAL_SETTINGS,
-        update: { theme: 'night' },
+        update: { theme: 'dark' },
       });
 
       const expectedState = {
         ...baseState,
-        theme: 'night',
+        theme: 'dark',
       };
 
       const actualState = settingsReducer(baseState, action);

diff --git a/src/storage/__tests__/migrations-test.js b/src/storage/__tests__/migrations-test.js
@@ -104,7 +104,7 @@ describe('migrations', () => {
   // What `base` becomes after all migrations.
   const endBase = {
     ...base52,
-    migrations: { version: 56 },
+    migrations: { version: 57 },
   };
 
   for (const [desc, before, after] of [
@@ -278,6 +278,20 @@ describe('migrations', () => {
       },
       { ...endBase, settings: { ...endBase.settings, markMessagesReadOnScroll: 'never' } },
     ],
+    [
+      "check 57 with 'night'",
+      { ...base52, migrations: { version: 56 }, settings: { ...base52.settings, theme: 'night' } },
+      { ...endBase, settings: { ...endBase.settings, theme: 'dark' } },
+    ],
+    [
+      "check 57 with 'default'",
+      {
+        ...base52,
+        migrations: { version: 56 },
+        settings: { ...base52.settings, theme: 'default' },
+      },
+      { ...endBase, settings: { ...endBase.settings, theme: 'default' } },
+    ],
   ]) {
     /* eslint-disable no-loop-func */
     test(desc, async () => {

diff --git a/src/storage/migrations.js b/src/storage/migrations.js
@@ -472,6 +472,12 @@ const migrationsInner: {| [string]: (LessPartialState) => LessPartialState |} =
   // Add presenceEnabled to state.realm.
   '56': dropCache,
 
+  // Rename 'night' to 'dark' in state.settings.theme
+  '57': state => ({
+    ...state,
+    settings: { ...state.settings, theme: state.settings.theme === 'night' ? 'dark' : 'default' },
+  }),
+
   // TIP: When adding a migration, consider just using `dropCache`.
   //   (See its jsdoc for guidance on when that's the right answer.)
 };

diff --git a/static/translations/messages_ar.json b/static/translations/messages_ar.json
@@ -157,7 +157,7 @@
   "Learn more": "تعرف على المزيد",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "الوضع الليلي",
+  "Night mode": "الوضع الليلي",
   "Open links with in-app browser": "افتح الروابط باستخدام متصفح داخل التطبيق",
   "Language": "لغة",
   "Arabic": "عربي",

diff --git a/static/translations/messages_bg.json b/static/translations/messages_bg.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Настройки",
-  "Dark theme": "Нощен режим",
+  "Night mode": "Нощен режим",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Език",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_bn.json b/static/translations/messages_bn.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "সেটিংস",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_ca.json b/static/translations/messages_ca.json
@@ -157,7 +157,7 @@
   "Learn more": "Més informació",
   "Full profile": "Full profile",
   "Settings": "Configuració",
-  "Dark theme": "Mode nocturn",
+  "Night mode": "Mode nocturn",
   "Open links with in-app browser": "Obre els enllaços en el navegador intern",
   "Language": "Llengua",
   "Arabic": "Àrab",

diff --git a/static/translations/messages_cs.json b/static/translations/messages_cs.json
@@ -157,7 +157,7 @@
   "Learn more": "Dozvědět se více",
   "Full profile": "Celý profil",
   "Settings": "Nastavení",
-  "Dark theme": "Noční režim",
+  "Night mode": "Noční režim",
   "Open links with in-app browser": "Otevírat odkazy v zabudovaném prohlížeči",
   "Language": "Jazyk",
   "Arabic": "Arabština",

diff --git a/static/translations/messages_cy.json b/static/translations/messages_cy.json
@@ -157,7 +157,7 @@
   "Learn more": "Dysgu mwy",
   "Full profile": "Full profile",
   "Settings": "Gosodiadau",
-  "Dark theme": "Modd nos",
+  "Night mode": "Modd nos",
   "Open links with in-app browser": "Agor dolenni gyda porwr mewn-app",
   "Language": "Iaith",
   "Arabic": "Arabeg",

diff --git a/static/translations/messages_da.json b/static/translations/messages_da.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Sprog",
   "Arabic": "Arabisk",

diff --git a/static/translations/messages_de.json b/static/translations/messages_de.json
@@ -157,7 +157,7 @@
   "Learn more": "Mehr erfahren",
   "Full profile": "Vollständiges Profil",
   "Settings": "Einstellungen",
-  "Dark theme": "Nachtmodus",
+  "Night mode": "Nachtmodus",
   "Open links with in-app browser": "Links mit in-app Browser öffnen",
   "Language": "Sprache",
   "Arabic": "Arabisch",

diff --git a/static/translations/messages_el.json b/static/translations/messages_el.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_el_GR.json b/static/translations/messages_el_GR.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_en_GB.json b/static/translations/messages_en_GB.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_en_NG.json b/static/translations/messages_en_NG.json
@@ -142,7 +142,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_eo.json b/static/translations/messages_eo.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_es.json b/static/translations/messages_es.json
@@ -157,7 +157,7 @@
   "Learn more": "Aprender más",
   "Full profile": "Full profile",
   "Settings": "Ajustes",
-  "Dark theme": "Modo noche",
+  "Night mode": "Modo noche",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Idioma",
   "Arabic": "Árabe",

diff --git a/static/translations/messages_fa.json b/static/translations/messages_fa.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "تنظیمات",
-  "Dark theme": "حالت شبانه",
+  "Night mode": "حالت شبانه",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "زبان",
   "Arabic": "عربی",

diff --git a/static/translations/messages_fi.json b/static/translations/messages_fi.json
@@ -157,7 +157,7 @@
   "Learn more": "Lisätietoja",
   "Full profile": "Täysi profiili",
   "Settings": "Asetukset",
-  "Dark theme": "Yötila",
+  "Night mode": "Yötila",
   "Open links with in-app browser": "Avaa linkit sovelluksen sisäisellä selaimella",
   "Language": "Kieli",
   "Arabic": "Arabia",

diff --git a/static/translations/messages_fr.json b/static/translations/messages_fr.json
@@ -157,7 +157,7 @@
   "Learn more": "En apprendre plus",
   "Full profile": "Profil complet",
   "Settings": "Paramètres",
-  "Dark theme": "Mode nuit",
+  "Night mode": "Mode nuit",
   "Open links with in-app browser": "Ouvrir les liens avec le navigateur intégré",
   "Language": "Langue",
   "Arabic": "Arabe",

diff --git a/static/translations/messages_gl.json b/static/translations/messages_gl.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Configuración",
-  "Dark theme": "Modo nocturno",
+  "Night mode": "Modo nocturno",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Lingua",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_gu.json b/static/translations/messages_gu.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_hi.json b/static/translations/messages_hi.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "सेटिंग्स",
-  "Dark theme": "रात्री स्वरुप",
+  "Night mode": "रात्री स्वरुप",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "भाषा",
   "Arabic": "अरबी",

diff --git a/static/translations/messages_hr.json b/static/translations/messages_hr.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_hu.json b/static/translations/messages_hu.json
@@ -157,7 +157,7 @@
   "Learn more": "Tudj meg többet",
   "Full profile": "Teljes profil",
   "Settings": "Beállítások",
-  "Dark theme": "Éjszakai mód",
+  "Night mode": "Éjszakai mód",
   "Open links with in-app browser": "A linkek appon belüli böngészővel nyíljanak meg",
   "Language": "Nyelv",
   "Arabic": "Arab",

diff --git a/static/translations/messages_id.json b/static/translations/messages_id.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Pengaturan",
-  "Dark theme": "Mode malam",
+  "Night mode": "Mode malam",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Bahasa",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_it.json b/static/translations/messages_it.json
@@ -157,7 +157,7 @@
   "Learn more": "Per saperne di più.",
   "Full profile": "Profilo completo",
   "Settings": "Impostazioni",
-  "Dark theme": "Modalità notturna",
+  "Night mode": "Modalità notturna",
   "Open links with in-app browser": "Apri i link con il browser dell'app",
   "Language": "Lingua",
   "Arabic": "Arabo",

diff --git a/static/translations/messages_ja.json b/static/translations/messages_ja.json
@@ -157,7 +157,7 @@
   "Learn more": "詳細",
   "Full profile": "全てのプロフィール",
   "Settings": "設定",
-  "Dark theme": "夜間モード",
+  "Night mode": "夜間モード",
   "Open links with in-app browser": "リンクをアプリ内ブラウザで開く",
   "Language": "言語",
   "Arabic": "アラビア語",

diff --git a/static/translations/messages_ko.json b/static/translations/messages_ko.json
@@ -157,7 +157,7 @@
   "Learn more": "좀 더 알아보기",
   "Full profile": "Full profile",
   "Settings": "설정",
-  "Dark theme": "야간모드",
+  "Night mode": "야간모드",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "언어",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_lt.json b/static/translations/messages_lt.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Nustatymai",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_ml.json b/static/translations/messages_ml.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "സജ്ജീകരണങ്ങൾ",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_mn.json b/static/translations/messages_mn.json
@@ -157,7 +157,7 @@
   "Learn more": "Илүү ихийг харах",
   "Full profile": "Full profile",
   "Settings": "Тохиргоо",
-  "Dark theme": "Хар төлөв",
+  "Night mode": "Хар төлөв",
   "Open links with in-app browser": "Өөр browser дээр холбоосыг нээх",
   "Language": "Хэл",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_my.json b/static/translations/messages_my.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_nl.json b/static/translations/messages_nl.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Instellingen",
-  "Dark theme": "Nachtstand",
+  "Night mode": "Nachtstand",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Taal",
   "Arabic": "Arabisch",

diff --git a/static/translations/messages_no.json b/static/translations/messages_no.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Innstillinger",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_pa.json b/static/translations/messages_pa.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_pcm.json b/static/translations/messages_pcm.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Settings",
-  "Dark theme": "Dark theme",
+  "Night mode": "Night mode",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Language",
   "Arabic": "Arabic",

diff --git a/static/translations/messages_pl.json b/static/translations/messages_pl.json
@@ -157,7 +157,7 @@
   "Learn more": "Learn more",
   "Full profile": "Full profile",
   "Settings": "Ustawienia",
-  "Dark theme": "Tryb nocny",
+  "Night mode": "Tryb nocny",
   "Open links with in-app browser": "Open links with in-app browser",
   "Language": "Język",
   "Arabic": "Arabski",