diff --git a/components/app/AudioPlayer.vue b/components/app/AudioPlayer.vue index 4455132a..7a4e33ea 100644 --- a/components/app/AudioPlayer.vue +++ b/components/app/AudioPlayer.vue @@ -77,7 +77,7 @@ @click.stop="jumpBackwards" > {{ jumpBackwardsItem.icon }} - {{ jumpBackwardsItem.label }} + {{ jumpBackwardsLabel }}
@@ -92,7 +92,7 @@ @click.stop="jumpForward" > {{ jumpForwardItem.icon }} - {{ jumpForwardItem.label }} + {{ jumpForwardLabel }}
last_page
@@ -126,6 +126,7 @@ import { AbsAudioPlayer } from '@/plugins/capacitor' import { Dialog } from '@capacitor/dialog' import { FastAverageColor } from 'fast-average-color' import WrappingMarquee from '@/assets/WrappingMarquee.js' +import jumpLabelMixin from '@/mixins/jumpLabel' export default { props: { @@ -137,6 +138,7 @@ export default { sleepTimeRemaining: Number, serverLibraryItemId: String }, + mixins: [jumpLabelMixin], data() { return { windowHeight: 0, @@ -243,6 +245,12 @@ export default { jumpBackwardsItem() { return this.$store.getters['globals/getJumpBackwardsItem'](this.jumpBackwardsTime) }, + jumpForwardLabel() { + return this.getJumpLabel(this.jumpForwardTime) + }, + jumpBackwardsLabel() { + return this.getJumpLabel(this.jumpBackwardsTime) + }, jumpForwardTime() { return this.$store.getters['getJumpForwardTime'] }, @@ -959,7 +967,7 @@ export default { }, showProgressSyncSuccess() { this.syncStatus = this.$constants.SyncStatus.SUCCESS - } + }, }, mounted() { this.updateScreenSize() diff --git a/mixins/jumpLabel.js b/mixins/jumpLabel.js new file mode 100644 index 00000000..0a026fff --- /dev/null +++ b/mixins/jumpLabel.js @@ -0,0 +1,12 @@ +export default { + methods: { + getJumpLabel(seconds) { + const val = Number(seconds) + if (isNaN(val)) return '' + const useMinutes = val >= 120 // keep 60s as seconds + const key = useMinutes ? 'UnitMinutesShort' : 'UnitSecondsShort' + const unitValue = useMinutes ? val / 60 : val + return this.$getString(key, [this.$formatNumber(unitValue)]) + } + } +} diff --git a/pages/settings.vue b/pages/settings.vue index 05ffc376..978daa60 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -187,8 +187,10 @@