From 275ba21a475e6402db58074a44be66be96560249 Mon Sep 17 00:00:00 2001 From: Kherel Date: Fri, 26 Mar 2021 14:53:21 +0100 Subject: [PATCH] fix --- assets/translations/en.json | 4 +++- assets/translations/ru.json | 4 +++- lib/ui/pages/providers/providers.dart | 3 +-- lib/ui/pages/server_details/server_details.dart | 7 ++----- lib/ui/pages/services/services.dart | 2 -- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/assets/translations/en.json b/assets/translations/en.json index da4f6a4ac5..5b5b8f56b0 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -58,7 +58,9 @@ "card_title": "Server", "status": "Status — Good", "bottom_sheet": { - "1": "It's a virtual computer, where all your services live." + "1": "It's a virtual computer, where all your services live.", + "2": "General information", + "3": "Location" } }, "domain": { diff --git a/assets/translations/ru.json b/assets/translations/ru.json index f6e17b7021..b51f0e9e48 100644 --- a/assets/translations/ru.json +++ b/assets/translations/ru.json @@ -58,7 +58,9 @@ "card_title": "Сервер", "status": "Статус — в норме", "bottom_sheet": { - "1": "Это виртульный компьютер на котором работают все ваши сервисы." + "1": "Это виртульный компьютер на котором работают все ваши сервисы.", + "2": "General information", + "3": "Location" } }, "domain": { diff --git a/lib/ui/pages/providers/providers.dart b/lib/ui/pages/providers/providers.dart index ea6cf8c2a2..db9532818b 100644 --- a/lib/ui/pages/providers/providers.dart +++ b/lib/ui/pages/providers/providers.dart @@ -11,7 +11,6 @@ import 'package:selfprivacy/ui/components/brand_text/brand_text.dart'; import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart'; import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart'; import 'package:selfprivacy/ui/components/one_page/one_page.dart'; -import 'package:selfprivacy/ui/pages/providers/settings/settings.dart'; import 'package:selfprivacy/ui/pages/server_details/server_details.dart'; import 'package:selfprivacy/utils/route_transitions/basic.dart'; import 'package:easy_localization/easy_localization.dart'; @@ -195,7 +194,7 @@ class _ProviderDetails extends StatelessWidget { BrandText.body1( 'providers.backup.bottom_sheet.2'.tr(args: [domainName, 'Time'])), SizedBox(height: 10), - BrandText.body1('providers.backup.bottom_sheet.3'.tr()), + BrandText.body1('providers.backup.status'.tr()), ]; break; } diff --git a/lib/ui/pages/server_details/server_details.dart b/lib/ui/pages/server_details/server_details.dart index e6db48fae9..3e57819959 100644 --- a/lib/ui/pages/server_details/server_details.dart +++ b/lib/ui/pages/server_details/server_details.dart @@ -121,7 +121,7 @@ class _ServerDetailsState extends State SizedBox(height: 10), BrandText.body1('providers.server.bottom_sheet.1'.tr()), SizedBox(height: 30), - Center(child: BrandText.h2('General information')), + Center(child: BrandText.h2('providers.server.2'.tr())), SizedBox(height: 10), Table( columnWidths: { @@ -195,7 +195,7 @@ class _ServerDetailsState extends State ], ), SizedBox(height: 30), - Center(child: BrandText.h2('Location')), + Center(child: BrandText.h2('providers.server.3'.tr())), SizedBox(height: 10), Table( columnWidths: { @@ -227,9 +227,6 @@ class _ServerDetailsState extends State ), ], ), - // BrandText.body1('providers.server.bottom_sheet.2'.tr()), - // SizedBox(height: 10), - // BrandText.body1('providers.server.bottom_sheet.3'.tr()), ], ), ), diff --git a/lib/ui/pages/services/services.dart b/lib/ui/pages/services/services.dart index 2407e14ac9..c21b0d72f2 100644 --- a/lib/ui/pages/services/services.dart +++ b/lib/ui/pages/services/services.dart @@ -8,12 +8,10 @@ import 'package:selfprivacy/ui/components/brand_button/brand_button.dart'; import 'package:selfprivacy/ui/components/brand_card/brand_card.dart'; import 'package:selfprivacy/ui/components/brand_header/brand_header.dart'; import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart'; -import 'package:selfprivacy/ui/components/brand_modal_sheet/brand_modal_sheet.dart'; import 'package:selfprivacy/ui/components/brand_text/brand_text.dart'; import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart'; import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart'; import 'package:easy_localization/easy_localization.dart'; -import 'package:selfprivacy/utils/route_transitions/basic.dart'; import 'package:selfprivacy/utils/ui_helpers.dart'; import 'package:url_launcher/url_launcher.dart';