From c53736566bea03a11c6411711d9593b02e1163ce Mon Sep 17 00:00:00 2001 From: otsmr Date: Tue, 20 May 2025 20:55:22 +0200 Subject: [PATCH] fix #167 --- lib/src/localization/app_de.arb | 3 ++- lib/src/localization/app_en.arb | 4 ++-- .../localization/generated/app_localizations.dart | 12 +++++++++--- .../localization/generated/app_localizations_de.dart | 5 ++++- .../localization/generated/app_localizations_en.dart | 5 ++++- lib/src/views/settings/help/faq.dart | 3 +-- lib/src/views/settings/help/help_view.dart | 11 +++++++++-- 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/lib/src/localization/app_de.arb b/lib/src/localization/app_de.arb index bdd1752..ba781e0 100644 --- a/lib/src/localization/app_de.arb +++ b/lib/src/localization/app_de.arb @@ -124,7 +124,8 @@ "settingsHelpVersion": "Version", "settingsHelpLicenses": "Lizenzen (Source-Code)", "settingsHelpCredits": "Lizenzen (Bilder)", - "settingsHelpLegal": "Impressum, Nutzungsbedingungen & Datenschutzrichtlinie", + "settingsHelpImprint": "Impressum & Datenschutzrichtlinie", + "settingsHelpTerms": "Nutzungsbedingungen", "settingsAppearanceTheme": "Theme", "settingsAccountDeleteAccount": "Konto löschen", "settingsAccountDeleteModalTitle": "Bist du sicher?", diff --git a/lib/src/localization/app_en.arb b/lib/src/localization/app_en.arb index e7c9d56..7f806ba 100644 --- a/lib/src/localization/app_en.arb +++ b/lib/src/localization/app_en.arb @@ -219,8 +219,8 @@ "@settingsHelpLicenses": {}, "settingsHelpCredits": "Licenses (Images)", "@settingsHelpCredits": {}, - "settingsHelpLegal": "Imprint, Terms & Privacy Policy", - "@settingsHelpLegal": {}, + "settingsHelpImprint": "Imprint & Privacy Policy", + "settingsHelpTerms": "Terms of Service", "settingsAppearanceTheme": "Theme", "@settingsAppearanceTheme": {}, "settingsAccountDeleteAccount": "Delete account", diff --git a/lib/src/localization/generated/app_localizations.dart b/lib/src/localization/generated/app_localizations.dart index 7c65e5b..5900b8d 100644 --- a/lib/src/localization/generated/app_localizations.dart +++ b/lib/src/localization/generated/app_localizations.dart @@ -743,11 +743,17 @@ abstract class AppLocalizations { /// **'Licenses (Images)'** String get settingsHelpCredits; - /// No description provided for @settingsHelpLegal. + /// No description provided for @settingsHelpImprint. /// /// In en, this message translates to: - /// **'Imprint, Terms & Privacy Policy'** - String get settingsHelpLegal; + /// **'Imprint & Privacy Policy'** + String get settingsHelpImprint; + + /// No description provided for @settingsHelpTerms. + /// + /// In en, this message translates to: + /// **'Terms of Service'** + String get settingsHelpTerms; /// No description provided for @settingsAppearanceTheme. /// diff --git a/lib/src/localization/generated/app_localizations_de.dart b/lib/src/localization/generated/app_localizations_de.dart index 456b3c5..11d2d25 100644 --- a/lib/src/localization/generated/app_localizations_de.dart +++ b/lib/src/localization/generated/app_localizations_de.dart @@ -337,7 +337,10 @@ class AppLocalizationsDe extends AppLocalizations { String get settingsHelpCredits => 'Lizenzen (Bilder)'; @override - String get settingsHelpLegal => 'Impressum, Nutzungsbedingungen & Datenschutzrichtlinie'; + String get settingsHelpImprint => 'Impressum & Datenschutzrichtlinie'; + + @override + String get settingsHelpTerms => 'Nutzungsbedingungen'; @override String get settingsAppearanceTheme => 'Theme'; diff --git a/lib/src/localization/generated/app_localizations_en.dart b/lib/src/localization/generated/app_localizations_en.dart index 3ffb44e..0d179a5 100644 --- a/lib/src/localization/generated/app_localizations_en.dart +++ b/lib/src/localization/generated/app_localizations_en.dart @@ -337,7 +337,10 @@ class AppLocalizationsEn extends AppLocalizations { String get settingsHelpCredits => 'Licenses (Images)'; @override - String get settingsHelpLegal => 'Imprint, Terms & Privacy Policy'; + String get settingsHelpImprint => 'Imprint & Privacy Policy'; + + @override + String get settingsHelpTerms => 'Terms of Service'; @override String get settingsAppearanceTheme => 'Theme'; diff --git a/lib/src/views/settings/help/faq.dart b/lib/src/views/settings/help/faq.dart index 70fe33b..05df508 100644 --- a/lib/src/views/settings/help/faq.dart +++ b/lib/src/views/settings/help/faq.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; import 'package:logging/logging.dart'; @@ -22,7 +21,7 @@ class _FAQPageState extends State { @override void initState() { super.initState(); - domain = (kDebugMode) ? "http://10.99.0.140:8000" : "https://twonly.eu"; + domain = "https://twonly.eu"; _fetchFAQData(); } diff --git a/lib/src/views/settings/help/help_view.dart b/lib/src/views/settings/help/help_view.dart index 1864c47..15c531c 100644 --- a/lib/src/views/settings/help/help_view.dart +++ b/lib/src/views/settings/help/help_view.dart @@ -73,9 +73,16 @@ class HelpView extends StatelessWidget { }, ), ListTile( - title: Text(context.lang.settingsHelpLegal), + title: Text(context.lang.settingsHelpImprint), onTap: () { - launchUrl(Uri.parse("https://twonly.eu/legal")); + launchUrl(Uri.parse("https://twonly.eu/de/legal/")); + }, + trailing: FaIcon(FontAwesomeIcons.arrowUpRightFromSquare, size: 15), + ), + ListTile( + title: Text(context.lang.settingsHelpTerms), + onTap: () { + launchUrl(Uri.parse("https://twonly.eu/de/legal/agb.html")); }, trailing: FaIcon(FontAwesomeIcons.arrowUpRightFromSquare, size: 15), ),