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
135 lines
5.2 KiB
Dart
135 lines
5.2 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:material_symbols_icons/symbols.dart';
|
|
import 'package:provider/provider.dart';
|
|
|
|
import '../../connection/connection.dart';
|
|
import '../../connection/connection_registry.dart';
|
|
import '../../exceptions/media_server_exceptions.dart';
|
|
import '../../focus/focusable_button.dart';
|
|
import '../../focus/focusable_text_field.dart';
|
|
import '../../i18n/strings.g.dart';
|
|
import '../../mixins/controller_disposer_mixin.dart';
|
|
import '../../services/jellyfin_endpoint_discovery.dart';
|
|
import '../../utils/app_logger.dart';
|
|
import '../../widgets/app_icon.dart';
|
|
import '../../widgets/focused_scroll_scaffold.dart';
|
|
import '../../widgets/loading_indicator_box.dart';
|
|
import 'async_form_state_mixin.dart';
|
|
|
|
class EditJellyfinConnectionScreen extends StatefulWidget {
|
|
final JellyfinConnection connection;
|
|
|
|
const EditJellyfinConnectionScreen({super.key, required this.connection});
|
|
|
|
@override
|
|
State<EditJellyfinConnectionScreen> createState() => _EditJellyfinConnectionScreenState();
|
|
}
|
|
|
|
class _EditJellyfinConnectionScreenState extends State<EditJellyfinConnectionScreen>
|
|
with AsyncFormStateMixin, ControllerDisposerMixin {
|
|
late final _urlsController = createTextEditingController(text: widget.connection.baseUrls.join('\n'));
|
|
final _urlsFocus = FocusNode(debugLabel: 'EditJellyfin:Urls');
|
|
final _saveFocus = FocusNode(debugLabel: 'EditJellyfin:Save');
|
|
final _formKey = GlobalKey<FormState>();
|
|
|
|
@override
|
|
void dispose() {
|
|
_urlsFocus.dispose();
|
|
_saveFocus.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
Future<void> _save() async {
|
|
if (!(_formKey.currentState?.validate() ?? false)) return;
|
|
await runAsync<void>(
|
|
() async {
|
|
final input = JellyfinEndpointDiscovery.buildUserInputCandidates(
|
|
_enteredUrls(),
|
|
dialect: widget.connection.dialect,
|
|
);
|
|
final endpoint = await JellyfinEndpointDiscovery(dialect: widget.connection.dialect).raceEndpoints(
|
|
input.probeBaseUrls,
|
|
preferredUrl: widget.connection.baseUrl,
|
|
expectedMachineId: widget.connection.serverMachineId,
|
|
baseUrlsToPersist: input.explicitBaseUrls,
|
|
baseUrlValidationGroups: input.validationBaseUrlGroups,
|
|
);
|
|
final updated = widget.connection.copyWith(
|
|
baseUrl: endpoint.activeBaseUrl,
|
|
baseUrls: endpoint.baseUrls,
|
|
serverName: endpoint.serverInfo.serverName,
|
|
);
|
|
if (!mounted) return;
|
|
await context.read<ConnectionRegistry>().upsert(updated);
|
|
if (!mounted) return;
|
|
Navigator.of(context).pop(true);
|
|
},
|
|
errorMapper: (e) {
|
|
if (e is MediaServerUrlException) return e.display ?? e.message;
|
|
appLogger.e('Edit ${widget.connection.dialect.productName} connection failed', error: e);
|
|
return t.addServer.couldNotReachServer(error: e.toString());
|
|
},
|
|
);
|
|
}
|
|
|
|
List<String> _enteredUrls() => JellyfinEndpointDiscovery.parseUserEnteredUrls(_urlsController.text);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
return FocusedScrollScaffold(
|
|
title: Text(t.connections.editMediaBrowserTitle(product: widget.connection.dialect.productName)),
|
|
slivers: [
|
|
SliverPadding(
|
|
padding: const EdgeInsets.all(16),
|
|
sliver: SliverToBoxAdapter(
|
|
child: Form(
|
|
key: _formKey,
|
|
child: Column(
|
|
crossAxisAlignment: .stretch,
|
|
children: [
|
|
Text(
|
|
t.connections.editMediaBrowserIntro(serverName: widget.connection.serverName),
|
|
style: theme.textTheme.bodyMedium,
|
|
),
|
|
const SizedBox(height: 16),
|
|
FocusableTextFormField(
|
|
controller: _urlsController,
|
|
focusNode: _urlsFocus,
|
|
tvTextInputPresentation: TvTextInputPresentation.flutterOverlay,
|
|
autofocus: true,
|
|
keyboardType: TextInputType.url,
|
|
minLines: 1,
|
|
maxLines: 5,
|
|
autocorrect: false,
|
|
enableSuggestions: false,
|
|
enabled: !busy,
|
|
onNavigateDown: () => _saveFocus.requestFocus(),
|
|
decoration: InputDecoration(
|
|
labelText: t.addServer.serverUrls,
|
|
prefixIcon: const AppIcon(Symbols.link_rounded, fill: 1),
|
|
),
|
|
validator: (_) => _enteredUrls().isEmpty ? t.addServer.required : null,
|
|
),
|
|
const SizedBox(height: 16),
|
|
FocusableButton(
|
|
focusNode: _saveFocus,
|
|
useBackgroundFocus: true,
|
|
onPressed: busy ? null : _save,
|
|
child: FilledButton.icon(
|
|
onPressed: busy ? null : _save,
|
|
icon: busy ? const LoadingIndicatorBox() : const AppIcon(Symbols.save_rounded, fill: 1),
|
|
label: Text(t.common.save),
|
|
),
|
|
),
|
|
...buildInlineError(theme),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|