From 07649d651781433f377c8f4d0c325f08caae85a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Wed, 26 Jan 2022 09:02:06 +0300 Subject: [PATCH 01/22] updated cider logo on user info when hidden --- src/renderer/assets/logocut.png | Bin 17532 -> 11772 bytes src/renderer/style.less | 2 ++ 2 files changed, 2 insertions(+) diff --git a/src/renderer/assets/logocut.png b/src/renderer/assets/logocut.png index 3f1e9b8ba1b79350fd774a1d15e8055374922449..29e744c41a89414cb28c4769d3ccd864ca1c7b2e 100644 GIT binary patch literal 11772 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 c;RFEwKN>-gS3}2S8vp .sidebar-user-text .fullname { From 28f75195b8764f2b44b0e912db973112e8895dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20G=C3=BCm=C3=BC=C5=9F?= <10urgumus@gmail.com> Date: Wed, 26 Jan 2022 10:37:26 +0300 Subject: [PATCH 02/22] HODOR HODOR HODOR HODOR --- src/i18n/en_HODOR.jsonc | 261 ++++++++++++++++++++++++++ src/renderer/views/pages/settings.ejs | 1 + 2 files changed, 262 insertions(+) create mode 100644 src/i18n/en_HODOR.jsonc diff --git a/src/i18n/en_HODOR.jsonc b/src/i18n/en_HODOR.jsonc new file mode 100644 index 00000000..6796ca9e --- /dev/null +++ b/src/i18n/en_HODOR.jsonc @@ -0,0 +1,261 @@ +{ // Base File + // App info + "app.name": "HODOR", + + "date.format": "${m} ${d}, ${y}", + + // Dialogs + "dialog.cancel": "HODOR", + "dialog.ok": "HODOR", + + // Notification + "notification.updatingLibrarySongs": "HODOR HODOR HODOR...", + "notification.updatingLibraryAlbums": "HODOR HODOR HODOR...", + "notification.updatingLibraryArtists": "HODOR HODOR HODOR...", + // Terms + "term.appleInc": "HODOR Inc.", + "term.appleMusic": "HODOR HODOR", + "term.applePodcasts": "HODOR HODOR", + "term.itunes": "HODOR", + "term.github": "HODOR", + "term.discord": "HODOR", + "term.learnMore": "HODOR HODOR", + "term.accountSettings": "HODOR HODOR", + "term.logout": "HODOR", + "term.login": "HODOR", + "term.about": "HODOR", + "term.privateSession": "HODOR HODOR", + "term.queue": "HODOR", + "term.search": "HODOR", + "term.library": "HODOR", + "term.listenNow": "HODOR HODOR", + "term.browse": "HODOR", + "term.radio": "HODOR", + "term.recentlyAdded": "HODOR HODOR", + "term.songs": "HODOR", + "term.albums": "HODOR", + "term.artists": "HODOR", + "term.podcasts": "HODOR", + "term.playlists": "HODOR", + "term.playlist": "HODOR", + "term.play": "HODOR", + "term.pause": "HODOR", + "term.previous": "HODOR", + "term.next": "HODOR", + "term.shuffle": "HODOR", + "term.repeat": "HODOR", + "term.volume": "HODOR", + "term.mute": "HODOR", + "term.unmute": "HODOR", + "term.share": "HODOR", + "term.settings": "HODOR", + "term.seeAll": "HODOR HODOR", + "term.sortBy": "HODOR HODOR", + "term.sortBy.album": "HODOR", + "term.sortBy.artist": "HODOR", + "term.sortBy.name": "HODOR", + "term.sortBy.genre": "HODOR", + "term.sortBy.releaseDate": "HODOR HODOR", + "term.sortBy.duration": "HODOR", + "term.sortOrder": "HODOR-HODOR", + "term.sortOrder.ascending": "HODOR", + "term.sortOrder.descending": "HODOR", + "term.viewAs": "HODOR HODOR", + "term.viewAs.coverArt": "HODOR HODOR", + "term.viewAs.list": "HODOR", + "term.size": "HODOR", + "term.size.normal": "HODOR", + "term.size.compact": "HODOR", + "term.enable": "HODOR", + "term.disable": "HODOR", + "term.enabled": "HODOR", + "term.disabled": "HODOR", + "term.connect": "HODOR", + "term.connecting": "HODOR", + "term.disconnect": "HODOR", + "term.authed": "HODOR", + "term.confirm": "HODOR ?", + "term.more": "HODOR", + "term.less": "HODOR", + "term.showMore": "HODOR HODOR", + "term.showLess": "HODOR HODOR", + "term.topSongs" : "HODOR HODOR", + "term.latestReleases": "HODOR HODOR", + "term.time.added": "HODOR", + "term.time.released": "HODOR", + "term.time.updated": "HODOR", + "term.fullscreenView": "HODOR HODOR", + "term.defaultView": "HODOR HODOR", + "term.spacializedAudioSetting": "HODOR HODOR HODOR", + "term.clearAll": "HODOR HODOR", + "term.recentStations": "HODOR HODOR", + "term.language": "HODOR", + "term.noLyrics": "HODOR... / HODOR HODOR HODOR./ HODOR.", + "term.copyright": "HODOR", + "term.rightsReserved": "HODOR HODOR HODOR.", + "term.sponsor": "HODOR HODOR HODOR", + "term.ciderTeam": "HODOR HODOR", + "term.developer": "HODOR", + "term.socialTeam": "HODOR HODOR", + "term.contributors": "HODOR", + "term.equalizer": "HODOR", + "term.reset": "HODOR", + + // Home + "home.title": "HODOR", + "home.recentlyPlayed": "HODOR HODOR", + "home.recentlyAdded": "HODOR HODOR", + "home.artistsFeed": "HODOR HODOR HODOR", + "home.artistsFeed.noArtist": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR", + "home.madeForYou": "HODOR HODOR HODOR", + "home.friendsListeningTo": "HODOR HODOR HODOR", + "home.followedArtists": "HODOR HODOR", + // Errors + "error.appleMusicSubRequired": "HODOR HODOR HODOR HODOR HODOR.", + "error.connectionError": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR.", + "error.noResults": "HODOR HODOR.", + "error.noResults.description": "HODOR HODOR HODOR HODOR.", + + //Podcasts + "podcast.followOnCider": "HODOR HODOR HODOR", + "podcast.followedOnCider": "HODOR HODOR HODOR", + "podcast.subscribeOnItunes": "HODOR HODOR HODOR", + "podcast.subscribedOnItunes": "HODOR HODOR HODOR", + "podcast.itunesStore": "HODOR HODOR", + "podcast.episodes": "HODOR", + "podcast.playEpisode": "HODOR HODOR", + "podcast.website": "HODOR HODOR", + + // Actions + "action.addToLibrary": "HODOR HODOR HODOR", + "action.addToLibrary.success": "HODOR HODOR HODOR", + "action.addToLibrary.error": "HODOR HODOR HODOR LiHODORbrary", + "action.removeFromLibrary": "HODOR HODOR HODOR", + "action.removeFromLibrary.success": "HODOR HODOR HODOR", + "action.addToQueue": "HODOR HODOR HODOR", + "action.addToQueue.success": "HODOR HODOR HODOR", + "action.addToQueue.error": "HODOR HODOR HODOR HODOR", + "action.removeFromQueue": "HODOR HODOR HODOR", + "action.removeFromQueue.success": "HODOR HODOR HODOR", + "action.removeFromQueue.error": "HODOR HODOR HODOR HODOR", + "action.addToPlaylist": "HODOR HODOR HODOR", + "action.removeFromPlaylist": "HODOR HODOR HODOR", + "action.addToFavorites": "HODOR HODOR HODOR", + "action.follow": "HODOR", + "action.follow.success": "HODOR", + "action.follow.error": "HODOR HODOR", + "action.unfollow": "HODOR", + "action.unfollow.success": "HODOR", + "action.unfollow.error": "HODOR HODOR", + "action.playNext": "HODOR HODOR", + "action.playLater": "HODOR HODOR", + "action.startRadio": "HODOR HODOR", + "action.goToArtist": "HODOR HODOR HODOR", + "action.goToAlbum": "HODOR HODOR HODOR", + "action.moveToTop": "HODOR HODOR HODOR", + "action.share": "HODOR", + "action.rename": "HODOR", + "action.love": "HODOR", + "action.unlove": "HODOR", + "action.dislike": "HODOR", + "action.undoDislike": "HODOR HODOR", + "action.showWebRemoteQR": "HODOR HODOR HODOR HODOR", + + // Settings - Audio + "settings.header.audio": "HODOR", + "settings.header.audio.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.audio.quality": "HODOR HODOR", // Dropdown + "settings.header.audio.quality.high": "HODOR.", + "settings.header.audio.quality.low": "HODOR!", + "settings.header.audio.quality.auto": "HODOR", + "settings.option.audio.seamlessTransition": "HODOR HODOR HODOR", // Toggle + "settings.option.audio.enableAdvancedFunctionality": "HODOR HODOR HODOR", // Toggle + "settings.option.audio.enableAdvancedFunctionality.description": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR , HODOR HODOR HODOR, HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "HODOR HODOR", // Toggle + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "HODOR HODOR", // Toggle + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "HODOR HODOR HODOR HODOR HODOR HODOR 3-HODOR (HODOR: HODOR HODOR HODOR HODOR HODOR)", + // Settings - Visual + "settings.header.visual": "HODOR", + "settings.header.visual.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.visual.windowBackgroundStyle": "HODOR HODOR HODOR", // Toggle + "settings.header.visual.windowBackgroundStyle.none": "HODOR", + "settings.header.visual.windowBackgroundStyle.artwork": "HODOR", + "settings.option.visual.animatedArtwork": "HODOR HODOR", // Dropdown + "settings.header.visual.animatedArtwork.always": "HODOR", + "settings.header.visual.animatedArtwork.limited": "HODOR HODOR HODOR HODOR HODOR HODOR", + "settings.header.visual.animatedArtwork.disable": "HODOR HODOR", + "settings.option.visual.animatedArtworkQuality": "HODOR HODOR HODOR", // Dropdown + "settings.header.visual.animatedArtworkQuality.low": "HODOR..", + "settings.header.visual.animatedArtworkQuality.medium": "HODOR.", + "settings.header.visual.animatedArtworkQuality.high": "HODOR!", + "settings.header.visual.animatedArtworkQuality.veryHigh": "HODOR HODOR!", + "settings.header.visual.animatedArtworkQuality.extreme": "HODOOOR!!", + "settings.option.visual.animatedWindowBackground": "HODOR HODOR HODOR", // Toggle + "settings.option.visual.hardwareAcceleration": "HODOR HODOR", // Dropdown + "settings.option.visual.hardwareAcceleration.description": "HODOR HODOR", + "settings.header.visual.hardwareAcceleration.default": "HODOR.", + "settings.header.visual.hardwareAcceleration.webGPU": "HODOR!!", + // Refer to term.disabled for the disabled option + "settings.option.visual.showPersonalInfo": "HODOR HODOR HODOR?", // Toggle + // Settings - General (Reserved) + "settings.header.general": "HODOR", + "settings.header.general.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + + // Settings - Lyrics + "settings.header.lyrics": "HODOR", + "settings.header.lyrics.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.lyrics.enableMusixmatch": "HODOR HODOR HODOR", // Toggle + "settings.option.lyrics.enableMusixmatchKaraoke": "HODOR HODOR HODOR (HODOR HODOR)", // Toggle + "settings.option.lyrics.musixmatchPreferredLanguage": "HODOR HODOR HODOR HODOR", // Dropdown + "settings.option.lyrics.enableYoutubeLyrics": "HODOR HODOR HODOR HODOR HODOR HODOR", // Toggle + + // Settings - Connectivity + "settings.header.connectivity": "HODOR", + "settings.header.connectivity.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.connectivity.discordRPC": "HODOR HODOR HODOR", // Dropdown + // Refer to term.disabled for the disabled option + "settings.header.connectivity.discordRPC.cider": "HODOR HODOR 'HODOR'", + "settings.header.connectivity.discordRPC.appleMusic": "HODOR HODOR 'HODOR HODOR'", + "settings.option.connectivity.discordRPC.clearOnPause": "HODOR HODOR HODOR HODOR HODOR HODOR", // Toggle + "settings.option.connectivity.lastfmScrobble": "HODOR HODOR", // Option to Connect + "settings.option.connectivity.lastfmScrobble.delay": "HODOR HODOR HODOR (%)", + "settings.option.connectivity.lastfmScrobble.nowPlaying": "HODOR HODOR HODOR HODOR", + "settings.option.connectivity.lastfmScrobble.removeFeatured": "HODOR HODOR HODOR HODOR HODOR HODOR (HODOR)", + // Refer to term.connect for the connect button + + // Settings - Experimental + "settings.header.experimental": "HODOR", + "settings.header.experimental.description": "HODOR HODOR HODOR HODOR HODOR HODOR.", + "settings.option.experimental.compactUI": "HODOR UI", // Toggle + // Refer to term.disabled & term.enabled + + // Spatialization Menu + "spatial.spatialProperties" : "HODOR HODOR", + "spatial.width" : "HODOR", + "spatial.height" : "HODOR", + "spatial.depth" : "HODOR", + "spatial.roomMaterials" : "HODOR HODOR", + "spatial.roomDimensions" : "HODOR HODOR", + "spatial.roomPositions" : "HODOR HODOR", + "spatial.setDimensions" : "HODOR HODOR", + "spatial.setPositions" : "HODOR HODOR", + "spatial.up" : "HODOR", + "spatial.front" : "HODOR", + "spatial.left" : "HODOR", + "spatial.right" : "HODOR", + "spatial.back" : "HODOR", + "spatial.down" : "HODOR", + "spatial.listener" : "HODOR", + "spatial.audioSource" : "HODOR HODOR", + + // Settings - Unfinished + "settings.header.unfinished": "HODOR", + + // Web Remote + "remote.web.title": "HODOR HODOR", + "remote.web.description": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR", + + //About + "about.thanks": "HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR HODOR." +} \ No newline at end of file diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 3739ff3a..d1fd1ec9 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -524,6 +524,7 @@ + From 02e41549a832a116e18ceb768e6a7d24227ccb9d Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 20:59:54 +0700 Subject: [PATCH 03/22] add minimize to tray --- src/main/plugins/minimizeToTray.ts | 149 ++++++++++++++++++++++++++ src/renderer/audio/audio.js | 2 +- src/renderer/index.js | 17 +++ src/renderer/views/main.ejs | 4 +- src/renderer/views/pages/settings.ejs | 24 ++--- 5 files changed, 181 insertions(+), 15 deletions(-) create mode 100644 src/main/plugins/minimizeToTray.ts diff --git a/src/main/plugins/minimizeToTray.ts b/src/main/plugins/minimizeToTray.ts new file mode 100644 index 00000000..0bb13492 --- /dev/null +++ b/src/main/plugins/minimizeToTray.ts @@ -0,0 +1,149 @@ +import * as electron from 'electron'; +import * as path from 'path'; + + +export default class MinimizeToTray { + /** + * Private variables for interaction in plugins + */ + private _win: any; + private _app: any; + private _store: any; + private _tray: any; + + /** + * Base Plugin Details (Eventually implemented into a GUI in settings) + */ + public name: string = 'Minimize to tray'; + public description: string = 'Allow Cider to minimize to tray'; + public version: string = '1.0.0'; + public author: string = 'vapormusic'; + + constructor(app: any, store: any) { + this._app = app; + this._store = store; + } + + private SetContextMenu(visibility : any) { + let self = this + if (visibility) { + this._tray.setContextMenu(electron.Menu.buildFromTemplate([ + // { + // label: 'Check for Updates', + // click: function () { + // app.ame.utils.checkForUpdates(true) + // } + // }, + { + label: 'Minimize to Tray', + click: function () { + if (typeof self._win.hide === 'function') { + self._win.hide(); + self.SetContextMenu(false); + } + } + }, + { + label: 'Quit', + click: function () { + self._app.quit(); + } + } + ])); + } else { + this._tray.setContextMenu(electron.Menu.buildFromTemplate([ + // { + // label: 'Check for Updates', + // click: function () { + // this._app.ame.utils.checkForUpdates(true) + // } + // }, + { + label: `Show ${electron.app.getName()}`, + click: function () { + if (typeof self._win.show === 'function') { + self._win.show(); + self.SetContextMenu(true); + } + } + }, + { + label: 'Quit', + click: function () { + self._app.quit(); + } + } + ])); + } + return true + + } + + /** + * Runs on app ready + */ + onReady(win: any): void { + this._win = win; + const winTray = electron.nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.ico`)).resize({ + width: 32, + height: 32 + }) + const macTray = electron.nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({ + width: 20, + height: 20 + }) + const linuxTray = electron.nativeImage.createFromPath(path.join(__dirname, `../../resources/icons/icon.png`)).resize({ + width: 32, + height: 32 + }) + let trayIcon : any ; + if (process.platform === "win32") { + trayIcon = winTray + } else if (process.platform === "linux") { + trayIcon = linuxTray + } else if (process.platform === "darwin") { + trayIcon = macTray + } + + this._tray = new electron.Tray(trayIcon) + this._tray.setToolTip(this._app.getName()); + this.SetContextMenu(true); + + this._tray.on('double-click', () => { + if (typeof this._win.show === 'function') { + if (this._win.isVisible()) { + this._win.focus() + } else { + this._win.show() + } + } + }) + electron.ipcMain.on("minimizeTray", (event, value) => { + // listen for close event + this._win.hide(); + this.SetContextMenu(false); + }); + } + + /** + * Runs on app stop + */ + onBeforeQuit(): void { + + } + + /** + * Runs on playback State Change + * @param attributes Music Attributes (attributes.state = current state) + */ + onPlaybackStateDidChange(attributes: object): void { + } + + /** + * Runs on song change + * @param attributes Music Attributes + */ + onNowPlayingItemDidChange(attributes: object): void { + } + +} diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js index 034a7cb8..dbc619d5 100644 --- a/src/renderer/audio/audio.js +++ b/src/renderer/audio/audio.js @@ -124,7 +124,7 @@ var CiderAudio = { for (i = 1; i < BANDS.length; i ++) { CiderAudio.audioNodes.audioBands[i-1].connect(CiderAudio.audioNodes.audioBands[i]); } - CiderAudio.audioNodes.audioBands[ BANDS.length-1].connect(CiderAudio.context.destination); + CiderAudio.audioNodes.audioBands[BANDS.length-1].connect(CiderAudio.context.destination); } } diff --git a/src/renderer/index.js b/src/renderer/index.js index 13168409..eb66e9f2 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3419,6 +3419,23 @@ const app = new Vue({ document.getElementsByClassName('song-name')[0].classList.add('marquee'); document.getElementsByClassName('song-name')[1].classList.add('marquee-after'); } + }, + closeWindow(){ + switch (app.cfg.general.close_behavior) { + case 0: + case '0': + ipcRenderer.send('close'); + break; + case 1: + case '1': + ipcRenderer.send('minimize'); + break; + case 2: + case '2': + ipcRenderer.send('minimizeTray'); + break; + + } } } diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 5b2f56dd..0cfeab5b 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -41,7 +41,7 @@
-
+
@@ -174,7 +174,7 @@ @click="ipcRenderer.send('maximize')">
-
+
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 2bd44f66..ed3bdc2b 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -529,6 +529,18 @@ +
+
+ Close Button Behavior +
+
+ +
+
@@ -581,18 +593,6 @@
-
-
- Close Button Behavior -
-
- -
-
Open Cider on Startup From 1badd13f695a80eeb0c7444d2fc670f92571f69e Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 21:24:30 +0700 Subject: [PATCH 04/22] Add option to disable loop filter in lastfm --- src/i18n/en_US.jsonc | 5 +++++ src/main/base/store.ts | 1 + src/main/plugins/lastfm.ts | 2 ++ src/renderer/views/pages/settings.ejs | 16 ++++++++++++---- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 8aea456e..ff7965a4 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -234,12 +234,17 @@ "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble Delay (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Enable LastFM Now Playing", "settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (LastFM)", + "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (LastFM)", // Refer to term.connect for the connect button // Settings - Experimental "settings.header.experimental": "Experimental", "settings.header.experimental.description": "Adjust the experimental settings for Cider.", "settings.option.experimental.compactUI": "Compact UI", // Toggle + "settings.option.experimental.closeButtonBehaviour": "Close Button Behaviour", + "settings.option.experimental.closeButtonBehaviour.quit": "Quit Cider", + "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "Minimize to taskbar", + "settings.option.experimental.closeButtonBehaviour.minimizeTray": "Minimize to system tray", // Refer to term.disabled & term.enabled // Spatialization Menu diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 9079d06b..16c3b110 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -79,6 +79,7 @@ export class ConfigStore { "scrobble_after": 30, "auth_token": "", "enabledRemoveFeaturingArtists": true, + "filterLoop": true, "NowPlaying": "true" }, "advanced": { diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index 465ec606..3037e69e 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -243,6 +243,8 @@ export default class LastFMPlugin { * @param attributes Music Attributes */ onNowPlayingItemDidChange(attributes: object): void { + if (!this._store.lastfm.filterLoop){ + this._lastfm.cachedAttributes = []} this.scrobbleSong(attributes) this.updateNowPlayingSong(attributes) } diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index ed3bdc2b..17434ecf 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -494,6 +494,14 @@
+
+
+ {{$root.getLz('settings.option.connectivity.lastfmScrobble.filterLoop')}} +
+
+ +
+
{{$root.getLz('settings.header.experimental')}} @@ -531,13 +539,13 @@
- Close Button Behavior + {{$root.getLz("settings.option.experimental.closeButtonBehaviour")}}
From 5e87c858ba722afee141a0bf38174d37366d7f3e Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 21:44:37 +0700 Subject: [PATCH 05/22] i guess this will work better --- src/main/plugins/lastfm.ts | 2 +- src/renderer/views/pages/cider-playlist.ejs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index 3037e69e..006256db 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -244,7 +244,7 @@ export default class LastFMPlugin { */ onNowPlayingItemDidChange(attributes: object): void { if (!this._store.lastfm.filterLoop){ - this._lastfm.cachedAttributes = []} + this._lastfm.cachedAttributes = false} this.scrobbleSong(attributes) this.updateNowPlayingSong(attributes) } diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 1c7ac047..0749b16c 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -444,8 +444,12 @@ // month = new Intl.DateTimeFormat(this.app.cfg.general.language.replace('_','-'), {month: 'long'}).format(releaseDate); // date = releaseDate.getDate(); // year = releaseDate.getFullYear(); - - return prefix + new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_','-') ?? 'en-US', {day:'numeric',month: 'long', year: 'numeric'}).format(releaseDate); + let formatted = '' + try {formatted = new Intl.DateTimeFormat(this.app.cfg.general.language?.replace('_','-') ?? 'en-US', {day:'numeric',month: 'long', year: 'numeric'}).format(releaseDate);} + catch(e){ + formatted = new Intl.DateTimeFormat('en-US', {day:'numeric',month: 'long', year: 'numeric'}).format(releaseDate); + } + return prefix + formatted } catch (e) { return "" } From 8dfec5ff49b7da4a927ad86950d5ce00c2b9203b Mon Sep 17 00:00:00 2001 From: vapormusic Date: Wed, 26 Jan 2022 22:22:10 +0700 Subject: [PATCH 06/22] fix this looped thing --- src/main/plugins/lastfm.ts | 1 + src/preload/cider-preload.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index 006256db..51ddcc34 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -244,6 +244,7 @@ export default class LastFMPlugin { */ onNowPlayingItemDidChange(attributes: object): void { if (!this._store.lastfm.filterLoop){ + this._lastfm.cachedNowPlayingAttributes = false; this._lastfm.cachedAttributes = false} this.scrobbleSong(attributes) this.updateNowPlayingSong(attributes) diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index c1eb6046..7d921eeb 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -24,7 +24,7 @@ const MusicKitInterop = { /** wsapi */ MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, () => { - if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true)) { + if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true) || !app.cfg.lastfm.filterLoop) { global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes()); } }); From 8f259521de5d81d4f82c8a6965f0fbabb2d27b68 Mon Sep 17 00:00:00 2001 From: KaHim Chan Date: Wed, 26 Jan 2022 23:24:09 +0800 Subject: [PATCH 07/22] Language: en_SGA + fixed a typo (#220) --- src/i18n/en_SGA.jsonc | 278 ++++++++++++++++++ .../views/components/spatial-properties.ejs | 2 +- src/renderer/views/pages/settings.ejs | 1 + 3 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 src/i18n/en_SGA.jsonc diff --git a/src/i18n/en_SGA.jsonc b/src/i18n/en_SGA.jsonc new file mode 100644 index 00000000..f49a20b0 --- /dev/null +++ b/src/i18n/en_SGA.jsonc @@ -0,0 +1,278 @@ +{ + + // i18n Info + "i18n.languageName": "┤ᖋ|:ᖋᔮᒣ╎ᔮ ᖋ|:i!⍑ᖋᕊᒷᒣ", // name of language in native language + "i18n.languageNameEnglish": "Galactic Alphabet", // name of language in English + "i18n.category": "fun", // main = real language, fun = fun community languages + "i18n.authors": "@kyw504100", // Authors, if you contribute to this file feel free to add your name seperated with a space + + // App info + "app.name": "ᔮ╎↸ᒷ∷", + + "date.format": "${m} ${d}, ${y}", + + // Dialogs + "dialog.cancel": "ᔮᖋリᔮᒷ|:", + "dialog.ok": "ᒍ·ǀ·", + + // Notification + "notification.updatingLibrarySongs": "⚍i!↸ᖋᒣ╎リ┤ |:╎ᕊ∷ᖋ∷॥ ϟᒍリ┤ϟ...", + "notification.updatingLibraryAlbums": "⚍i!↸ᖋᒣ╎リ┤ |:╎ᕊ∷ᖋ∷॥ ᖋ|:ᕊ⚍ᒲϟ...", + "notification.updatingLibraryArtists": "⚍i!↸ᖋᒣ╎リ┤ |:╎ᕊ∷ᖋ∷॥ ᖋ∷ᒣ╎ϟᒣϟ...", + // Terms + "term.appleInc": "ᖋi!i!|:ᒷ ╎リᔮ.", + "term.appleMusic": "ᖋi!i!|:ᒷ ᒲ⚍ϟ╎ᔮ", + "term.applePodcasts": "ᖋi!i!|:ᒷ i!ᒍ↸ᔮᖋϟᒣϟ", + "term.itunes": "╎ᒣ⚍リᒷϟ", + "term.github": "┤╎ᒣ⍑⚍ᕊ", + "term.discord": "↸╎ϟᔮᒍ∷↸", + "term.learnMore": "|:ᒷᖋ∷リ ᒲᒍ∷ᒷ", + "term.accountSettings": "ᖋᔮᔮᒍ⚍リᒣ ϟᒷᒣᒣ╎リ┤ϟ", + "term.logout": "|:ᒍ┤ᒍ⚍ᒣ", + "term.login": "|:ᒍ┤╎リ", + "term.about": "ᖋᕊᒍ⚍ᒣ", + "term.privateSession": "I!∷╎⍊ᖋᒣᒷ ϟᒷϟϟ╎ᒍリ", + "term.queue": "ᑑ⚍ᒷ⚍ᒷ", + "term.search": "ϟᒷᖋ∷ᔮ⍑", + "term.library": "|:╎ᕊ∷ᖋ∷॥", + "term.listenNow": "|:╎ϟᒣᒷリ", + "term.browse": "リᒍ∴", + "term.radio": "∷ᖋ↸╎ᒍ", + "term.recentlyAdded": "∷ᒷᔮᒷリᒣ|:॥ ᖋ↸↸ᒷ↸", + "term.songs": "ϟᒍリ┤ϟ", + "term.albums": "ᖋ|:ᕊ⚍ᒲϟ", + "term.artists": "ᖋ∷ᒣ╎ϟᒣϟ", + "term.podcasts": "I!ᒍ↸ᔮᖋϟᒣϟ", + "term.playlists": "i!|:ᖋ॥|:╎ϟᒣϟ", + "term.playlist": "i!|:ᖋ॥|:╎ϟᒣ", + "term.play": "i!|:ᖋ॥", + "term.pause": "I!ᖋ⚍ϟᒷ", + "term.previous": "I!∷ᒷ⍊╎ᒍ⚍ϟ", + "term.next": "リᒷ/ᒣ", + "term.shuffle": "ϟ⍑⚍⎓⎓|:ᒷ", + "term.repeat": "∷ᒷi!ᒷᖋᒣ", + "term.volume": "⍊ᒍ|:⚍ᒲᒷ", + "term.mute": "ᒲ⚍ᒣᒷ", + "term.unmute": "⚍リᒲ⚍ᒣᒷ", + "term.share": "ϟ⍑ᖋ∷ᒷ", + "term.settings": "ϟᒷᒣᒣ╎リ┤ϟ", + "term.seeAll": "ϟᒷᒷ ᖋ|:|:", + "term.sortBy": "ϟᒍ∷ᒣ ᕊ॥", + "term.sortBy.album": "ᖋ|:ᕊ⚍ᒲ", + "term.sortBy.artist": "ᖋ∷ᒣ╎ϟᒣ", + "term.sortBy.name": "リᖋᒲᒷ", + "term.sortBy.genre": "┤ᒷリ∷ᒷ", + "term.sortBy.releaseDate": "∷ᒷ|:ᒷᖋϟᒷ ↸ᖋᒣᒷ", + "term.sortBy.duration": "↸⚍∷ᖋᒣ╎ᒍリ", + "term.sortOrder": "ᖋ-∩", + "term.sortOrder.ascending": "ᖋϟᔮᒷリ↸╎リ┤", + "term.sortOrder.descending": "↸ᒷϟᔮᒷリ↸╎リ┤", + "term.viewAs": "⍊╎ᒷ∴ ᖋϟ", + "term.viewAs.coverArt": "ᔮᒍ⍊ᒷ∷ ᖋ∷ᒣ", + "term.viewAs.list": "|:╎ϟᒣ", + "term.size": "ϟ╎∩ᒷ", + "term.size.normal": "リᒍ∷ᒲᖋ|:", + "term.size.compact": "ᔮᒍᒲi!ᖋᔮᒣ", + "term.enable": "ᒷリᖋᕊ|:ᒷ", + "term.disable": "↸╎ϟᖋᕊ|:ᒷ", + "term.enabled": "ᒷリᖋᕊ|:ᒷ↸", + "term.disabled": "↸╎ϟᖋᕊ|:ᒷ↸", + "term.connect": "ᔮᒍリリᒷᔮᒣ", + "term.connecting": "ᔮᒍリリᒷᔮᒣ╎リ┤", + "term.disconnect": "↸╎ϟᔮᒍリリᒷᔮᒣ", + "term.authed": "ᖋ⚍ᒣ⍑ᒷ↸", + "term.confirm": "ᔮᒍリ⎓╎∷ᒲ ?", + "term.more": "ᒲᒍ∷ᒷ", + "term.less": "|:ᒷϟϟ", + "term.showMore": "ϟ⍑ᒍ∴ ᒲᒍ∷ᒷ", + "term.showLess": "ϟ⍑ᒍ∴ |:ᒷϟϟ", + "term.topSongs" : "ᒣᒍi! ϟᒍリ┤ϟ", + "term.latestReleases": "|:ᖋᒣᒷϟᒣ ∷ᒷ|:ᒷᖋϟᒷϟ", + "term.time.added": "ᖋ↸↸ᒷ↸", + "term.time.released": "∷ᒷ|:ᒷᖋϟᒷ↸", + "term.time.updated": "⚍i!↸ᖋᒣᒷ↸", + "term.fullscreenView": "⎓⚍|:|:ϟᔮ∷ᒷᒷリ ⍊╎ᒷ∴", + "term.defaultView": "↸ᒷ⎓ᖋ⚍|:ᒣ ⍊╎ᒷ∴", + "term.spacializedAudioSetting": "ϟi!ᖋᔮ╎ᖋ|:╎∩ᒷ↸ ᖋ⚍↸╎ᒍ ϟᒷᒣᒣ╎リ┤", + "term.clearAll": "ᔮ|:ᒷᖋ∷ ᖋ|:|:", + "term.recentStations": "∷ᒷᔮᒷリᒣ ϟᒣᖋᒣ╎ᒍリϟ", + "term.language": "|:ᖋリ┤⚍ᖋ┤ᒷ", + "term.noLyrics": "|:ᒍᖋ↸╎リ┤... / |:॥∷╎ᔮϟ リᒍᒣ ⎓ᒍ⚍リ↸./ ╎リϟᒣ∷⚍ᒲᒷリᒣᖋ|:.", + "term.copyright": "ᔮᒍi!॥∷╎┤⍑ᒣ", + "term.rightsReserved": "ᖋ|:|: ∷╎┤⍑ᒣϟ ∷ᒷϟᒷ∷⍊ᒷ↸.", + "term.sponsor": "ϟi!ᒍリϟᒍ∷ ᒣ⍑╎ϟ i!∷ᒍ⋮ᒷᔮᒣ", + "term.ciderTeam": "ᔮ╎↸ᒷ∷ ᒣᒷᖋᒲ", + "term.developer": "↸ᒷ⍊ᒷ|:ᒍi!ᒷ∷", + "term.socialTeam": "ϟᒍᔮ╎ᖋ|: ᒣᒷᖋᒲ", + "term.contributors": "ᔮᒍリᒣ∷╎ᕊ⚍ᒣᒍ∷ϟ", + "term.equalizer": "ᒷᑑ⚍ᖋ|:╎∩ᒷ∷", + "term.reset": "∷ᒷϟᒷᒣ", + "term.tracks": "ᒣ∷ᖋᔮ·ǀ·ϟ", // Assume x amount of tracks. e.g. 50 tracks + + + // Home + "home.title": "⍑ᒍᒲᒷ", + "home.recentlyPlayed": "∷ᒷᔮᒷリᒣ|:॥ i!|:ᖋ॥ᒷ↸", + "home.recentlyAdded": "∷ᒷᔮᒷリᒣ|:॥ ᖋ↸↸ᒷ↸", + "home.artistsFeed": "॥ᒍ⚍∷ ᖋ∷ᒣ╎ϟᒣϟ ⎓ᒷᒷ↸", + "home.artistsFeed.noArtist": "⎓ᒍ|:|:ᒍ∴ ϟᒍᒲᒷ ᖋ∷ᒣ╎ϟᒣϟ ⎓╎∷ϟᒣ ᖋリ↸ ᒣ⍑ᒷ╎∷ |:ᖋᒣᒷϟᒣ ∷ᒷ|:ᒷᖋϟᒷϟ ∴╎|:|: ᕊᒷ ⍑ᒷ∷ᒷ", + "home.madeForYou": "ᒲᖋ↸ᒷ ⎓ᒍ∷ ॥ᒍ⚍", + "home.friendsListeningTo": "⎓∷╎ᒷリ↸ϟ |:╎ϟᒣᒷリ╎リ┤ ᒣᒍ", + "home.followedArtists": "⎓ᒍ|:|:ᒍ∴ᒷ↸ ᖋ∷ᒣ╎ϟᒣϟ", + // Errors + "error.appleMusicSubRequired": "ᖋi!i!|:ᒷ ᒲ⚍ϟ╎ᔮ ∷ᒷᑑ⚍╎∷ᒷϟ ᖋ ϟ⚍ᕊϟᔮ∷╎i!ᒣ╎ᒍリ.", + "error.connectionError": "ᒣ⍑ᒷ∷ᒷ ∴ᖋϟ ᖋ i!∷ᒍᕊ|:ᒷᒲ ᔮᒍリリᒷᔮᒣ╎リ┤ ᒣᒍ ᖋi!i!|:ᒷ ᒲ⚍ϟ╎ᔮ.", + "error.noResults": "リᒍ ∷ᒷϟ⚍|:ᒣϟ.", + "error.noResults.description": "ᒣ∷॥ ᖋ リᒷ∴ ϟᒷᖋ∷ᔮ⍑.", + + //Podcasts + "podcast.followOnCider": "⎓ᒍ|:|:ᒍ∴ ᒍリ ᔮ╎↸ᒷ∷", + "podcast.followedOnCider": "⎓ᒍ|:|:ᒍ∴╎リ┤ ᒍリ ᔮ╎↸ᒷ∷", + "podcast.subscribeOnItunes": "ϟ⚍ᕊϟᔮ∷╎ᕊᒷ ᒍリ ╎ᒣ⚍リᒷϟ", + "podcast.subscribedOnItunes": "ϟ⚍ᕊϟᔮ∷╎ᕊᒷ↸ ᒍリ ╎ᒣ⚍リᒷϟ", + "podcast.itunesStore": "╎ᒣ⚍リᒷϟ ϟᒣᒍ∷ᒷ", + "podcast.episodes": "ᒷi!╎ϟᒍ↸ᒷϟ", + "podcast.playEpisode": "i!|:ᖋ॥ ᒷi!╎ϟᒍ↸ᒷ", + "podcast.website": "I!ᒍ↸ᔮᖋϟᒣ ∴ᒷᕊϟ╎ᒣᒷ", + + // Actions + "action.addToLibrary": "ᖋ↸↸ ᒣᒍ |:╎ᕊ∷ᖋ∷॥", + "action.addToLibrary.success": "ᖋ↸↸ᒷ↸ ᒣᒍ |:╎ᕊ∷ᖋ∷॥", + "action.addToLibrary.error": "ᒷ∷∷ᒍ∷ ᖋ↸↸╎リ┤ ᒣᒍ |:╎ᕊ∷ᖋ∷॥", + "action.removeFromLibrary": "∷ᒷᒲᒍ⍊ᒷ ⎓∷ᒍᒲ |:╎ᕊ∷ᖋ∷॥", + "action.removeFromLibrary.success": "∷ᒷᒲᒍ⍊ᒷ↸ ⎓∷ᒍᒲ |:╎ᕊ∷ᖋ∷॥", + "action.addToQueue": "ᖋ↸↸ ᒣᒍ ᑑ⚍ᒷ⚍ᒷ", + "action.addToQueue.success": "ᖋ↸↸ᒷ↸ ᒣᒍ ᑑ⚍ᒷ⚍ᒷ", + "action.addToQueue.error": "ᒷ∷∷ᒍ∷ ᖋ↸↸╎リ┤ ᒣᒍ ᑑ⚍ᒷ⚍ᒷ", + "action.removeFromQueue": "∷ᒷᒲᒍ⍊ᒷ ⎓∷ᒍᒲ ᑑ⚍ᒷ⚍ᒷ", + "action.removeFromQueue.success": "∷ᒷᒲᒍ⍊ᒷ↸ ⎓∷ᒍᒲ ᑑ⚍ᒷ⚍ᒷ", + "action.removeFromQueue.error": "ᒷ∷∷ᒍ∷ ∷ᒷᒲᒍ⍊╎リ┤ ⎓∷ᒍᒲ ᑑ⚍ᒷ⚍ᒷ", + "action.addToPlaylist": "ᖋ↸↸ ᒣᒍ i!|:ᖋ॥|:╎ϟᒣ", + "action.removeFromPlaylist": "∷ᒷᒲᒍ⍊ᒷ ⎓∷ᒍᒲ i!|:ᖋ॥|:╎ϟᒣ", + "action.addToFavorites": "ᖋ↸↸ ᒣᒍ ⎓ᖋ⍊ᒍ∷╎ᒣᒷϟ", + "action.follow": "⎓ᒍ|:|:ᒍ∴", + "action.follow.success": "⎓ᒍ|:|:ᒍ∴ᒷ↸", + "action.follow.error": "ᒷ∷∷ᒍ∷ ⎓ᒍ|:|:ᒍ∴╎リ┤", + "action.unfollow": "⚍リ⎓ᒍ|:|:ᒍ∴", + "action.unfollow.success": "⚍リ⎓ᒍ|:|:ᒍ∴ᒷ↸", + "action.unfollow.error": "ᒷ∷∷ᒍ∷ ⚍リ⎓ᒍ|:|:ᒍ∴╎リ┤", + "action.playNext": "i!|:ᖋ॥ リᒷ/ᒣ", + "action.playLater": "i!|:ᖋ॥ |:ᖋᒣᒷ∷", + "action.startRadio": "ϟᒣᖋ∷ᒣ ∷ᖋ↸╎ᒍ", + "action.goToArtist": "┤ᒍ ᒣᒍ ᖋ∷ᒣ╎ϟᒣ", + "action.goToAlbum": "┤ᒍ ᒣᒍ ᖋ|:ᕊ⚍ᒲ", + "action.moveToTop": "ᒲᒍ⍊ᒷ ᒣᒍ ᒣᒍi!", + "action.share": "ϟ⍑ᖋ∷ᒷ", + "action.rename": "∷ᒷリᖋᒲᒷ", + "action.love": "|:ᒍ⍊ᒷ", + "action.unlove": "⚍リ|:ᒍ⍊ᒷ", + "action.dislike": "↸╎ϟ|:╎·ǀ·ᒷ", + "action.undoDislike": "⚍リ↸ᒍ ↸╎ϟ|:╎·ǀ·ᒷ", + "action.showWebRemoteQR": "ϟ⍑ᒍ∴ ∴ᒷᕊ ∷ᒷᒲᒍᒣᒷ ᑑ∷", + "action.playTracksNext": "i!|:ᖋ॥ ${app.selectedMediaItems.length} ᒣ∷ᖋᔮ·ǀ·ϟ リᒷ/ᒣ", + "action.playTracksLater": "i!|:ᖋ॥ ${app.selectedMediaItems.length} ᒣ∷ᖋᔮ·ǀ·ϟ |:ᖋᒣᒷ∷", + "action.removeTracks": "∷ᒷᒲᒍ⍊ᒷ ${self.selectedItems.length} ᒣ∷ᖋᔮ·ǀ·ϟ ⎓∷ᒍᒲ ᑑ⚍ᒷ⚍ᒷ", + + // Settings - Audio + "settings.header.audio": "ᖋ⚍↸╎ᒍ", + "settings.header.audio.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ ᖋ⚍↸╎ᒍ ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + "settings.option.audio.quality": "ᖋ⚍↸╎ᒍ ᑑ⚍ᖋ|:╎ᒣ॥", // Dropdown + "settings.header.audio.quality.high": "⍑╎┤⍑", + "settings.header.audio.quality.low": "|:ᒍ∴", + "settings.header.audio.quality.auto": "ᖋ⚍ᒣᒍ", + "settings.option.audio.seamlessTransition": "ϟᒷᖋᒲ|:ᒷϟϟ ᖋ⚍↸╎ᒍ ᒣ∷ᖋリϟ╎ᒣ╎ᒍリ", // Toggle + "settings.option.audio.enableAdvancedFunctionality": "ᒷリᖋᕊ|:ᒷ ᖋ↸⍊ᖋリᔮᒷ↸ ⎓⚍リᔮᒣ╎ᒍリᖋ|:╎ᒣ॥", // Toggle + "settings.option.audio.enableAdvancedFunctionality.description": "ᒷリᖋᕊ|:╎リ┤ ᖋ⚍↸╎ᒍᔮᒍリᒣᒷ/ᒣ ⎓⚍リᔮᒣ╎ᒍリᖋ|:╎ᒣ॥ ∴╎|:|: ᖋ|:|:ᒍ∴ ⎓ᒍ∷ ᒷ/ᒣᒷリ↸ᒷ↸ ᖋ⚍↸╎ᒍ ⎓ᒷᖋᒣ⚍∷ᒷϟ |:╎·ǀ·ᒷ ᖋ⚍↸╎ᒍ リᒍ∷ᒲᖋ|:╎∩ᖋᒣ╎ᒍリ , ᒷᑑ⚍ᖋ|:╎∩ᒷ∷ϟ ᖋリ↸ ⍊╎ϟ⚍ᖋ|:╎∩ᒷ∷ϟ, ⍑ᒍ∴ᒷ⍊ᒷ∷ ᒍリ ϟᒍᒲᒷ ϟ॥ϟᒣᒷᒲϟ ᒣ⍑╎ϟ ᒲᖋ॥ ᔮᖋ⚍ϟᒷ ϟᒣ⚍ᒣᒣᒷ∷╎リ┤ ╎リ ᖋ⚍↸╎ᒍ ᒣ∷ᖋᔮ·ǀ·ϟ.", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "ᖋ⚍↸╎ᒍ リᒍ∷ᒲᖋ|:╎∩ᖋᒣ╎ᒍリ", // Toggle + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "リᒍ∷ᒲᖋ|:╎∩ᒷϟ i!ᒷᖋ·ǀ· ⍊ᒍ|:⚍ᒲᒷ ⎓ᒍ∷ ╎リ↸╎⍊╎↸⚍ᖋ|: ᒣ∷ᖋᔮ·ǀ·ϟ ᒣᒍ ᔮ∷ᒷᖋᒣᒷ ᖋ ᒲᒍ∷ᒷ ⚍リ╎⎓ᒍ∷ᒲ |:╎ϟᒣᒷリ╎リ┤ ᒷ/i!ᒷ∷╎ᒷリᔮᒷ.", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "ᖋ⚍↸╎ᒍ ϟi!ᖋᒣ╎ᖋ|:╎∩ᖋᒣ╎ᒍリ", // Toggle + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "ϟi!ᖋᒣ╎ᖋ|:╎∩ᒷ ᖋ⚍↸╎ᒍ ᖋリ↸ ᒲᖋ·ǀ·ᒷ ᖋ⚍↸╎ᒍ ᒲᒍ∷ᒷ 3-↸╎ᒲᒷリϟ╎ᒍリᖋ|: (リᒍᒣᒷ: ᒣ⍑╎ϟ ╎ϟ リᒍᒣ ↸ᒍ|:ᕊ॥ ᖋᒣᒲᒍϟ)", + // Settings - Visual + "settings.header.visual": "⍊╎ϟ⚍ᖋ|:", + "settings.header.visual.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ ⍊╎ϟ⚍ᖋ| ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + "settings.option.visual.windowBackgroundStyle": "∴╎リ↸ᒍ∴ ᕊᖋᔮ·ǀ·┤∷ᒍ⚍リ↸ ϟᒣ॥|:ᒷ", // Toggle + "settings.header.visual.windowBackgroundStyle.none": "リᒍリᒷ", + "settings.header.visual.windowBackgroundStyle.artwork": "ᖋ∷ᒣ∴ᒍ∷·ǀ·", + "settings.option.visual.animatedArtwork": "ᖋリ╎ᒲᖋᒣᒷ↸ ᖋ∷ᒣ∴ᒍ∷·ǀ·", // Dropdown + "settings.header.visual.animatedArtwork.always": "ᖋ|:∴ᖋ॥ϟ", + "settings.header.visual.animatedArtwork.limited": "|:╎ᒲ╎ᒣᒷ↸ ᒣᒍ i!ᖋ┤ᒷϟ ᖋリ↸ ϟi!ᒷᔮ╎ᖋ|: ᒷリᒣ∷╎ᒷϟ", + "settings.header.visual.animatedArtwork.disable": "↸╎ϟᖋᕊ|:ᒷ ᒷ⍊ᒷ∷॥∴⍑ᒷ∷ᒷ", + "settings.option.visual.animatedArtworkQuality": "ᖋリ╎ᒲᖋᒣᒷ↸ ᖋ∷ᒣ∴ᒍ∷·ǀ· ᑑ⚍ᖋ|:╎ᒣ॥", // Dropdown + "settings.header.visual.animatedArtworkQuality.low": "|:ᒍ∴", + "settings.header.visual.animatedArtworkQuality.medium": "ᒲᒷ↸╎⚍ᒲ", + "settings.header.visual.animatedArtworkQuality.high": "⍑╎┤⍑", + "settings.header.visual.animatedArtworkQuality.veryHigh": "⍊ᒷ∷॥ ⍑╎┤⍑", + "settings.header.visual.animatedArtworkQuality.extreme": "ᒷ/ᒣ∷ᒷᒲᒷ", + "settings.option.visual.animatedWindowBackground": "ᖋリ╎ᒲᖋᒣᒷ↸ ∴╎リ↸ᒍ∴ ᕊᖋᔮ·ǀ·┤∷ᒍ⚍リ↸", // Toggle + "settings.option.visual.hardwareAcceleration": "⍑ᖋ∷↸∴ᖋ∷ᒷ ᖋᔮᔮᒷ|:ᒷ∷ᖋᒣ╎ᒍリ", // Dropdown + "settings.option.visual.hardwareAcceleration.description": "∷ᒷᑑ⚍╎∷ᒷϟ ∷ᒷ|:ᖋ⚍リᔮ⍑", + "settings.header.visual.hardwareAcceleration.default": "↸ᒷ⎓ᖋ⚍|:ᒣ", + "settings.header.visual.hardwareAcceleration.webGPU": "∴ᒷᕊ┤i!⚍", + // Refer to term.disabled for the disabled option + "settings.option.visual.showPersonalInfo": "ϟ⍑ᒍ∴ i!ᒷ∷ϟᒍリᖋ|: ╎リ⎓ᒍ", // Toggle + // Settings - General (Reserved) + "settings.header.general": "┤ᒷリᒷ∷ᖋ|:", + "settings.header.general.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ ┤ᒷリᒷ∷ᖋ|: ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + + // Settings - Lyrics + "settings.header.lyrics": "|:॥∷╎ᔮϟ", + "settings.header.lyrics.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ |:॥∷╎ᔮϟ ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + "settings.option.lyrics.enableMusixmatch": "ᒷリᖋᕊ|:ᒷ ᒲ⚍ϟ╎̇/ᒲᖋᒣᔮ⍑ |:॥∷╎ᔮϟ", // Toggle + "settings.option.lyrics.enableMusixmatchKaraoke": "ᒷリᖋᕊ|:ᒷ ·ǀ·ᖋ∷ᖋᒍ·ǀ·ᒷ ᒲᒍ↸ᒷ (ᒲ⚍ϟ╎̇/ᒲᖋᒣᔮ⍑ ᒍリ|:॥)", // Toggle + "settings.option.lyrics.musixmatchPreferredLanguage": "ᒲ⚍ϟ╎̇/ᒲᖋᒣᔮ⍑ ᒣ∷ᖋリϟ|:ᖋᒣ╎ᒍリ i!∷ᒷ⎓ᒷ∷∷ᒷ↸ |:ᖋリ┤⚍ᖋ┤ᒷ", // Dropdown + "settings.option.lyrics.enableYoutubeLyrics": "ᒷリᖋᕊ|:ᒷ ॥ᒍ⚍ᒣ⚍ᕊᒷ |:॥∷╎ᔮϟ ⎓ᒍ∷ ᒲ⚍ϟ╎ᔮ ⍊╎↸ᒷᒍϟ", // Toggle + + // Settings - Connectivity + "settings.header.connectivity": "ᔮᒍリリᒷᔮᒣ╎⍊╎ᒣ॥", + "settings.header.connectivity.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ ᔮᒍリリᒷᔮᒣ╎⍊╎ᒣ॥ ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + "settings.option.connectivity.discordRPC": "↸╎ϟᔮᒍ∷↸ ∷╎ᔮ⍑ i!∷ᒷϟᒷリᔮᒷ", // Dropdown + // Refer to term.disabled for the disabled option + "settings.header.connectivity.discordRPC.cider": "↸╎ϟi!|:ᖋ॥ ᖋϟ 'ᔮ╎↸ᒷ∷'", + "settings.header.connectivity.discordRPC.appleMusic": "↸╎ϟi!|:ᖋ॥ ᖋϟ 'ᖋi!i!|:ᒷ ᒲ⚍ϟ╎ᔮ'", + "settings.option.connectivity.discordRPC.clearOnPause": "ᔮ|:ᒷᖋ∷ ↸╎ϟᔮᒍ∷↸ ∷╎ᔮ⍑ i!∷ᒷϟᒷリᔮᒷ ᒍリ i!ᖋ⚍ϟᒷ", // Toggle + "settings.option.connectivity.lastfmScrobble": "|:ᖋϟᒣ⎓ᒲ ϟᔮ∷ᒍᕊᕊ|:╎リ┤", // Option to Connect + "settings.option.connectivity.lastfmScrobble.delay": "|:ᖋϟᒣ⎓ᒲ ϟᔮ∷ᒍᕊᕊ|:ᒷ ↸ᒷ|:ᖋ॥ (%)", + "settings.option.connectivity.lastfmScrobble.nowPlaying": "ᒷリᖋᕊ|:ᒷ |:ᖋϟᒣ⎓ᒲ リᒍ∴ i!|:ᖋ॥╎リ┤", + "settings.option.connectivity.lastfmScrobble.removeFeatured": "∷ᒷᒲᒍ⍊ᒷ ⎓ᒷᖋᒣ⚍∷╎リ┤ ᖋ∷ᒣ╎ϟᒣϟ ⎓∷ᒍᒲ ϟᒍリ┤ ᒣ╎ᒣ|:ᒷ (|:ᖋϟᒣ⎓ᒲ)", + "settings.option.connectivity.lastfmScrobble.filterLoop": "⎓╎|:ᒣᒷ∷ |:ᒍᒍi!ᒷ↸ ᒣ∷ᖋᔮ·ǀ· (|:ᖋϟᒣ⎓ᒲ)", + // Refer to term.connect for the connect button + + // Settings - Experimental + "settings.header.experimental": "ᒷ/i!ᒷ∷╎ᒲᒷリᒣᖋ|:", + "settings.header.experimental.description": "ᖋ↸⋮⚍ϟᒣ ᒣ⍑ᒷ ᒷ/i!ᒷ∷╎ᒲᒷリᒣᖋ|: ϟᒷᒣᒣ╎リ┤ϟ ⎓ᒍ∷ ᔮ╎↸ᒷ∷.", + "settings.option.experimental.compactUI": "ᔮᒍᒲi!ᖋᔮᒣ ⚍╎", // Toggle + "settings.option.experimental.closeButtonBehaviour": "ᔮ|:ᒍϟᒷ ᕊ⚍ᒣᒣᒍリ ᕊᒷ⍑ᖋ⍊╎ᒍ⚍∷", + "settings.option.experimental.closeButtonBehaviour.quit": "ᑑ⚍╎ᒣ ᔮ╎↸ᒷ∷", + "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "ᒲ╎リ╎ᒲ╎∩ᒷ ᒣᒍ ᒣᖋϟ·ǀ·ᕊᖋ∷", + "settings.option.experimental.closeButtonBehaviour.minimizeTray": "ᒲ╎リ╎ᒲ╎∩ᒷ ᒣᒍ ϟ॥ϟᒣᒷᒲ ᒣ∷ᖋ॥", + // Refer to term.disabled & term.enabled + + // Spatialization Menu + "spatial.spatialProperties" : "ϟi!ᖋᒣ╎ᖋ|: i!∷ᒍi!ᒷ∷ᒣ╎ᒷϟ", + "spatial.width" : "∴╎↸ᒣ⍑", + "spatial.height" : "⍑ᒷ╎┤⍑ᒣ", + "spatial.depth" : "↸ᒷi!ᒣ⍑", + "spatial.roomMaterials" : "∷ᒍᒍᒲ ᒲᖋᒣᒷ∷╎ᖋ|:ϟ", + "spatial.roomDimensions" : "∷ᒍᒍᒲ ↸╎ᒲᒷリϟ╎ᒍリϟ", + "spatial.roomPositions" : "∷ᒍᒍᒲ i!ᒍϟ╎ᒣ╎ᒍリϟ", + "spatial.setDimensions" : "ϟᒷᒣ ↸╎ᒲᒷリϟ╎ᒍリϟ", + "spatial.setPositions" : "ϟᒷᒣ i!ᒍϟ╎ᒣ╎ᒍリϟ", + "spatial.up" : "⚍i!", + "spatial.front" : "⎓∷ᒍリᒣ", + "spatial.left" : "|:ᒷ⎓ᒣ", + "spatial.right" : "∷╎┤⍑ᒣ", + "spatial.back" : "ᕊᖋᔮ·ǀ·", + "spatial.down" : "↸ᒍ∴リ", + "spatial.listener" : "|:╎ϟᒣᒷリᒷ∷", + "spatial.audioSource" : "ᖋ⚍↸╎ᒍ ϟᒍ⚍∷ᔮᒷ", + + // Settings - Unfinished + "settings.header.unfinished": "⚍リ⎓╎リ╎ϟ⍑ᒷ↸", + + // Web Remote + "remote.web.title": "ᔮ╎↸ᒷ∷ ∷ᒷᒲᒍᒣᒷ", + "remote.web.description": "ϟᔮᖋリ ᒣ⍑ᒷ ᑑ∷ ᔮᒍ↸ᒷ ᒣᒍ i!ᖋ╎∷ ॥ᒍ⚍∷ i!⍑ᒍリᒷ ⚍i! ∴╎ᒣ⍑ ᒣ⍑╎ϟ ᔮ╎↸ᒷ∷ ╎リϟᒣᖋリᔮᒷ", + + // About + "about.thanks": "ᒲᖋ⋮ᒍ∷ ᒣ⍑ᖋリ·ǀ·ϟ ᒣᒍ ᒣ⍑ᒷ ᔮ╎↸ᒷ∷ ᔮᒍ|:|:ᒷᔮᒣ╎⍊ᒷ ᒣᒷᖋᒲ ᖋリ↸ ᖋ|:|: ᒍ⎓ ᒍ⚍∷ ᔮᒍリᒣ∷╎ᕊ⚍ᒣᒍ∷ϟ." +} \ No newline at end of file diff --git a/src/renderer/views/components/spatial-properties.ejs b/src/renderer/views/components/spatial-properties.ejs index c0de5126..efbdcd77 100644 --- a/src/renderer/views/components/spatial-properties.ejs +++ b/src/renderer/views/components/spatial-properties.ejs @@ -73,7 +73,7 @@