edde746
369c6279d6
A Portuguese user reported "Skip Intro" rendering in English on Android TV.
The locale files were not the problem - all 22 were structurally complete.
skip_marker_button.dart simply never imported strings.g.dart and assigned
'Skip Intro' / 'Skip Credits' / 'Next Episode' as plain literals. An audit of
lib/ found ~120 more sites in the same state, in four shapes that need
different fixes:
A literal in a file that never imported the i18n layer is the easy one -
skip_marker_button, performance_stats, track_label_builder and codec_utils all
render text with no `t` in the file at all. TrackLabelBuilder._compose now takes
a fallbackLabel builder instead of an English fallbackPrefix, so the caller
supplies t.audioTracks.track / t.videoControls.subtitleTrack and every unnamed
audio and subtitle row in the track menus is localized.
English reaching the user through an exception message is the widest one, and
it needs care: MediaServerException.message feeds both toString() - logs and
Sentry grouping - and verbatim UI display. Localizing it in place would make
bug-report logs follow the user's locale and split one Sentry issue into 22.
The MediaServer and Seerr families instead gain a nullable `display` alongside
the English `message`, and the six screens that print these errors read
`display ?? message`. PlaybackException keeps the opposite rule, because it
already carries a PlaybackFailureReason for logic and classifyPlaybackFailure
already builds it from t.messages: its stragglers are localized at the throw
site. That also removes the literal "Exception: " prefix Live TV users saw on
a tune failure, since PlaybackException.toString() returns the bare message.
Localized parts hand-concatenated with bare English are the shape no search for
Text('...') can find: '${t.common.pause} auto-scroll' on the home carousel,
'${day} at ${time}' on the Live TV schedule row, and an actor-screen count that
hand-rolled its plural as `n == 1 ? 'title' : 'titles'` - wrong for ru and pl
regardless of translation, now a real Slang plural.
Finally a literal assigned to provider state that a widget renders later:
DownloadProgress.errorMessage, and the four background_downloader notification
bodies, which sit inside a plugin config call where no widget-shaped search
reaches them.
Two things surfaced while converting. track_chapter_controls compared a track
label against 'Audio Track N' to swap in a localized version; once the builder
localized its own fallback that branch became unreachable, so it and the
orphaned _joinTrackLabel are gone. And discovery_view's PeerError fallback arm
looks like a leak but is not - its producers already localize, and a test says
so - so it stays as it is.
All 21 non-base locales are translated, including the 21 keys left empty by
earlier commits that were falling back to English. No locale has an empty value.
scripts/check_hardcoded_strings.py guards the three shapes a structural check
can see, and runs in ci_checks.sh after translation hygiene. Its first draft
passed its own tests while missing this very bug, because 'Skip Intro' is bound
to a local rather than handed to Text(); the name-bound rule that closes that
gap is restricted to phrase-shaped literals, or it cannot tell copy from the
identifiers this codebase binds constantly ('cast_row', 'auto', 'liveTv'). It
cannot see English inside a throw or assigned to a provider field - neither is
distinguishable from a log message without dataflow analysis - and the docstring
says so. label: and actionLabel: are deliberately unscanned: here they name a
diagnostic operation, and a check that is chronically red is a check that gets
switched off.
One commit rather than one per area: the keys, the 22 locale files and the
generated output are a single unit, and any partial split fails the repo's own
unused-key scan on the way through.
close #1856
80 lines
2.6 KiB
Dart
80 lines
2.6 KiB
Dart
import '../i18n/strings.g.dart';
|
|
import '../models/livetv_channel.dart';
|
|
import 'live_tv_matching.dart';
|
|
|
|
class LiveTvChannelGroup {
|
|
final String key;
|
|
final String label;
|
|
final List<LiveTvChannel> channels;
|
|
|
|
const LiveTvChannelGroup({required this.key, required this.label, required this.channels});
|
|
|
|
LiveTvChannelGroup copyWith({String? label}) {
|
|
return LiveTvChannelGroup(key: key, label: label ?? this.label, channels: channels);
|
|
}
|
|
}
|
|
|
|
List<LiveTvChannelGroup> groupLiveTvChannelsBySource(List<LiveTvChannel> channels) {
|
|
final order = <String>[];
|
|
final bySource = <String, List<LiveTvChannel>>{};
|
|
final labels = <String, String>{};
|
|
|
|
for (final channel in channels) {
|
|
final key = liveTvChannelSourceKey(channel);
|
|
if (!bySource.containsKey(key)) {
|
|
order.add(key);
|
|
bySource[key] = [];
|
|
labels[key] = liveTvChannelSourceLabel(channel);
|
|
}
|
|
bySource[key]!.add(channel);
|
|
}
|
|
|
|
final groups = [
|
|
for (final key in order)
|
|
LiveTvChannelGroup(key: key, label: labels[key]!, channels: List.unmodifiable(bySource[key]!)),
|
|
];
|
|
|
|
final labelCounts = <String, int>{};
|
|
for (final group in groups) {
|
|
labelCounts[group.label] = (labelCounts[group.label] ?? 0) + 1;
|
|
}
|
|
|
|
return [
|
|
for (final group in groups)
|
|
if ((labelCounts[group.label] ?? 0) > 1) group.copyWith(label: _deduplicatedLabel(group)) else group,
|
|
];
|
|
}
|
|
|
|
String liveTvChannelSourceKey(LiveTvChannel channel) {
|
|
final serverId = liveTvNonEmpty(channel.serverId) ?? '';
|
|
final providerSource = liveTvNonEmpty(channel.favoriteSource) ?? liveTvNonEmpty(channel.lineup) ?? '';
|
|
final dvrSource = liveTvNonEmpty(channel.liveDvrKey) ?? '';
|
|
return '$serverId\u0000$providerSource\u0000$dvrSource';
|
|
}
|
|
|
|
String liveTvChannelSourceLabel(LiveTvChannel channel) {
|
|
final serverLabel = liveTvNonEmpty(channel.serverName) ?? liveTvNonEmpty(channel.serverId) ?? t.liveTv.title;
|
|
final sourceTitle = liveTvNonEmpty(channel.liveTvSourceTitle);
|
|
if (sourceTitle == null || sourceTitle == serverLabel) return serverLabel;
|
|
return '$serverLabel - $sourceTitle';
|
|
}
|
|
|
|
String _deduplicatedLabel(LiveTvChannelGroup group) {
|
|
if (group.channels.isEmpty) return group.label;
|
|
final first = group.channels.first;
|
|
final suffixes = [
|
|
liveTvNonEmpty(first.liveTvSourceTitle),
|
|
liveTvNonEmpty(first.liveDvrKey),
|
|
liveTvProviderIdentifierForChannel(first),
|
|
];
|
|
String? suffix;
|
|
for (final value in suffixes) {
|
|
if (value != null && !group.label.contains(value)) {
|
|
suffix = value;
|
|
break;
|
|
}
|
|
}
|
|
if (suffix == null || group.label.contains(suffix)) return group.label;
|
|
return '${group.label} - $suffix';
|
|
}
|