Apply most review suggestions

TTLApp · Jan 3, 2025 · d21554c · d21554c
1 parent 2149f30
commit d21554c
Show file tree

Hide file tree

Showing 33 changed files with 116 additions and 109 deletions.
diff --git a/__tests__/__renderer__/preferences.mjs b/__tests__/__renderer__/preferences.mjs
@@ -6,6 +6,7 @@ import '../../__mocks__/jquery.mjs';
 import assert from 'assert';
 import fs from 'fs';
 import { JSDOM } from 'jsdom';
+import sinon from 'sinon';
 import path from 'path';
 
 import { rootDir } from '../../js/app-config.mjs';
@@ -16,6 +17,8 @@ import {
     savePreferences,
 } from '../../js/user-preferences.mjs';
 import { preferencesApi } from '../../renderer/preload-scripts/preferences-api.mjs';
+import { i18nTranslatorMock } from '../../renderer/i18n-translator.js';
+i18nTranslatorMock.mock('getTranslationInLanguageData', sinon.stub().returnsThis());
 
 const isCheckBox = true;
 const weekdays = [
@@ -296,14 +299,6 @@ describe('Test Preferences Window', () =>
             listenerLanguage();
         });
 
-        it('Click reset and check button text change', () =>
-        {
-            const resetText = $('#reset-button').text();
-            $('#reset-button').trigger('click');
-            const resetTextAfterClick = $('#reset-button').text();
-            assert.notStrictEqual(resetText, resetTextAfterClick);
-        });
-
         it('Click reset and check that setting was restored', () =>
         {
             changeItemValue('count-today', true);

diff --git a/css/styles.css b/css/styles.css
@@ -64,7 +64,6 @@ html[data-theme="dark"] {
   --table-header-label-shadow: var(--table-border);
   --error: red;
   --punch-bground: rgb(164 158 207);
-  --reset-color: rgb(242 93 77);
   --punch-color: white;
   --punch-disable-bground: rgb(134 134 134);
   --slider-background-color: var(--table-cell-offtime-bground);
@@ -101,7 +100,6 @@ html[data-theme="cadent-star"] {
   --table-header-label-bground: rgb(255 238 227 / 90%);
   --table-header-label-shadow: var(--table-border);
   --error: red;
-  --reset-color: rgb(242 93 77);
   --punch-bground: var(--table-total-border);
   --punch-color: rgb(228 228 228);
   --punch-disable-bground: rgb(134 134 134);
@@ -699,7 +697,7 @@ input:disabled + .slider {
   text-align: center;
 }
 
-#preferences-window .reset-button {
+#preferences-window #reset-button {
   opacity: 0.9;
   width: 25%;
   height: 24px;
@@ -708,6 +706,10 @@ input:disabled + .slider {
   background-color: var(--reset-color);
 }
 
+#preferences-window #reset-button:hover {
+  background-color: hsl(0, 100%, 60%);
+}
+
 /* Waiver page styles */
 
 #workday-waiver-window .section-title {

diff --git a/locales/bn/translation.json b/locales/bn/translation.json
@@ -142,7 +142,7 @@
         "numberOfEntries": "এন্ট্রির সংখ্যা",
         "overallBalanceStart": "সামগ্রিক ব্যালেন্স শুরুর তারিখ",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "শনি",
         "startOnLogin": "লগইন শুরু করুন",

diff --git a/locales/ca/translation.json b/locales/ca/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Nombre de entrades",
         "overallBalanceStart": "Balanç general Data D'inici",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Dis",
         "startOnLogin": "Començar al inici de sessió",

diff --git a/locales/de-DE/translation.json b/locales/de-DE/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Anzahl an Einträgen",
         "overallBalanceStart": "Gesamtbilanz Startdatum",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sa",
         "startOnLogin": "Starten beim Login",

diff --git a/locales/el/translation.json b/locales/el/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Αριθμός εγγραφών",
         "overallBalanceStart": "Ημερομηνία Έναρξης Συνολικού Ισοζυγίου",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Σαβ",
         "startOnLogin": "Εκκίνηση κατά την είσοδο στο σύστημα",

diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Number of Entries",
         "overallBalanceStart": "Overall Balance Start Date",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sat",
         "startOnLogin": "Start on Login",

diff --git a/locales/es/translation.json b/locales/es/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Número de entradas",
         "overallBalanceStart": "Balance general Fecha de inicio",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sáb",
         "startOnLogin": "Comienza en Login",

diff --git a/locales/fa-IR/translation.json b/locales/fa-IR/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "تعداد موارد",
         "overallBalanceStart": "تاریخ شروع محاسبه اختلاف ساعت های کاری",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "شنبه",
         "startOnLogin": "بازکردن هنگام ورود به سیستم",

diff --git a/locales/fr-FR/translation.json b/locales/fr-FR/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Nombre d'entrées",
         "overallBalanceStart": "Date de début du solde global",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sam",
         "startOnLogin": "Lancer au démarrage",

diff --git a/locales/gu/translation.json b/locales/gu/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "પ્રવેશોની સંખ્યા",
         "overallBalanceStart": "એકંદરે બેલેન્સ પ્રારંભ તારીખ",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "શનિ",
         "startOnLogin": "લોગિન પર પ્રારંભ કરો",

diff --git a/locales/he/translation.json b/locales/he/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "כמות רשומות",
         "overallBalanceStart": "זמן התחלה של מאזן כללי",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "יום שבת",
         "startOnLogin": "התחל בעת חיבור",

diff --git a/locales/hi/translation.json b/locales/hi/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "प्रविष्टियोंकी संख्या",
         "overallBalanceStart": "ओवरऑल बैलेंस स्टार्ट डेट",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "शनि",
         "startOnLogin": "लॉगिन पर शुरू करें",

diff --git a/locales/id/translation.json b/locales/id/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Jumlah Entri",
         "overallBalanceStart": "Rata Rata Keseluruhan Tanggal Mulai ",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sab",
         "startOnLogin": "Mulai saat Login",

diff --git a/locales/it/translation.json b/locales/it/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Numero di record",
         "overallBalanceStart": "Data di inizio bilanciamento complessivo",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sab",
         "startOnLogin": "Avvia al login",

diff --git a/locales/ja/translation.json b/locales/ja/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "記録の数",
         "overallBalanceStart": "累計計算の開始日",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "土",
         "startOnLogin": "ログイン時に起動",

diff --git a/locales/ko/translation.json b/locales/ko/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "하루 작업 단위 개수",
         "overallBalanceStart": "총 작업 달성도 집계 시작일",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "토",
         "startOnLogin": "시스템 시작 시 자동 실행",

diff --git a/locales/mr/translation.json b/locales/mr/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "प्रवेशांची संख्या",
         "overallBalanceStart": "एकूणच शिल्लक प्रारंभ तारीख",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "शनि",
         "startOnLogin": "लॉगिन वर प्रारंभ करा",

diff --git a/locales/nl/translation.json b/locales/nl/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Aantal invoergegevens",
         "overallBalanceStart": "Algemeen overzicht startdatum",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Za",
         "startOnLogin": "Starten met inloggen",

diff --git a/locales/pl/translation.json b/locales/pl/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Liczba wpisów",
         "overallBalanceStart": "Data rozpoczęcia ogólnej statystyki",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sob",
         "startOnLogin": "Uruchom przy starcie systemu",

diff --git a/locales/pt-BR/translation.json b/locales/pt-BR/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Número de entradas",
         "overallBalanceStart": "Data de início do balanço total",
         "reset": "Restaurar",
-        "resetted": "Restaurado!",
+        "reset-success": "Preferências restauradas para o padrão com sucesso!",
         "reset-preferences": "Restaurar preferências padrão",
         "sat": "Sáb",
         "startOnLogin": "Iniciar com Login",

diff --git a/locales/pt-MI/translation.json b/locales/pt-MI/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Número de entradas",
         "overallBalanceStart": "Data de início do balanço total",
         "reset": "Resetá",
-        "resetted": "Resetô!",
+        "reset-success": "Vortamo direitin as preferência pro padrão!",
         "reset-preferences": "Resetá pros trem original",
         "sat": "Sáb",
         "startOnLogin": "Iniciar com Login",

diff --git a/locales/pt-PT/translation.json b/locales/pt-PT/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Número de Registos",
         "overallBalanceStart": "Data de Início do Balanço Total",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Sáb",
         "startOnLogin": "Iniciar com o Login",

diff --git a/locales/ru-RU/translation.json b/locales/ru-RU/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Количество записей",
         "overallBalanceStart": "Дата начала общей статистики",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Сб",
         "startOnLogin": "Войти",

diff --git a/locales/sv-SE/translation.json b/locales/sv-SE/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Antal poster",
         "overallBalanceStart": "Startdatum för totalsaldo",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Lör",
         "startOnLogin": "Start vid inloggning",

diff --git a/locales/ta/translation.json b/locales/ta/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "உள்ளீடுகளின் எண்ணிக்கை",
         "overallBalanceStart": "ஒட்டுமொத்த இருப்பு தொடக்க தேதி",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "சனி",
         "startOnLogin": "உள்நுழைவில் தொடங்கவும்",

diff --git a/locales/th-TH/translation.json b/locales/th-TH/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "จำนวนรายการ",
         "overallBalanceStart": "ภาพรวมชั่วโมงที่เหลือในวันเริ่ม",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "เสาร์",
         "startOnLogin": "เริ่มเมื่อเข้าสู่ระบบ",

diff --git a/locales/tr-TR/translation.json b/locales/tr-TR/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Girdi Sayısı",
         "overallBalanceStart": "Başlangıç Tarihinden İtibaren Genel Bilanço",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Cmt",
         "startOnLogin": "Giriş Yap",

diff --git a/locales/uk-UA/translation.json b/locales/uk-UA/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "Кількість записів",
         "overallBalanceStart": "Дата початку загального балансу",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "Сб",
         "startOnLogin": "Автозапуск при вході в систему",

diff --git a/locales/zh-CN/translation.json b/locales/zh-CN/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "纪录数量",
         "overallBalanceStart": "总体结余开始日期",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "六",
         "startOnLogin": "登入系统后自动启动程序",

diff --git a/locales/zh-TW/translation.json b/locales/zh-TW/translation.json
@@ -141,7 +141,7 @@
         "numberOfEntries": "紀錄數量",
         "overallBalanceStart": "總體結餘開始日期",
         "reset": "Reset",
-        "resetted": "Reset!",
+        "reset-success": "Preferences successfully reset to default!",
         "reset-preferences": "Reset to default preferences",
         "sat": "六",
         "startOnLogin": "登入系統後自動啟動程序",

diff --git a/src/preferences.html b/src/preferences.html
@@ -124,7 +124,7 @@
             <div class="section-title" data-i18n="$Preferences.reset">Reset</div>
             <div class="flex-box" name="preferences-area">
                 <p><i class="fas fa-undo"></i><span data-i18n="$Preferences.reset-preferences">Reset to default preferences</span></p>
-                <button class="reset-button" name="reset-button" id="reset-button" type="button" data-i18n="$Preferences.reset">
+                <button name="reset-button" id="reset-button" type="button" data-i18n="$Preferences.reset">
                     Reset
                 </button>
             </div>