Merge branch 'master' into fix-match-update

mikiher · Feb 25, 2024 · 4a36a3c · 4a36a3c
2 parents 0f4b114 + d8b9f08
commit 4a36a3c
Show file tree

Hide file tree

Showing 23 changed files with 975 additions and 21 deletions.
diff --git a/client/components/stats/YearInReviewBanner.vue b/client/components/stats/YearInReviewBanner.vue
@@ -7,9 +7,10 @@
     </div>
 
     <div class="flex items-center">
-      <p class="hidden md:block text-xl font-semibold">{{ yearInReviewYear }} Year in Review</p>
+      <p class="hidden md:block text-xl font-semibold">{{ $getString('HeaderYearReview', [yearInReviewYear]) }}</p>
       <div class="hidden md:block flex-grow" />
-      <ui-btn class="w-full md:w-auto" @click.stop="clickShowYearInReview">{{ showYearInReview ? 'Hide Year in Review' : 'See Year in Review' }}</ui-btn>
+      <ui-btn class="w-full md:w-auto" @click.stop="clickShowYearInReview">{{ showYearInReview ? $strings.LabelYearReviewHide :
+        $strings.LabelYearReviewShow }}</ui-btn>
     </div>
 
     <!-- your year in review -->
@@ -20,24 +21,27 @@
         <!-- previous button -->
         <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
           <span class="material-icons text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
-          <span class="hidden sm:inline-block pr-2">Previous</span>
+          <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
         </ui-btn>
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview"> Share </ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview">{{
+          $strings.ButtonShare }}
+        </ui-btn>
 
         <div class="flex-grow" />
-        <p class="hidden sm:block text-lg font-semibold">Your Year in Review ({{ yearInReviewVariant + 1 }})</p>
+        <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelPersonalYearReview', [yearInReviewVariant + 1]) }}
+        </p>
         <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewVariant + 1 }}</p>
         <div class="flex-grow" />
 
         <!-- refresh button -->
         <ui-btn small :disabled="processingYearInReview" class="inline-flex items-center font-semibold mr-1 sm:mr-2" @click="refreshYearInReview">
-          <span class="hidden sm:inline-block">Refresh</span>
+          <span class="hidden sm:inline-block">{{ $strings.ButtonRefresh }}</span>
           <span class="material-icons sm:!hidden text-lg py-px">refresh</span>
         </ui-btn>
         <!-- next button -->
         <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
-          <span class="hidden sm:inline-block pl-2">Next</span>
+          <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
           <span class="material-icons-outlined text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
         </ui-btn>
       </div>
@@ -46,7 +50,7 @@
       <!-- your year in review short -->
       <div class="w-full max-w-[800px] mx-auto my-4">
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex sm:hidden items-center font-semibold mb-1" @click="shareYearInReviewShort"> Share </ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex sm:hidden items-center font-semibold mb-1" @click="shareYearInReviewShort">{{ $strings.ButtonShare }}</ui-btn>
         <stats-year-in-review-short ref="yearInReviewShort" :year="yearInReviewYear" :processing.sync="processingYearInReviewShort" />
       </div>
 
@@ -56,24 +60,25 @@
           <!-- previous button -->
           <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
             <span class="material-icons text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
-            <span class="hidden sm:inline-block pr-2">Previous</span>
+            <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
           </ui-btn>
           <!-- share button -->
-          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer"> Share </ui-btn>
+          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer">{{ $strings.ButtonShare }}
+          </ui-btn>
 
           <div class="flex-grow" />
-          <p class="hidden sm:block text-lg font-semibold">Server Year in Review ({{ yearInReviewServerVariant + 1 }})</p>
+          <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelServerYearReview', [yearInReviewServerVariant + 1]) }}</p>
           <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewServerVariant + 1 }}</p>
           <div class="flex-grow" />
 
           <!-- refresh button -->
           <ui-btn small :disabled="processingYearInReviewServer" class="inline-flex items-center font-semibold mr-1 sm:mr-2" @click="refreshYearInReviewServer">
-            <span class="hidden sm:inline-block">Refresh</span>
+            <span class="hidden sm:inline-block">{{ $strings.ButtonRefresh }}</span>
             <span class="material-icons sm:!hidden text-lg py-px">refresh</span>
           </ui-btn>
           <!-- next button -->
           <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
-            <span class="hidden sm:inline-block pl-2">Next</span>
+            <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
             <span class="material-icons-outlined text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
           </ui-btn>
         </div>

diff --git a/client/pages/login.vue b/client/pages/login.vue
@@ -10,9 +10,9 @@
 
         <form @submit.prevent="submitServerSetup">
           <p class="text-lg font-semibold mb-2 pl-1 text-center">Create Root User</p>
-          <ui-text-input-with-label v-model="newRoot.username" label="Username" :disabled="processing" class="w-full mb-3 text-sm" />
-          <ui-text-input-with-label v-model="newRoot.password" label="Password" type="password" :disabled="processing" class="w-full mb-3 text-sm" />
-          <ui-text-input-with-label v-model="confirmPassword" label="Confirm Password" type="password" :disabled="processing" class="w-full mb-3 text-sm" />
+          <ui-text-input-with-label v-model.trim="newRoot.username" label="Username" :disabled="processing" class="w-full mb-3 text-sm" />
+          <ui-text-input-with-label v-model.trim="newRoot.password" label="Password" type="password" :disabled="processing" class="w-full mb-3 text-sm" />
+          <ui-text-input-with-label v-model.trim="confirmPassword" label="Confirm Password" type="password" :disabled="processing" class="w-full mb-3 text-sm" />
 
           <p class="text-lg font-semibold mt-6 mb-2 pl-1 text-center">Directory Paths</p>
           <ui-text-input-with-label v-model="ConfigPath" label="Config Path" disabled class="w-full mb-3 text-sm" />
@@ -34,10 +34,10 @@
 
         <form v-show="login_local" @submit.prevent="submitForm">
           <label class="text-xs text-gray-300 uppercase">{{ $strings.LabelUsername }}</label>
-          <ui-text-input v-model="username" :disabled="processing" class="mb-3 w-full" />
+          <ui-text-input v-model.trim="username" :disabled="processing" class="mb-3 w-full" />
 
           <label class="text-xs text-gray-300 uppercase">{{ $strings.LabelPassword }}</label>
-          <ui-text-input v-model="password" type="password" :disabled="processing" class="w-full mb-3" />
+          <ui-text-input v-model.trim="password" type="password" :disabled="processing" class="w-full mb-3" />
           <div class="w-full flex justify-end py-3">
             <ui-btn type="submit" :disabled="processing" color="primary" class="leading-none">{{ processing ? 'Checking...' : $strings.ButtonSubmit }}</ui-btn>
           </div>

diff --git a/client/plugins/i18n.js b/client/plugins/i18n.js
@@ -10,6 +10,7 @@ const languageCodeMap = {
   'de': { label: 'Deutsch', dateFnsLocale: 'de' },
   'en-us': { label: 'English', dateFnsLocale: 'enUS' },
   'es': { label: 'Español', dateFnsLocale: 'es' },
+  'et': { label: 'Eesti', dateFnsLocale: 'et' },
   'fr': { label: 'Français', dateFnsLocale: 'fr' },
   'hr': { label: 'Hrvatski', dateFnsLocale: 'hr' },
   'it': { label: 'Italiano', dateFnsLocale: 'it' },

diff --git a/client/strings/cs.json b/client/strings/cs.json
@@ -43,6 +43,7 @@
   "ButtonMatchAllAuthors": "Spárovat všechny autory",
   "ButtonMatchBooks": "Spárovat Knihy",
   "ButtonNevermind": "Nevadí",
+  "ButtonNext": "Next",
   "ButtonNextChapter": "Next Chapter",
   "ButtonOk": "Ok",
   "ButtonOpenFeed": "Otevřít kanál",
@@ -51,6 +52,7 @@
   "ButtonPlay": "Přehrát",
   "ButtonPlaying": "Hraje",
   "ButtonPlaylists": "Seznamy skladeb",
+  "ButtonPrevious": "Previous",
   "ButtonPreviousChapter": "Previous Chapter",
   "ButtonPurgeAllCache": "Vyčistit veškerou mezipaměť",
   "ButtonPurgeItemsCache": "Vyčistit mezipaměť položek",
@@ -59,6 +61,7 @@
   "ButtonQueueRemoveItem": "Odstranit z fronty",
   "ButtonQuickMatch": "Rychlé přiřazení",
   "ButtonRead": "Číst",
+  "ButtonRefresh": "Refresh",
   "ButtonRemove": "Odstranit",
   "ButtonRemoveAll": "Odstranit vše",
   "ButtonRemoveAllLibraryItems": "Odstranit všechny položky knihovny",
@@ -78,6 +81,7 @@
   "ButtonSelectFolderPath": "Vybrat cestu ke složce",
   "ButtonSeries": "Série",
   "ButtonSetChaptersFromTracks": "Nastavit kapitoly ze stop",
+  "ButtonShare": "Share",
   "ButtonShiftTimes": "Časy posunu",
   "ButtonShow": "Zobrazit",
   "ButtonStartM4BEncode": "Spustit kódování M4B",
@@ -180,6 +184,7 @@
   "HeaderUpdateDetails": "Aktualizovat podrobnosti",
   "HeaderUpdateLibrary": "Aktualizovat knihovnu",
   "HeaderUsers": "Uživatelé",
+  "HeaderYearReview": "Year {0} in Review",
   "HeaderYourStats": "Vaše statistiky",
   "LabelAbridged": "Zkráceno",
   "LabelAccountType": "Typ účtu",
@@ -391,6 +396,7 @@
   "LabelPermissionsDownload": "Může stahovat",
   "LabelPermissionsUpdate": "Může aktualizovat",
   "LabelPermissionsUpload": "Může nahrávat",
+  "LabelPersonalYearReview": "Your Year in Review ({0})",
   "LabelPhotoPathURL": "Cesta k fotografii/URL",
   "LabelPlaylists": "Seznamy skladeb",
   "LabelPlayMethod": "Metoda přehrávání",
@@ -436,6 +442,7 @@
   "LabelSeries": "Série",
   "LabelSeriesName": "Název série",
   "LabelSeriesProgress": "Průběh série",
+  "LabelServerYearReview": "Server Year in Review ({0})",
   "LabelSetEbookAsPrimary": "Nastavit jako primární",
   "LabelSetEbookAsSupplementary": "Nastavit jako doplňkové",
   "LabelSettingsAudiobooksOnly": "Pouze audioknihy",
@@ -552,6 +559,8 @@
   "LabelViewQueue": "Zobrazit frontu přehrávače",
   "LabelVolume": "Hlasitost",
   "LabelWeekdaysToRun": "Dny v týdnu ke spuštění",
+  "LabelYearReviewHide": "Hide Year in Review",
+  "LabelYearReviewShow": "See Year in Review",
   "LabelYourAudiobookDuration": "Doba trvání vaší audioknihy",
   "LabelYourBookmarks": "Vaše záložky",
   "LabelYourPlaylists": "Vaše seznamy přehrávání",

diff --git a/client/strings/da.json b/client/strings/da.json
@@ -43,6 +43,7 @@
   "ButtonMatchAllAuthors": "Match alle forfattere",
   "ButtonMatchBooks": "Match bøger",
   "ButtonNevermind": "Glem det",
+  "ButtonNext": "Next",
   "ButtonNextChapter": "Next Chapter",
   "ButtonOk": "OK",
   "ButtonOpenFeed": "Åbn feed",
@@ -51,6 +52,7 @@
   "ButtonPlay": "Afspil",
   "ButtonPlaying": "Afspiller",
   "ButtonPlaylists": "Afspilningslister",
+  "ButtonPrevious": "Previous",
   "ButtonPreviousChapter": "Previous Chapter",
   "ButtonPurgeAllCache": "Ryd al cache",
   "ButtonPurgeItemsCache": "Ryd elementcache",
@@ -59,6 +61,7 @@
   "ButtonQueueRemoveItem": "Fjern fra kø",
   "ButtonQuickMatch": "Hurtig Match",
   "ButtonRead": "Læs",
+  "ButtonRefresh": "Refresh",
   "ButtonRemove": "Fjern",
   "ButtonRemoveAll": "Fjern Alle",
   "ButtonRemoveAllLibraryItems": "Fjern Alle Bibliotekselementer",
@@ -78,6 +81,7 @@
   "ButtonSelectFolderPath": "Vælg Mappen Sti",
   "ButtonSeries": "Serie",
   "ButtonSetChaptersFromTracks": "Sæt kapitler fra spor",
+  "ButtonShare": "Share",
   "ButtonShiftTimes": "Skift Tider",
   "ButtonShow": "Vis",
   "ButtonStartM4BEncode": "Start M4B Kode",
@@ -180,6 +184,7 @@
   "HeaderUpdateDetails": "Opdater Detaljer",
   "HeaderUpdateLibrary": "Opdater Bibliotek",
   "HeaderUsers": "Brugere",
+  "HeaderYearReview": "Year {0} in Review",
   "HeaderYourStats": "Dine Statistikker",
   "LabelAbridged": "Abridged",
   "LabelAccountType": "Kontotype",
@@ -391,6 +396,7 @@
   "LabelPermissionsDownload": "Kan downloade",
   "LabelPermissionsUpdate": "Kan opdatere",
   "LabelPermissionsUpload": "Kan uploade",
+  "LabelPersonalYearReview": "Your Year in Review ({0})",
   "LabelPhotoPathURL": "Foto sti/URL",
   "LabelPlaylists": "Afspilningslister",
   "LabelPlayMethod": "Afspilningsmetode",
@@ -436,6 +442,7 @@
   "LabelSeries": "Serie",
   "LabelSeriesName": "Serienavn",
   "LabelSeriesProgress": "Seriefremskridt",
+  "LabelServerYearReview": "Server Year in Review ({0})",
   "LabelSetEbookAsPrimary": "Indstil som primær",
   "LabelSetEbookAsSupplementary": "Indstil som supplerende",
   "LabelSettingsAudiobooksOnly": "Kun lydbøger",
@@ -552,6 +559,8 @@
   "LabelViewQueue": "Se afspilningskø",
   "LabelVolume": "Volumen",
   "LabelWeekdaysToRun": "Ugedage til kørsel",
+  "LabelYearReviewHide": "Hide Year in Review",
+  "LabelYearReviewShow": "See Year in Review",
   "LabelYourAudiobookDuration": "Din lydbogsvarighed",
   "LabelYourBookmarks": "Dine bogmærker",
   "LabelYourPlaylists": "Dine spillelister",

diff --git a/client/strings/de.json b/client/strings/de.json
@@ -43,6 +43,7 @@
   "ButtonMatchAllAuthors": "Online Metadaten-Abgleich (alle Autoren)",
   "ButtonMatchBooks": "Online Metadaten-Abgleich (alle Medien)",
   "ButtonNevermind": "Abbrechen",
+  "ButtonNext": "Next",
   "ButtonNextChapter": "Nächstes Kapitel",
   "ButtonOk": "Ok",
   "ButtonOpenFeed": "Feed öffnen",
@@ -51,6 +52,7 @@
   "ButtonPlay": "Abspielen",
   "ButtonPlaying": "Spielt",
   "ButtonPlaylists": "Wiedergabelisten",
+  "ButtonPrevious": "Previous",
   "ButtonPreviousChapter": "Vorheriges Kapitel",
   "ButtonPurgeAllCache": "Cache leeren",
   "ButtonPurgeItemsCache": "Lösche Medien-Cache",
@@ -59,6 +61,7 @@
   "ButtonQueueRemoveItem": "Aus der Warteschlange entfernen",
   "ButtonQuickMatch": "Schnellabgleich",
   "ButtonRead": "Lesen",
+  "ButtonRefresh": "Neu Laden",
   "ButtonRemove": "Löschen",
   "ButtonRemoveAll": "Alles löschen",
   "ButtonRemoveAllLibraryItems": "Lösche alle Bibliothekseinträge",
@@ -78,6 +81,7 @@
   "ButtonSelectFolderPath": "Ordnerpfad auswählen",
   "ButtonSeries": "Serien",
   "ButtonSetChaptersFromTracks": "Kapitelerstellung aus Audiodateien",
+  "ButtonShare": "Teilen",
   "ButtonShiftTimes": "Zeitverschiebung",
   "ButtonShow": "Anzeigen",
   "ButtonStartM4BEncode": "M4B-Kodierung starten",
@@ -180,6 +184,7 @@
   "HeaderUpdateDetails": "Details aktualisieren",
   "HeaderUpdateLibrary": "Bibliothek aktualisieren",
   "HeaderUsers": "Benutzer",
+  "HeaderYearReview": "Jahr {0} in Übersicht",
   "HeaderYourStats": "Eigene Statistiken",
   "LabelAbridged": "Gekürzt",
   "LabelAccountType": "Kontoart",
@@ -391,6 +396,7 @@
   "LabelPermissionsDownload": "Herunterladen",
   "LabelPermissionsUpdate": "Aktualisieren",
   "LabelPermissionsUpload": "Hochladen",
+  "LabelPersonalYearReview": "Dein Jahr in Übersicht ({0})",
   "LabelPhotoPathURL": "Foto Pfad/URL",
   "LabelPlaylists": "Wiedergabelisten",
   "LabelPlayMethod": "Abspielmethode",
@@ -436,6 +442,7 @@
   "LabelSeries": "Serien",
   "LabelSeriesName": "Serienname",
   "LabelSeriesProgress": "Serienfortschritt",
+  "LabelServerYearReview": "Server Jahr in Übersicht ({0})",
   "LabelSetEbookAsPrimary": "Als Hauptbuch setzen",
   "LabelSetEbookAsSupplementary": "Als Ergänzung setzen",
   "LabelSettingsAudiobooksOnly": "Nur Hörbücher",
@@ -552,6 +559,8 @@
   "LabelViewQueue": "Player-Warteschlange anzeigen",
   "LabelVolume": "Lautstärke",
   "LabelWeekdaysToRun": "Wochentage für die Ausführung",
+  "LabelYearReviewHide": "Verstecke Jahr in Übersicht",
+  "LabelYearReviewShow": "Zeige Jahr in Übersicht",
   "LabelYourAudiobookDuration": "Laufzeit deines Mediums",
   "LabelYourBookmarks": "Lesezeichen",
   "LabelYourPlaylists": "Eigene Wiedergabelisten",
@@ -765,4 +774,4 @@
   "ToastSocketFailedToConnect": "Verbindung zum WebSocket fehlgeschlagen",
   "ToastUserDeleteFailed": "Benutzer konnte nicht gelöscht werden",
   "ToastUserDeleteSuccess": "Benutzer gelöscht"
-}
+}
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
@@ -43,6 +43,7 @@
   "ButtonMatchAllAuthors": "Match All Authors",
   "ButtonMatchBooks": "Match Books",
   "ButtonNevermind": "Nevermind",
+  "ButtonNext": "Next",
   "ButtonNextChapter": "Next Chapter",
   "ButtonOk": "Ok",
   "ButtonOpenFeed": "Open Feed",
@@ -51,6 +52,7 @@
   "ButtonPlay": "Play",
   "ButtonPlaying": "Playing",
   "ButtonPlaylists": "Playlists",
+  "ButtonPrevious": "Previous",
   "ButtonPreviousChapter": "Previous Chapter",
   "ButtonPurgeAllCache": "Purge All Cache",
   "ButtonPurgeItemsCache": "Purge Items Cache",
@@ -59,6 +61,7 @@
   "ButtonQueueRemoveItem": "Remove from queue",
   "ButtonQuickMatch": "Quick Match",
   "ButtonRead": "Read",
+  "ButtonRefresh": "Refresh",
   "ButtonRemove": "Remove",
   "ButtonRemoveAll": "Remove All",
   "ButtonRemoveAllLibraryItems": "Remove All Library Items",
@@ -78,6 +81,7 @@
   "ButtonSelectFolderPath": "Select Folder Path",
   "ButtonSeries": "Series",
   "ButtonSetChaptersFromTracks": "Set chapters from tracks",
+  "ButtonShare": "Share",
   "ButtonShiftTimes": "Shift Times",
   "ButtonShow": "Show",
   "ButtonStartM4BEncode": "Start M4B Encode",
@@ -180,6 +184,7 @@
   "HeaderUpdateDetails": "Update Details",
   "HeaderUpdateLibrary": "Update Library",
   "HeaderUsers": "Users",
+  "HeaderYearReview": "Year {0} in Review",
   "HeaderYourStats": "Your Stats",
   "LabelAbridged": "Abridged",
   "LabelAccountType": "Account Type",
@@ -391,6 +396,7 @@
   "LabelPermissionsDownload": "Can Download",
   "LabelPermissionsUpdate": "Can Update",
   "LabelPermissionsUpload": "Can Upload",
+  "LabelPersonalYearReview": "Your Year in Review ({0})",
   "LabelPhotoPathURL": "Photo Path/URL",
   "LabelPlaylists": "Playlists",
   "LabelPlayMethod": "Play Method",
@@ -436,6 +442,7 @@
   "LabelSeries": "Series",
   "LabelSeriesName": "Series Name",
   "LabelSeriesProgress": "Series Progress",
+  "LabelServerYearReview": "Server Year in Review ({0})",
   "LabelSetEbookAsPrimary": "Set as primary",
   "LabelSetEbookAsSupplementary": "Set as supplementary",
   "LabelSettingsAudiobooksOnly": "Audiobooks only",
@@ -552,6 +559,8 @@
   "LabelViewQueue": "View player queue",
   "LabelVolume": "Volume",
   "LabelWeekdaysToRun": "Weekdays to run",
+  "LabelYearReviewHide": "Hide Year in Review",
+  "LabelYearReviewShow": "See Year in Review",
   "LabelYourAudiobookDuration": "Your audiobook duration",
   "LabelYourBookmarks": "Your Bookmarks",
   "LabelYourPlaylists": "Your Playlists",