diff --git a/integration_test/keyless_test.dart b/integration_test/keyless_test.dart index e5147a1b..6c8a20ee 100644 --- a/integration_test/keyless_test.dart +++ b/integration_test/keyless_test.dart @@ -92,9 +92,9 @@ void main() { await tester.tap(helpDrawerButton); await tester.longWait(); if (isAndroid) { - expect(find.byKey(feedbackButton).hitTestable(), findsOneWidget); + expect(find.byKey(userGuideButton).hitTestable(), findsOneWidget); } else { - await tester.tap(find.byKey(feedbackButton).hitTestable()); + await tester.tap(find.byKey(userGuideButton).hitTestable()); await tester.longWait(); } }); diff --git a/lib/about_page.dart b/lib/about_page.dart index 97bb2aab..d3944557 100755 --- a/lib/about_page.dart +++ b/lib/about_page.dart @@ -118,25 +118,21 @@ class AboutPage extends ConsumerWidget { mainAxisSize: MainAxisSize.min, children: [ TextButton( + onPressed: launchDocumentationUrl, child: Text( - key: feedbackButton, - l10n.s_send_feedback, + key: userGuideButton, + l10n.s_user_guide, style: const TextStyle(decoration: TextDecoration.underline), ), - onPressed: () { - launchFeedbackUrl(); - }, ), TextButton( + onPressed: launchHelpUrl, child: Text( l10n.s_i_need_help, style: const TextStyle(decoration: TextDecoration.underline), ), - onPressed: () { - launchHelpUrl(); - }, ), ], ), diff --git a/lib/app/app_url_launcher.dart b/lib/app/app_url_launcher.dart index bc4a4163..0ed99c65 100644 --- a/lib/app/app_url_launcher.dart +++ b/lib/app/app_url_launcher.dart @@ -18,7 +18,7 @@ import 'package:url_launcher/url_launcher.dart'; import '../core/state.dart'; -void launchFeedbackUrl() => _launchUrl(isAndroid +void launchDocumentationUrl() => _launchUrl(isAndroid ? 'https://yubi.co/ya-feedback-android' : 'https://yubi.co/ya-feedback-desktop'); diff --git a/lib/app/state.dart b/lib/app/state.dart index fa2bf2e4..3a7a8387 100755 --- a/lib/app/state.dart +++ b/lib/app/state.dart @@ -36,6 +36,8 @@ final _log = Logger('app.state'); // Officially supported translations const officialLocales = [ Locale('en', ''), + Locale('fr', ''), + Locale('ja', ''), ]; extension on Section { diff --git a/lib/app/views/keys.dart b/lib/app/views/keys.dart index 399edd1d..ebce196f 100644 --- a/lib/app/views/keys.dart +++ b/lib/app/views/keys.dart @@ -62,7 +62,7 @@ Key themeModeOption(ThemeMode mode) => Key('$_prefix.theme_mode.${mode.name}'); const tosButton = Key('$_prefix.tos_button'); const privacyButton = Key('$_prefix.privacy_button'); const licensesButton = Key('$_prefix.licenses_button'); -const feedbackButton = Key('$_prefix.feedback_button'); +const userGuideButton = Key('$_prefix.user_guide_button'); const helpButton = Key('$_prefix.help_button'); const diagnosticsChip = Key('$_prefix.diagnostics_chip'); const logChip = Key('$_prefix.log_chip'); diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index e74fd4e9..41bc2c09 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -76,7 +76,7 @@ "l_help_and_about_desc": null, "s_help_and_feedback": "Hilfe und Feedback", "s_home": null, - "s_send_feedback": "Senden Sie uns Feedback", + "s_user_guide": null, "s_i_need_help": "Ich brauche Hilfe", "s_troubleshooting": "Problembehebung", "s_terms_of_use": "Nutzungsbedingungen", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 6e1dd7df..36493aa7 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -76,7 +76,7 @@ "l_help_and_about_desc": "Troubleshoot and support", "s_help_and_feedback": "Help and feedback", "s_home": "Home", - "s_send_feedback": "Send us feedback", + "s_user_guide": "User guide", "s_i_need_help": "I need help", "s_troubleshooting": "Troubleshooting", "s_terms_of_use": "Terms of use", diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index d85cf1fa..4b1cf599 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -76,7 +76,7 @@ "l_help_and_about_desc": null, "s_help_and_feedback": "Aide/commentaires", "s_home": null, - "s_send_feedback": "Envoyer commentaires", + "s_user_guide": null, "s_i_need_help": "J'ai besoin d'aide", "s_troubleshooting": "Dépannage", "s_terms_of_use": "Conditions d'utilisation", diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 6dc4c191..ac3b6c70 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -76,7 +76,7 @@ "l_help_and_about_desc": null, "s_help_and_feedback": "ヘルプとフィードバック", "s_home": null, - "s_send_feedback": "ご意見をお寄せください", + "s_user_guide": null, "s_i_need_help": "ヘルプが必要", "s_troubleshooting": "トラブルシューティング", "s_terms_of_use": "利用規約", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index a3f1943e..f16d761f 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -76,7 +76,7 @@ "l_help_and_about_desc": null, "s_help_and_feedback": "Pomoc i opinie", "s_home": null, - "s_send_feedback": "Prześlij opinię", + "s_user_guide": null, "s_i_need_help": "Pomoc", "s_troubleshooting": "Rozwiązywanie problemów", "s_terms_of_use": "Warunki użytkowania",