chore: restored overwritten commits; fix: favorites tab not working

src/components/pages/Favorites.vue

@@ -82,9 +82,8 @@
 				>
 					<CoverContainer is-rounded :cover="release.cover_medium" :link="release.link" @click.stop="addToQueue" />
 					<p class="primary-text">{{ release.title }}</p>
+					<p class="secondary-text">{{ `${$t('globals.by', { artist: release.artist.name })}` }}</p>
 				</router-link>
-
-				<p class="secondary-text">{{ `${$t('globals.by', { artist: release.artist.name })}` }}</p>
 			</div>
 		</div>
 

src/components/pages/Settings.vue

@@ -722,6 +722,10 @@ export default {
 			set(wantSlimSidebar) {
 				this.slimSidebar = wantSlimSidebar
 				document.getElementById('sidebar').classList.toggle('slim', wantSlimSidebar)
+				// Moves all toast messages when the option changes
+				Array.from(document.getElementsByClassName('toastify')).forEach((toast)=>{
+					toast.style.transform = `translate(${wantSlimSidebar ? '3rem' : '14rem'}, 0)`;
+				})
 				localStorage.setItem('slimSidebar', wantSlimSidebar)
 			}
 		},

src/lang/fr.js

@@ -212,7 +212,8 @@ const fr = {
 		},
 		appearance: {
 			title: 'Apparence',
-			slimDownloadTab: 'Onglet de téléchargement compact'
+			slimDownloadTab: 'Onglet de téléchargement compact',
+			slimSidebar: 'Barre latérale compacte'
 		},
 		downloadPath: {
 			title: 'Emplacement De Téléchargement'
@@ -315,7 +316,8 @@ const fr = {
 			syncedLyrics: 'Paroles Synchronisées',
 			copyright: "Droits d'Auteur (Copyright)",
 			composer: 'Compositeur',
-			involvedPeople: 'Personnes Impliquées'
+			involvedPeople: 'Personnes Impliquées',
+			source: 'ID de la source et de la piste'
 		},
 		other: {
 			title: 'Autre',

src/lang/it.js

@@ -26,7 +26,6 @@ const it = {
 			single: 'singolo | singoli',
 			title: 'titolo | titoli',
 			track: 'brano | brani',
-			trackN: '0 brani | {n} brano | {n} brani',
 			releaseN: '0 dischi | {n} disco | {n} dischi',
 			playlist: 'playlist',
 			compile: 'compilation',
@@ -37,7 +36,11 @@ const it = {
 			spotifyPlaylist: 'playlist spotify',
 			releaseDate: 'data di uscita',
 			error: 'errore',
-			empty: ''
+			empty: '',
+			trackN: '0 brani | {n} brano | {n} brani',
+			albumN: '{n} album',
+			artistN: '0 artisti | {n} artista | {n} artisti',
+			playlistN: '{n} playlist'
 		}
 	},
 	about: {

src/utils/toasts.js

@@ -6,10 +6,7 @@ import { socket } from '@/utils/socket'
 
 const sharedOptions = {
 	gravity: 'bottom',
-	position: 'left',
-	offset: {
-		x: '14rem'
-	}
+	position: 'left'
 }
 
 let toastsWithId = {}
@@ -87,6 +84,9 @@ export const toast = function(msg, icon = null, dismiss = true, id = null) {
 						delete toastsWithId[id]
 					}
 				}
+			},
+			offset: {
+				x: 'true' === localStorage.getItem('slimSidebar') ? '3rem': '14rem'
 			}
 		}).showToast()
 		if (id) {