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:
booploops 2022-02-11 20:22:25 -08:00
commit d1a9c8f8a2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/i18n/en_US.jsonc
View file

@ -125,10 +125,10 @@
"term.equalizer": "Equalizer", "term.equalizer": "Equalizer",
"term.reset": "Reset", "term.reset": "Reset",
// Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
"term.track": { // "term.track": {
"one" : "track", // "one" : "track",
"other" : "tracks" // "other" : "tracks"
}, // },
"term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks
"term.videos": "Videos", "term.videos": "Videos",
"term.menu": "Menu", "term.menu": "Menu",

2
src/renderer/index.js
View file

@ -2153,7 +2153,7 @@ const app = new Vue({
let hours = Math.floor(time / 3600) let hours = Math.floor(time / 3600)
let mins = Math.floor(time / 60) % 60 let mins = Math.floor(time / 60) % 60
let secs = time % 60 let secs = time % 60
return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.track', options = {count : app.showingPlaylist.relationships.tracks.data.length}) + ", " return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.tracks', options = {count : app.showingPlaylist.relationships.tracks.data.length}) + ", "
+ ((hours > 0) ? (hours + (" " + (app.getLz('term.time.hour', options = {count : hours}) + ", "))) : "") + + ((hours > 0) ? (hours + (" " + (app.getLz('term.time.hour', options = {count : hours}) + ", "))) : "") +
((mins > 0) ? (mins + (" " + app.getLz('term.time.minute', options = {count : mins}) + ", ")) : "") + ((mins > 0) ? (mins + (" " + app.getLz('term.time.minute', options = {count : mins}) + ", ")) : "") +
secs + (" " + app.getLz('term.time.second', options = {count : secs}) + "."); secs + (" " + app.getLz('term.time.second', options = {count : secs}) + ".");