okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
vapormusic 2022-02-11 09:22:44 +07:00
commit b1ebc25870
4 changed files with 67 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/i18n/README.md
View file

@ -80,4 +80,8 @@ Update 08/02/2022 10:20 UTC
* `settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility`: Added for `en_US`.
* `settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility`: Added for `en_US`.
* `term.requestError`: Added for `en_US`.
* `term.song.link.generate`: Added for `en_US`.
* `term.song.link.generate`: Added for `en_US`.
Update 10/02/2022 05:58 UTC
* `term.sortBy.dateAdded`: Added for `en_US`.

63
src/i18n/en_PISS.jsonc
View file

@ -1,5 +1,5 @@
{
{ // en_PISS Note: This language uses the ellipsis symbol (…) instead of 3 dots.
// i18n Info
"i18n.languageName": "piss", // name of language in native language
"i18n.languageNameEnglish": "English (piss)", // name of language in English
@ -70,8 +70,9 @@
"term.sortBy.artist": "pissers",
"term.sortBy.name": "piss name",
"term.sortBy.genre": "way to piss",
"term.sortBy.releaseDate": "pissed date",
"term.sortBy.releaseDate": "repissed date",
"term.sortBy.duration": "piss duration",
"term.sortBy.dateAdded": "obtained date",
"term.sortOrder": "piss-PISS",
"term.sortOrder.ascending": "pissing upwards",
"term.sortOrder.descending": "pissing downwards",
@ -95,10 +96,10 @@
"term.showMore": "more piss",
"term.showLess": "less piss",
"term.topSongs": "top piss",
"term.latestReleases": "latest piss collection",
"term.time.added": "pissed",
"term.time.released": "pissed",
"term.time.updated": "pissed",
"term.latestReleases": "latest piss",
"term.time.added": "obtained",
"term.time.released": "repissed",
"term.time.updated": "pissdated",
"term.time.hours": "hours",
"term.time.hour": "hour",
"term.time.minutes": "minutes",
@ -132,11 +133,13 @@
"term.sharedPlaylists": "shared pisslists", // Search Results
"term.people": "pissers", // Search Results
"term.newpreset.name": "new advanced piss prepiss name", // Equalizer Preset
"term.addedpreset": "pissed prepiss",
"term.deletepreset.warn": "are you sure you want to unpiss this prepiss?",
"term.deletedpreset": "unpissed prepiss",
"term.musicVideos": "piss music videos", // Search page friendlyTypes
"term.stations": "pisses",
"term.addedpreset": "obtained prepiss",
"term.deletepreset.warn": "are you sure you want to obliterate this prepiss?",
"term.deletedpreset": "obliterated prepiss",
"term.requestError": "the request got pissed on",
"term.song.link.generate": "pissing on piss.link…",
"term.musicVideos": "piss videos", // Search page friendlyTypes
"term.stations": "piss stations",
"term.curators": "pissators",
"term.appleCurators": "piss pissators",
"term.radioShows": "shows that piss everywhere",
@ -216,8 +219,8 @@
"action.tray.show": "piss back",
"action.update": "piss!",
"action.copy": "copiss",
"action.newpreset": "new prepiss...", // Equalizer Preset
"action.deletepreset": "unpiss prepiss",
"action.newpreset": "new prepiss…", // Equalizer Preset
"action.deletepreset": "obliterate prepiss",
// Settings - General
"settings.header.general": "general",
@ -230,25 +233,35 @@
"settings.option.general.language.unsorted": "???? who put this here",
// Update Cider
"settings.option.general.updateCider": "piss on cider", // Button
"settings.option.general.updateCider": "piss on cider", // Button. Refer to term.check for the check button
"settings.option.general.updateCider.branch": "where to piss on cider", // Dropdown
"settings.option.general.updateCider.branch.description": "there are two toilets, where do you want to piss?",
"settings.option.general.updateCider.branch.main": "smooth pissing experience",
"settings.option.general.updateCider.branch.develop": "cutting-edge piss development",
// Settings - Audio
"settings.header.audio": "piss sounds",
"settings.header.audio.description": "change how your piss sounds",
"settings.option.audio.quality": "piss quality", // Dropdown
"settings.header.audio.quality.hireslossless": "ungodly piss",
"settings.header.audio.quality.hireslossless.description": "(up to 24-pisses/192 piss hertz)",
"settings.header.audio.quality.hireslossless.description": "up to 24-piss/192 pissHz",
"settings.header.audio.quality.lossless": "colorful piss",
"settings.header.audio.quality.lossless.description": "(up to 24-pisses/48 piss hertz)",
"settings.header.audio.quality.enhanced": "enhanced piss",
"settings.header.audio.quality.lossless.description": "up to 24-piss/48 pissHz",
"settings.header.audio.quality.enhanced": "business class piss",
"settings.header.audio.quality.high": "nice piss",
"settings.header.audio.quality.low": "piss with blood",
"settings.header.audio.quality.auto": "automatic piss",
"settings.header.audio.quality.high.description": "256 kpiss",
"settings.header.audio.quality.standard": "piss with blood",
"settings.header.audio.quality.standard.description": "64 kpiss",
"settings.option.audio.seamlessTransition": "seamless piss-to-piss transition", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "cool piss tricks", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "enabling the AudioContext thingy allows you to do cool stuffs, however on some systems your song may stutter",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "clear piss™️", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "makes your bladder go overboard and makes your piss crisp and clear.",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Audio Pissifier™️", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "makes your bladder go overboard and makes your piss crisp and clear",
"settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "pissifier dont go well with 3d piss. turn it off and try again.",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "pissifier strength", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "tune your bladder (blood may appear with turbo strength)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "normal piss",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "turbo piss",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "piss normaliztion", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "protect your eardrums from overly loud/slient pisses",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "3D piss", // Toggle
@ -279,7 +292,7 @@
"settings.header.visual.theme": "colored piss",
// Settings - Visual - Theme name
"settings.option.visual.theme.default": "regular piss",
"settings.option.visual.theme.default": "same old piss",
"settings.option.visual.theme.dark": "black piss",
// Refer to term.disabled for the disabled option
@ -305,7 +318,7 @@
"settings.option.connectivity.lastfmScrobble": "Piss.fm scrobbling", // Option to Connect
"settings.option.connectivity.lastfmScrobble.delay": "Piss.fm scrobble delay (%)",
"settings.option.connectivity.lastfmScrobble.nowPlaying": "push now playing data to Piss.fm",
"settings.option.connectivity.lastfmScrobble.removeFeatured": "remove featured pissers from piss names (Piss.fm)",
"settings.option.connectivity.lastfmScrobble.removeFeatured": "dump featured pissers from piss names (Piss.fm)",
"settings.option.connectivity.lastfmScrobble.filterLoop": "filter same piss (Piss.fm)",
// Refer to term.connect for the connect button
@ -344,7 +357,7 @@
// Web Remote
"remote.web.title": "piss remote",
"remote.web.description": "piss on your phone camera to connect to Cider.",
"remote.web.description": "piss on your phone camera to pair with Cider.",
// About
"about.thanks": "thanks to the Cider Collective team and all the pisseneers putting this together"

4
src/i18n/zh_TW.jsonc
View file

@ -49,7 +49,7 @@
"term.newPlaylistFolder": "新播放列表資料夾",
"term.createNewPlaylist": "新增播放列表",
"term.createNewPlaylistFolder": "新增播放列表資料夾",
"term.deletePlaylist": "您確認要删除该播放列表吗?",
"term.deletePlaylist": "您確定要刪除此播放列表嗎？",
"term.play": "播放",
"term.pause": "暫停",
"term.previous": "上一首",
@ -60,7 +60,7 @@
"term.mute": "靜音",
"term.unmute": "取消靜音",
"term.share": "分享",
"term.share.success": "已複製至剪貼簿",
"term.share.success": "已複製到剪貼簿",
"term.settings": "設定",
"term.seeAll": "顯示全部",
"term.sortBy": "排序",

39
src/renderer/views/pages/home.ejs
View file

@ -8,7 +8,7 @@
<h3>{{app.getLz('home.recentlyPlayed')}}</h3>
</div>
<div class="col-auto nopadding flex-center">
<button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.seeAll')}}</button>
<button class="cd-btn-seeall" @click="seeAllHistory()">{{app.getLz('term.history')}}</button>
</div>
</div>
<div class="well artistfeed-well">
@ -54,7 +54,7 @@
<h3>{{app.getLz('home.madeForYou')}}</h3>
<div class="well">
<vue-horizontal v-if="isSectionReady('madeForYou')">
<mediaitem-square kind="small" v-for="item in madeForYou" :item="item"></mediaitem-square>
<mediaitem-square kind="small" v-for="item in madeForYou" :item="item"></mediaitem-square>
</vue-horizontal>
<div class="spinner" v-else></div>
</div>
@ -72,9 +72,8 @@
</div>
<div class="well">
<vue-horizontal v-if="isSectionReady('friendsListeningTo')">
<mediaitem-square kind="small" v-for="item in friendsListeningTo"
:item="item"></mediaitem-square>
</vue-horizontal>
<mediaitem-square kind="small" v-for="item in friendsListeningTo" :item="item"></mediaitem-square>
</vue-horizontal>
<div class="spinner" v-else></div>
</div>
</div>
@ -86,7 +85,7 @@
<script>
Vue.component('cider-home', {
template: '#cider-home',
data: function () {
data: function() {
return {
app: this.$root,
followedArtists: this.$root.cfg.home.followedArtists,
@ -112,7 +111,9 @@
},
methods: {
async seeAllHistory() {
let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, { l : this.$root.mklang})
let hist = await app.mk.api.v3.music(`/v1/me/recent/played/tracks`, {
l: this.$root.mklang
})
app.showCollection(hist.data, app.getLz('term.history'))
},
isSectionReady(section) {
@ -122,7 +123,7 @@
let self = this
return {
name: "Remove from Favorites",
action: function (item) {
action: function(item) {
let index = self.favoriteItems.findIndex(x => x.id == item.id)
if (index > -1) {
self.favoriteItems.splice(index, 1)
@ -143,12 +144,16 @@
}
}
if (playlists.length != 0) {
this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`, { l : this.$root.mklang}).then(playlistsData => {
this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/playlists/${playlists.toString()}`, {
l: this.$root.mklang
}).then(playlistsData => {
self.favorites.push(...playlistsData.data)
})
}
if (libraryPlaylists.length != 0) {
this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`, { l : this.$root.mklang}).then(playlistsData => {
this.app.mk.api.v3.music(`v1/me/library/playlists/${playlists.toString()}`, {
l: this.$root.mklang
}).then(playlistsData => {
self.favorites.push(...playlistsData.data)
})
}
@ -158,11 +163,11 @@
let self = this
this.app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/artists?ids=${artists.toString()}&views=latest-release&include[songs]=albums&fields[albums]=artistName,artistUrl,artwork,contentRating,editorialArtwork,editorialVideo,name,playParams,releaseDate,url,trackCount&limit[artists:top-songs]=2&art[url]=f&l=${this.$root.mklang}`).then(artistData => {
artistData.data.data.forEach(item => {
if (item.views["latest-release"].data.length != 0) {
self.artistFeed.push(item.views["latest-release"].data[0])
}
})
// sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
if (item.views["latest-release"].data.length != 0) {
self.artistFeed.push(item.views["latest-release"].data[0])
}
})
// sort artistFeed by attributes.releaseDate descending, date is formatted as "YYYY-MM-DD"
this.artistFeed.sort((a, b) => {
let dateA = new Date(a.attributes.releaseDate)
let dateB = new Date(b.attributes.releaseDate)
@ -185,7 +190,7 @@
return section
};
})[0].relationships.contents.data
} catch (err) { }
} catch (err) {}
self.sectionsReady.push("madeForYou")
try {
@ -195,7 +200,7 @@
return section
};
})[0].relationships.contents.data
} catch (err) { }
} catch (err) {}
self.sectionsReady.push("recentlyPlayed")
self.sectionsReady.push("friendsListeningTo")
});