-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
diff --git a/public/locales/nl/translation.json b/public/locales/nl/translation.json
index a954d8b1..fec660e8 100644
--- a/public/locales/nl/translation.json
+++ b/public/locales/nl/translation.json
@@ -61,6 +61,8 @@
"View album": "Album weergeven",
"Add to songs you like": "Voeg aan nummers die je leuk vind toe",
"Add to playlist": "Voeg aan afspeellijst toe",
+ "Add to my list": "Voeg aan mijn lijst toe",
+ "Remove from my list": "Verwijder van mijn lijst",
"Share": "Delen",
"Copy link": "Link kopieren",
"Embed song": "Nummer embedden",
@@ -319,5 +321,14 @@
"Add selection": "Selectie toevoegen",
"Select all": "Alles selecteren",
"Add folder": "Map toevoegen",
- "Select": "Selecteren"
+ "Select": "Selecteren",
+
+ "Good Evening": "Goedenavond",
+ "Good Afternoon": "Goedemiddag",
+ "Good Morning": "Goedemorgen",
+ "Good Night": "Goedenacht",
+ "Goodbye": "Tot ziens",
+
+ "What would you like to see?": "Wat wilt u zien?",
+ "What would you like to listen to?": "Wat wilt u luisteren?"
}
diff --git a/src/Layout/Desktop/DashboardLayout.vue b/src/Layout/Desktop/DashboardLayout.vue
index 694724e2..9f88bc7d 100644
--- a/src/Layout/Desktop/DashboardLayout.vue
+++ b/src/Layout/Desktop/DashboardLayout.vue
@@ -136,7 +136,7 @@ watch(dataUpdatedAt, (value) => {
+ class="flex flex-col relative z-0 h-available min-h-[90vh] h-px overflow-clip items-start justify-start self-stretch w-available bg-slate-light-3 dark:bg-slate-dark-2">
diff --git a/src/components/Cards/SearchCard.vue b/src/components/Cards/SearchCard.vue
index 77db439b..cf222361 100644
--- a/src/components/Cards/SearchCard.vue
+++ b/src/components/Cards/SearchCard.vue
@@ -89,10 +89,7 @@ const loadMore = ref(null);
- {{ $t('Good') }}
-
- {{ greetingValue }}
-
+ {{ $t(`Good ${greetingValue}`) }}
{{ $t('Welcome to your one-stop search for all your streaming needs') }}.
@@ -117,10 +114,7 @@ const loadMore = ref(null);
class="relative flex w-full flex-shrink-0 flex-grow-0 flex-col items-center justify-end gap-3">
- {{ $t('Good') }}
-
- {{ greetingValue }}
-
+ {{ $t(`Good ${greetingValue}`) }}
{{ $t('Welcome to your one-stop search for all your streaming needs') }}.
diff --git a/src/components/NMHomeCard.vue b/src/components/NMHomeCard.vue
index 7fbcb657..9638c5b8 100644
--- a/src/components/NMHomeCard.vue
+++ b/src/components/NMHomeCard.vue
@@ -270,8 +270,8 @@ onIonViewWillLeave(() => {
- {{ $t('Remove from my List') }}
- {{ $t('Add to my List') }}
+ {{ $t('Remove from my list') }}
+ {{ $t('Add to my list') }}
diff --git a/src/lib/middleware/getLocations.ts b/src/lib/middleware/getLocations.ts
index 44c3d6f3..2f87586b 100644
--- a/src/lib/middleware/getLocations.ts
+++ b/src/lib/middleware/getLocations.ts
@@ -1,7 +1,7 @@
import apiClient from '../clients/apiClient';
import servers, { setServers } from '@/store/servers';
-import { updateUserFromApi } from '@/store/user';
+import {updateUserFromApi, user} from '@/store/user';
import { setCurrentServer } from '@/store/currentServer';
import type { User } from '@/types/auth';
@@ -31,23 +31,27 @@ const getLocations = (): Promise
=> new Promise((resolve, reject) => {
setMessages(data.data.receivedMessages);
setNotifications(data.data.notifications);
+ user.value = {
+ ...user.value,
+ locale: data.data.locale,
+ name: data.data.name,
+ };
+
if (servers.value.length == 0) {
- done.value = true;
await router.push({ name: 'No Servers' });
}
else if (servers.value.length == 1) {
- done.value = true;
setCurrentServer(servers.value[0]);
}
else if (servers.value.length > 1 && !!localStorage.getItem('currentServer')) {
- done.value = true;
setCurrentServer(servers.value.find(server => server.id == localStorage.getItem('currentServer'))!);
}
else if (servers.value.length > 1) {
- done.value = true;
await router.push({ name: 'Select Server' });
}
+ done.value = true;
+
resolve();
})
.catch((error) => {
diff --git a/src/store/colorTheme.ts b/src/store/colorTheme.ts
index 113d2558..987e0cca 100644
--- a/src/store/colorTheme.ts
+++ b/src/store/colorTheme.ts
@@ -37,7 +37,7 @@ export const setColorTheme = async (value: string) => {
if (value) {
el.classList.add(`theme-${value}`);
} else {
- el.classList.add('theme-system');
+ el.classList.add('theme-violet');
}
await Preferences.set({
diff --git a/src/views/Base/Info/Desktop.vue b/src/views/Base/Info/Desktop.vue
index 2e0de0e7..2860391a 100644
--- a/src/views/Base/Info/Desktop.vue
+++ b/src/views/Base/Info/Desktop.vue
@@ -14,7 +14,7 @@ import useServerClient from '@/lib/clients/useServerClient';
import { setTitle, sortByPosterAlphabetized } from '@/lib/stringArray';
import { pickPaletteColor } from '@/lib/colorHelper';
import serverClient from '@/lib/clients/serverClient';
-import { background, poster, setBackground, setColorPalette, setLogo, setPoster } from '@/store/ui';
+import {background, colorPalette, poster, setBackground, setColorPalette, setLogo, setPoster} from '@/store/ui';
import { currentSong } from '@/store/audioPlayer';
import ListControlHeaderMoreMenu from '@/Layout/Desktop/components/Menus/ListControlHeaderMoreMenu.vue';
@@ -123,9 +123,6 @@ onMounted(() => {
onUnmounted(() => {
clearInterval(interval.value ?? undefined);
- setPoster(null);
- setBackground(null);
- setColorPalette(null);
});
const toggleTrailer = () => {
@@ -325,14 +322,14 @@ const menuItems: IMenuItem[] = [
-
- {
});
onUnmounted(() => {
- setPoster(null);
- setBackground(null);
- setColorPalette(null);
content.value?.$el?.scrollToTop(window.innerHeight);
});
@@ -110,8 +107,8 @@ router.afterEach(() => {
-
diff --git a/src/views/Base/Info/components/MobileInfoCard.vue b/src/views/Base/Info/components/MobileInfoCard.vue
index 1fd4c2a7..531747ec 100644
--- a/src/views/Base/Info/components/MobileInfoCard.vue
+++ b/src/views/Base/Info/components/MobileInfoCard.vue
@@ -52,7 +52,7 @@ const title = computed(() => {
-
-
diff --git a/src/views/Base/Search/Desktop.vue b/src/views/Base/Search/Desktop.vue
index 99ca1fe4..6b6c3bd6 100644
--- a/src/views/Base/Search/Desktop.vue
+++ b/src/views/Base/Search/Desktop.vue
@@ -37,10 +37,7 @@ onMounted(() => {
- {{ $t('Good') }}
-
- {{ greetingValue }}
-
+ {{ $t(`Good ${greetingValue}`) }}
{{ $t('What would you like to see?') }}
diff --git a/src/views/Base/Search/Mobile.vue b/src/views/Base/Search/Mobile.vue
index 80046a06..97bfa600 100644
--- a/src/views/Base/Search/Mobile.vue
+++ b/src/views/Base/Search/Mobile.vue
@@ -46,10 +46,7 @@ watch(showScreensaver, (value) => {
class="relative z-10 mt-16 flex flex-shrink-0 flex-grow-0 flex-col items-center justify-end gap-3">
- {{ $t('Good') }}
-
- {{ greetingValue }}
-
+ {{ $t(`Good ${greetingValue}`) }}
{{ $t('What would you like to see?') }}
diff --git a/src/views/Music/Search/Desktop.vue b/src/views/Music/Search/Desktop.vue
index e53227c1..329775a2 100644
--- a/src/views/Music/Search/Desktop.vue
+++ b/src/views/Music/Search/Desktop.vue
@@ -32,10 +32,7 @@ onMounted(() => {
- {{ $t('Good') }}
-
- {{ greetingValue }}
-
+ {{ $t(`Good ${greetingValue}`) }}
{{ $t('What would you like to listen to?') }}
diff --git a/src/views/Preferences/Display/components/DisplayLanguage.vue b/src/views/Preferences/Display/components/DisplayLanguage.vue
index 132ebdd1..ebea2fa4 100644
--- a/src/views/Preferences/Display/components/DisplayLanguage.vue
+++ b/src/views/Preferences/Display/components/DisplayLanguage.vue
@@ -10,7 +10,7 @@ import {languages} from "@/config/i18next";
import LanguageSelect from "@/components/Forms/LanguageSelect.vue";
const language = ref(languages?.find(l => l.iso_639_1 == displayLanguage.value)
- ?? { iso_639_1: 'en', name: 'English', label: 'English', english_name: 'English' });
+ ?? { iso_639_1: 'en', name: 'English', english_name: 'English' });
const debouncedName = refDebounced(language, 100);
watch(debouncedName, (value) => {
if (!value) return;