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-02 16:23:08 +07:00
commit 360a17cce3
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/i18n/README.md
View file

@ -17,3 +17,6 @@ been modified, the ones not mentioned in the list need modifying.
* `settings.option.experimental.closeButtonBehaviour`: Changed to `close_button_hide` - Should be "Close Button Should Hide the Application". `.quit`, `.minimizeTaskbar` and `.minimizeTray` have been removed. Translations done for en_US. * `settings.option.experimental.closeButtonBehaviour`: Changed to `close_button_hide` - Should be "Close Button Should Hide the Application". `.quit`, `.minimizeTaskbar` and `.minimizeTray` have been removed. Translations done for en_US.
* `action.update`: Added for `en_US`. * `action.update`: Added for `en_US`.
* `term.topResult`: "Top Result" - Added for `en_US`.
* `term.sharedPlaylists`: "Shared Playlists" - Added for `en_US`.
* `term.people`: "People" - Added for `en_US`.

3
src/i18n/en_US.jsonc
View file

@ -127,6 +127,9 @@
"term.check": "Check", "term.check": "Check",
"term.aboutArtist": "About {{artistName}}", // e.g. 'About Doja Cat' "term.aboutArtist": "About {{artistName}}", // e.g. 'About Doja Cat'
"term.updateCider": "Update Cider", "term.updateCider": "Update Cider",
"term.topResult": "Top Result", // Search Results
"term.sharedPlaylists": "Shared Playlists", // Search Results
"term.people": "People", // Search Results
// Home // Home
"home.title": "Home", "home.title": "Home",

11
src/renderer/views/pages/search.ejs
View file

@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-sm" style="width: auto;" v-if="getTopResult()"> <div class="col-sm" style="width: auto;" v-if="getTopResult()">
<template> <template>
<h3>Top Result</h3> <h3>{{app.getLz('term.topResult')}}</h3>
<mediaitem-square :item="getTopResult()"></mediaitem-square> <mediaitem-square :item="getTopResult()"></mediaitem-square>
</template> </template>
</div> </div>
@ -15,7 +15,7 @@
<div class="col" v-if="search.results.song"> <div class="col" v-if="search.results.song">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h3>Songs</h3> <h3>{{app.getLz('term.songs')}}</h3>
</div> </div>
<div class="col-auto flex-center" <div class="col-auto flex-center"
@click="app.showSearchView(app.search.term, 'song', app.friendlyTypes('song'))" @click="app.showSearchView(app.search.term, 'song', app.friendlyTypes('song'))"
@ -41,8 +41,7 @@
</div> </div>
<div class="col-auto flex-center" v-if="search.results[section].data.length >= 10"> <div class="col-auto flex-center" v-if="search.results[section].data.length >= 10">
<button class="cd-btn-seeall" <button class="cd-btn-seeall"
@click="app.showSearchView(app.search.term, section, app.friendlyTypes(section))">See @click="app.showSearchView(app.search.term, section, app.friendlyTypes(section))">{{app.getLz('term.seeAll')}}
All
</button> </button>
</div> </div>
</div> </div>
@ -59,7 +58,7 @@
<template v-if="search.resultsSocial.playlist"> <template v-if="search.resultsSocial.playlist">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h3>Shared Playlists</h3> <h3>{{app.getLz('term.sharedPlaylists')}}</h3>
</div> </div>
<div class="col-auto flex-center" v-if="search.resultsSocial.playlist.data.length >= 10"> <div class="col-auto flex-center" v-if="search.resultsSocial.playlist.data.length >= 10">
<button class="cd-btn-seeall" <button class="cd-btn-seeall"
@ -73,7 +72,7 @@
<template v-if="search.resultsSocial.profile"> <template v-if="search.resultsSocial.profile">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h3>People</h3> <h3>{{app.getLz('term.people')}}</h3>
</div> </div>
<div class="col-auto flex-center" v-if="search.resultsSocial.profile.data.length >= 10"> <div class="col-auto flex-center" v-if="search.resultsSocial.profile.data.length >= 10">
<button class="cd-btn-seeall" <button class="cd-btn-seeall"