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

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

Browse source
This commit is contained in:
booploops 2022-01-24 21:58:02 -08:00
commit edccd3dfb6
11 changed files with 118 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/i18n/en_GB.jsonc
View file

@ -1,3 +1,5 @@
{
"date.format": "${d} ${m}, ${y}",
"home.friendsListeningTo": "Bruv's Listening To"
}

7
src/i18n/en_US.jsonc
View file

@ -1,6 +1,9 @@
{ // Base File
// App info
"app.name": "Cider",
"date.format": "${m} ${d}, ${y}",
// Dialogs
"dialog.cancel": "Cancel",
"dialog.ok": "OK",
@ -9,6 +12,7 @@
"notification.updatingLibrarySongs": "Updating library songs...",
"notification.updatingLibraryAlbums": "Updating library albums...",
"notification.updatingLibraryArtists": "Updating library artists...",
"notification.connectionError": "There was a problem connecting to Apple Music.",
// Terms
"term.appleMusic": "Apple Music",
@ -80,7 +84,8 @@
"term.time.updated": "Updated",
"term.fullscreenView": "Fullscreen View",
"term.defaultView": "Default View",
"term.spacializedAudioSetting": "Spacialized Audio Setting",
"term.clearAll": "Clear All",
// Home
"home.title": "Home",

22
src/i18n/ja_JP.jsonc
View file

@ -1,6 +1,9 @@
{
// App info
"app.name": "Cider",
"date.format": "${y}年${m}月${d}日",
// Dialogs
"dialog.cancel": "キャンセル",
"dialog.ok": "OK",
@ -9,6 +12,7 @@
"notification.updatingLibrarySongs": "ライブラリの更新中...",
"notification.updatingLibraryAlbums": "ライブラリの更新中...",
"notification.updatingLibraryArtists": "ライブラリの更新中...",
"notification.connectionError": "Apple Musicに接続できません。",
// Terms
"term.appleMusic": "Apple Music", // Follows brand term
@ -43,7 +47,7 @@
"term.unmute": "ミュート解除",
"term.share": "共有",
"term.settings": "設定",
"term.seeAll": "すべてを表示",
"term.seeAll": "すべて見る",
"term.sortBy": "並べ替え",
"term.sortBy.album": "アルバム",
"term.sortBy.artist": "アーティスト",
@ -64,6 +68,20 @@
"term.enabled": "ON",
"term.disabled": "OFF",
"term.connect": "接続",
"term.confirm": "よろしいでしょうか？",
"term.more": "もっと",
"term.less": "減らす",
"term.showMore": "もっと見る",
"term.showLess": "表示数を少なくする",
"term.topSongs" : "人気曲",
"term.latestReleases": "ニューリリース",
"term.time.added": "追加日",
"term.time.released": "配信開始日",
"term.time.updated": "最終更新日",
"term.fullscreenView": "全画面表示",
"term.defaultView": "ウィンドウ表示",
"term.spacializedAudioSetting": "オーディオ空間化設定",
"term.clearAll": "クリア",
// Home
"home.title": "ホーム",
@ -170,6 +188,6 @@
// Web Remote
"remote.web.title": "Cider リモート",
"remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする",
"remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする"
}

18
src/i18n/zh_CN.jsonc
View file

@ -1,6 +1,9 @@
{
// App info
"app.name": "Cider",
"date.format": "${y}年${m}月${d}日",
// Dialogs
"dialog.cancel": "取消",
"dialog.ok": "确定",
@ -9,6 +12,7 @@
"notification.updatingLibrarySongs": "正在更新资料库的歌曲信息...",
"notification.updatingLibraryAlbums": "正在更新资料库的专辑信息...",
"notification.updatingLibraryArtists": "正在更新资料库的艺人信息...",
"notification.connectionError": "无法连接到 Apple Music。",
// Terms
"term.appleMusic": "Apple Music", // Follows brand term
@ -64,6 +68,20 @@
"term.enabled": "已启用",
"term.disabled": "已禁用",
"term.connect": "连接",
"term.confirm": "确认？",
"term.more": "更多",
"term.less": "较少",
"term.showMore": "显示更多",
"term.showLess": "显示更少",
"term.topSongs" : "热门歌曲",
"term.latestReleases": "最新发行",
"term.time.added": "添加于",
"term.time.released": "发行于",
"term.time.updated": "更新于",
"term.fullscreenView": "全屏",
"term.defaultView": "默认",
"term.spacializedAudioSetting": "音频空间化设置",
"term.clearAll": "清空",
// Home
"home.title": "主页",

2
src/i18n/zh_HK.jsonc
View file

@ -2,6 +2,8 @@
// App info
"app.name": "Cider",
"date.format": "${y}年${m}月${d}日",
// Dialogs
"dialog.cancel": "取消",
"dialog.ok": "確認",

19
src/i18n/zh_TW.jsonc
View file

@ -2,6 +2,8 @@
// App info
"app.name": "Cider",
"date.format": "${y}年${m}月${d}日",
// Dialogs
"dialog.cancel": "取消",
"dialog.ok": "OK",
@ -10,6 +12,7 @@
"notification.updatingLibrarySongs": "正在更新資料庫的歌曲...",
"notification.updatingLibraryAlbums": "正在更新資料庫的專輯...",
"notification.updatingLibraryArtists": "正在更新資料庫的藝人...",
"notification.connectionError": "無法連接到 Apple Music。",
// Terms
"term.appleMusic": "Apple Music", // Follows brand term
"term.applePodcasts": "Apple Podcasts", // Follows brand term
@ -64,6 +67,20 @@
"term.enabled": "已啟用",
"term.disabled": "已停用",
"term.connect": "連接",
"term.confirm": "確定？",
"term.more": "更多",
"term.less": "更少",
"term.showMore": "顯示更多",
"term.showLess": "顯示更少",
"term.topSongs" : "熱門歌曲",
"term.latestReleases": "最新發行",
"term.time.added": "加入于",
"term.time.released": "發行于",
"term.time.updated": "更改于",
"term.fullscreenView": "全螢幕顯示",
"term.defaultView": "預設顯示",
"term.spacializedAudioSetting": "音訊空間化設定",
"term.clearAll": "清空",
// Home
"home.title": "主頁",
@ -165,7 +182,7 @@
// Settings - Experimental
"settings.header.experimental": "實驗性功能",
"settings.header.experimental.description": "調整Cider的實驗性功能",
"settings.header.experimental.description": "調整 Cider 的實驗性功能",
"settings.option.experimental.compactUI": "緊凑型UI", // Toggle
// Refer to term.disabled & term.enabled

11
src/renderer/index.js
View file

@ -3373,7 +3373,16 @@ const app = new Vue({
//this.modals.qrcode = true;
}
function checkMarquee(){
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) {
document.getElementsByClassName('song-artist')[0].classList.add('marquee');
document.getElementsByClassName('song-artist')[1].classList.add('marquee-after');
}
if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) {
document.getElementsByClassName('song-name')[0].classList.add('marquee');
document.getElementsByClassName('song-name')[1].classList.add('marquee-after');
}
}
}
})

49
src/renderer/style.less
View file

@ -1112,27 +1112,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
}
.app-chrome .app-chrome-item > .app-playback-controls .song-artist {
font-weight: 400;
font-size: 12px;
text-align: center;
/*height: 1.2em;
line-height: 1.2em;*/
z-index: 1;
max-width: 360px;
.song-artist-normal {
height: inherit;
}
&.song-artist-marquee {
> marquee {
margin-bottom: -3px;
}
}
}
.app-chrome .app-chrome-item > .app-playback-controls .song-progress {
@bgColor: transparent;
@ -1256,7 +1236,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
overflow: hidden;
}
.app-chrome .app-chrome-item > .app-playback-controls .playback-info > div {
.app-chrome .app-chrome-item > .app-playback-controls .playback-info > .song-progress{
width: 100%;
}
@ -1267,6 +1247,31 @@ input[type=range].web-slider::-webkit-slider-runnable-track {
display: flex;
position: relative;
}
.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album {
font-weight: 400;
font-size: 12px;
text-align: center;
/*height: 1.2em;
line-height: 1.2em;*/
z-index: 1;
align-items: center;
justify-content: center;
width: 80%;
max-width: 340px;
overflow: hidden;
.song-artist-normal {
height: inherit;
}
&.song-artist-marquee {
> marquee {
margin-bottom: -3px;
}
}
}
.display--small {
display: none !important;
@ -4570,7 +4575,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
.queue-col {
width: 60vh;
height: 50vh;
height: 62vh;
.queue-title {
opacity: 0.6;

2
src/renderer/views/components/queue.ejs
View file

@ -33,7 +33,7 @@
</draggable>
</div>
<div class="queue-footer">
<button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">Clear All</button>
<button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
</div>
</div>
</script>

20
src/renderer/views/main.ejs
View file

@ -96,7 +96,7 @@
style="display: inline-block"></div>
</div>
<!-- :class="[isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') ? 'marquee' : '']" -->
<div class="song-artist"
<div class="song-artist-album"
style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap;">
<div class="item-navigate song-artist" style="display: inline-block"
@click="getNowPlayingItemDetailed(`artist`)">
@ -188,7 +188,7 @@
@focus="search.showHints = true"
@blur="setTimeout(()=>{search.showHints = false}, 300)"
v-on:keyup.enter="searchQuery();search.showHints = false" @change="showSearch();"
@input="getSearchHints()" placeholder="Search..." v-model="search.term"
@input="getSearchHints()" :placeholder="$root.getLz('term.search') + ' ...'" v-model="search.term"
ref="searchInput" class="search-input">
</div>
</div>
@ -247,7 +247,7 @@
<button class="usermenu-item" @click="toggleHideUserInfo()">
<div class="row nopadding">
<div class="col nopadding">
Show Personal Info
{{$root.getLz('settings.option.visual.showPersonalInfo')}}
</div>
<div class="col-auto nopadding" v-if="!chrome.hideUserInfo">
✔️
@ -257,7 +257,7 @@
<button class="usermenu-item" @click="mk.privateEnabled = !mk.privateEnabled">
<div class="row nopadding">
<div class="col nopadding">
Private Session
{{$root.getLz('term.privateSession')}}
</div>
<div class="col-auto nopadding" v-if="mk.privateEnabled">
✔️
@ -266,22 +266,22 @@
</button>
<button class="usermenu-item" v-if="cfg.advanced.AudioContext && cfg.audio.spatial"
@click="modals.spatialProperties = true">
Spatialized Audio Settings
{{$root.getLz('term.spacializedAudioSetting')}}
</button>
<button class="usermenu-item" @click="appRoute('apple-account-settings')">
Account Settings
{{$root.getLz('term.accountSettings')}}
</button>
<button class="usermenu-item" @click="appRoute('about')">
About
{{$root.getLz('term.about')}}
</button>
<button class="usermenu-item" @click="window.open('https://discord.gg/applemusic')">
Discord
{{$root.getLz('term.discord')}}
</button>
<button class="usermenu-item" @click="appRoute('settings')">
Settings
{{$root.getLz('term.settings')}}
</button>
<button class="usermenu-item" @click="unauthorize()">
Sign Out
{{$root.getLz('term.logout')}}
</button>
</div>
</div>

4
src/renderer/views/pages/cider-playlist.ejs
View file

@ -48,7 +48,7 @@
<div v-else-if="data.attributes.description.standard" class="content" v-html="data.attributes.description.standard"></div>
<button v-if="data.attributes.description.short" class="more-btn"
@click="editorialNotesExpanded = !editorialNotesExpanded">
{{app.getLz('term.more')}}
{{app.getLz('term.showMore')}}
</button>
</div>
</div>
@ -57,7 +57,7 @@
<div class="playlist-desc-expanded">
<div class="content"
v-html="((data.attributes.editorialNotes) ? (data.attributes.editorialNotes.standard ?? (data.attributes.editorialNotes.short ?? '') ) : (data.attributes.description ? (data.attributes.description.standard ?? (data.attributes.description.short ?? '')) : ''))"></div>
<button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.less')}}
<button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.showLess')}}
</button>
</div>
</template>