diff --git a/src/i18n/en_GB.json b/src/i18n/en_GB.json index 7e4f865d..6555b245 100644 --- a/src/i18n/en_GB.json +++ b/src/i18n/en_GB.json @@ -12,6 +12,9 @@ "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Spatialise audio and make audio more 3-dimensional (note: This is not Dolby Atmos)", "spatial.notTurnedOn": "Audio Spatialisation is disabled. To use, please enable it first.", "action.tray.minimize": "Minimise to Tray", - "term.track": "song", - "term.tracks": "songs" + "term.tracks": "songs", + "term.track": { + "one" : "song", + "other" : "songs" + } } diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 06f4d0fd..2e0f5e81 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -92,13 +92,25 @@ "term.time.released": "Released", "term.time.updated": "Updated", "term.time.days": "days", - "term.time.day": "day", + "term.time.day": { + "one": "day", + "other": "days" + }, "term.time.hours": "hours", - "term.time.hour": "hour", + "term.time.hour": { + "one": "hour", + "other": "hours" + }, "term.time.minutes": "minutes", - "term.time.minute": "minute", + "term.time.minute": { + "one": "minute", + "other": "minutes" + }, "term.time.seconds": "seconds", - "term.time.second": "second", + "term.time.second": { + "one": "second", + "other": "seconds" + }, "term.fullscreenView": "Fullscreen View", "term.defaultView": "Default View", "term.audioSettings": "Audio Settings", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 06f4d0fd..2e0f5e81 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -92,13 +92,25 @@ "term.time.released": "Released", "term.time.updated": "Updated", "term.time.days": "days", - "term.time.day": "day", + "term.time.day": { + "one": "day", + "other": "days" + }, "term.time.hours": "hours", - "term.time.hour": "hour", + "term.time.hour": { + "one": "hour", + "other": "hours" + }, "term.time.minutes": "minutes", - "term.time.minute": "minute", + "term.time.minute": { + "one": "minute", + "other": "minutes" + }, "term.time.seconds": "seconds", - "term.time.second": "second", + "term.time.second": { + "one": "second", + "other": "seconds" + }, "term.fullscreenView": "Fullscreen View", "term.defaultView": "Default View", "term.audioSettings": "Audio Settings", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index ff339827..2573e87a 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1426,10 +1426,10 @@ const app = new Vue({ const m = Math.floor(seconds % 3600 / 60); const s = Math.floor(seconds % 60); - const dDisplay = d > 0 ? d + (d === 1 ? ` ${app.getLz("term.time.day")}, ` : ` ${app.getLz("term.time.days")}, `) : ""; - const hDisplay = h > 0 ? h + (h === 1 ? ` ${app.getLz("term.time.hour")}, ` : ` ${app.getLz("term.time.hours")}, `) : ""; - const mDisplay = m > 0 ? m + (m === 1 ? ` ${app.getLz("term.time.minute")}, ` : ` ${app.getLz("term.time.minutes")}, `) : ""; - const sDisplay = s > 0 ? s + (s === 1 ? ` ${app.getLz("term.time.second")}` : ` ${app.getLz("term.time.seconds")}`) : ""; + const dDisplay = d > 0 ? `${d} ${app.getLz("term.time.day", {"count": d})}, ` : ""; + const hDisplay = h > 0 ? `${h} ${app.getLz("term.time.hour", {"count": h})}, ` : ""; + const mDisplay = m > 0 ? `${m} ${app.getLz("term.time.minute", {"count": m})}, ` : ""; + const sDisplay = s > 0 ? `${s} ${app.getLz("term.time.second", {"count": s})}` : ""; return dDisplay + hDisplay + mDisplay + sDisplay; }