justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 15:50:16 +02:00
Code Issues Projects Packages Wiki Activity Actions

Use full phases for skip buttons for better translations (#304)

Browse source 
Changes the skip segment button text to use a single phrase instead of
concatenating two strings. This allows correct context when translating.

Follow up from #292
This commit is contained in:
damontecres 2025-11-22 18:39:58 -05:00 • committed by GitHub
parent 6029db8021
commit 9a3a33fdd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/github/damontecres/wholphin/ui/Formatting.kt
View file

@ -181,3 +181,15 @@ val MediaSegmentType.stringRes: Int
MediaSegmentType.OUTRO -> R.string.outro
MediaSegmentType.INTRO -> R.string.intro
}
@get:StringRes
val MediaSegmentType.skipStringRes: Int
get() =
when (this) {
MediaSegmentType.UNKNOWN -> R.string.skip_segment_unknown
MediaSegmentType.COMMERCIAL -> R.string.skip_segment_commercial
MediaSegmentType.PREVIEW -> R.string.skip_segment_preview
MediaSegmentType.RECAP -> R.string.skip_segment_recap
MediaSegmentType.OUTRO -> R.string.skip_segment_outro
MediaSegmentType.INTRO -> R.string.skip_segment_intro
}

4
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackControls.kt
View file

@ -62,7 +62,7 @@ import com.github.damontecres.wholphin.R
import com.github.damontecres.wholphin.ui.AppColors
import com.github.damontecres.wholphin.ui.seekBack
import com.github.damontecres.wholphin.ui.seekForward
import com.github.damontecres.wholphin.ui.stringRes
import com.github.damontecres.wholphin.ui.skipStringRes
import com.github.damontecres.wholphin.ui.tryRequestFocus
import com.github.damontecres.wholphin.util.ExceptionHandler
import kotlinx.coroutines.delay
@ -199,7 +199,7 @@ fun PlaybackControls(
.padding(end = 32.dp),
) {
Text(
text = stringResource(R.string.skip) + " " + stringResource(segment.type.stringRes),
text = stringResource(segment.type.skipStringRes),
)
}
}

5
app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
View file

@ -60,7 +60,6 @@ import androidx.tv.material3.Button
import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import androidx.tv.material3.surfaceColorAtElevation
import com.github.damontecres.wholphin.R
import com.github.damontecres.wholphin.data.model.ItemPlayback
import com.github.damontecres.wholphin.data.model.Playlist
import com.github.damontecres.wholphin.preferences.PlayerBackend
@ -74,7 +73,7 @@ import com.github.damontecres.wholphin.ui.nav.Destination
import com.github.damontecres.wholphin.ui.preferences.subtitle.SubtitleSettings.applyToMpv
import com.github.damontecres.wholphin.ui.preferences.subtitle.SubtitleSettings.toSubtitleStyle
import com.github.damontecres.wholphin.ui.seasonEpisode
import com.github.damontecres.wholphin.ui.stringRes
import com.github.damontecres.wholphin.ui.skipStringRes
import com.github.damontecres.wholphin.ui.tryRequestFocus
import com.github.damontecres.wholphin.util.ExceptionHandler
import com.github.damontecres.wholphin.util.LoadingState
@ -413,7 +412,7 @@ fun PlaybackPage(
modifier = Modifier.focusRequester(focusRequester),
) {
Text(
text = stringResource(R.string.skip) + " " + stringResource(segment.type.stringRes),
text = stringResource(segment.type.skipStringRes),
)
}
}

6
app/src/main/res/values-de/strings.xml
View file

@ -274,4 +274,10 @@
<string name="skip_back_preference">Zurückspringen</string>
<string name="player_backend">Wiedergabe backend</string>
<string name="rewatch_next_up">Aktiviere erneut wiedergeben in als nächstes</string>
<string name="skip_segment_unknown">Segment Überspringen</string>
<string name="skip_segment_commercial">Werbung Überspringen</string>
<string name="skip_segment_preview">Vorschau Überspringen</string>
<string name="skip_segment_recap">Rückblick Überspringen</string>
<string name="skip_segment_outro">Outro Überspringen</string>
<string name="skip_segment_intro">Intro Überspringen</string>
</resources>

6
app/src/main/res/values/strings.xml
View file

@ -313,6 +313,12 @@
<string name="disable_if_crash">Disable if you experience crashes</string>
<string name="mpv_options">MPV Options</string>
<string name="exoplayer_options">ExoPlayer Options</string>
<string name="skip_segment_unknown">Skip Segment</string>
<string name="skip_segment_commercial">Skip Ads</string>
<string name="skip_segment_preview">Skip Preview</string>
<string name="skip_segment_recap">Skip Recap</string>
<string name="skip_segment_outro">Skip Outro</string>
<string name="skip_segment_intro">Skip Intro</string>
<string-array name="theme_song_volume">
<item>Disabled</item>