From e031ca847ed6da3c9d53283ac4777e3c626dd1fe Mon Sep 17 00:00:00 2001 From: halina Date: Tue, 19 Nov 2024 12:03:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flutter_app/l10n/app_en.arb | 5 ++++ flutter_app/l10n/app_ru.arb | 5 ++++ .../components/locale/l10n/app_locale.dart | 24 +++++++++++++++++++ .../components/locale/l10n/app_locale_en.dart | 12 ++++++++++ .../components/locale/l10n/app_locale_ru.dart | 12 ++++++++++ .../details_page/details_page.dart | 9 +++---- 6 files changed, 63 insertions(+), 4 deletions(-) diff --git a/flutter_app/l10n/app_en.arb b/flutter_app/l10n/app_en.arb index a01051c..118231f 100644 --- a/flutter_app/l10n/app_en.arb +++ b/flutter_app/l10n/app_en.arb @@ -5,5 +5,10 @@ "liked": "liked!", "disliked": "disliked :(", + "fstname": "First Name: ", + "lstname": "Last Name: ", + "title": "Title: ", + "family": "Family: ", + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" } \ No newline at end of file diff --git a/flutter_app/l10n/app_ru.arb b/flutter_app/l10n/app_ru.arb index c00dd02..85720ca 100644 --- a/flutter_app/l10n/app_ru.arb +++ b/flutter_app/l10n/app_ru.arb @@ -5,5 +5,10 @@ "liked": "Добавлено в понравившиеся :)", "disliked": "Удалено из понравившегося :(", + "fstname": "Имя: ", + "lstname": "Фамилия: ", + "title": "Титул: ", + "family": "Род: ", + "arbEnding": "Чтобы не забыть про отсутствие запятой :)" } \ No newline at end of file diff --git a/flutter_app/lib/components/locale/l10n/app_locale.dart b/flutter_app/lib/components/locale/l10n/app_locale.dart index bb28342..a2d588e 100644 --- a/flutter_app/lib/components/locale/l10n/app_locale.dart +++ b/flutter_app/lib/components/locale/l10n/app_locale.dart @@ -113,6 +113,30 @@ abstract class AppLocale { /// **'Удалено из понравившегося :('** String get disliked; + /// No description provided for @fstname. + /// + /// In ru, this message translates to: + /// **'Имя: '** + String get fstname; + + /// No description provided for @lstname. + /// + /// In ru, this message translates to: + /// **'Фамилия: '** + String get lstname; + + /// No description provided for @title. + /// + /// In ru, this message translates to: + /// **'Титул: '** + String get title; + + /// No description provided for @family. + /// + /// In ru, this message translates to: + /// **'Род: '** + String get family; + /// No description provided for @arbEnding. /// /// In ru, this message translates to: diff --git a/flutter_app/lib/components/locale/l10n/app_locale_en.dart b/flutter_app/lib/components/locale/l10n/app_locale_en.dart index 599548c..09a0ba2 100644 --- a/flutter_app/lib/components/locale/l10n/app_locale_en.dart +++ b/flutter_app/lib/components/locale/l10n/app_locale_en.dart @@ -15,6 +15,18 @@ class AppLocaleEn extends AppLocale { @override String get disliked => 'disliked :('; + @override + String get fstname => 'First Name: '; + + @override + String get lstname => 'Last Name: '; + + @override + String get title => 'Title: '; + + @override + String get family => 'Family: '; + @override String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; } diff --git a/flutter_app/lib/components/locale/l10n/app_locale_ru.dart b/flutter_app/lib/components/locale/l10n/app_locale_ru.dart index fbd2661..56adcc0 100644 --- a/flutter_app/lib/components/locale/l10n/app_locale_ru.dart +++ b/flutter_app/lib/components/locale/l10n/app_locale_ru.dart @@ -15,6 +15,18 @@ class AppLocaleRu extends AppLocale { @override String get disliked => 'Удалено из понравившегося :('; + @override + String get fstname => 'Имя: '; + + @override + String get lstname => 'Фамилия: '; + + @override + String get title => 'Титул: '; + + @override + String get family => 'Род: '; + @override String get arbEnding => 'Чтобы не забыть про отсутствие запятой :)'; } diff --git a/flutter_app/lib/presentation/details_page/details_page.dart b/flutter_app/lib/presentation/details_page/details_page.dart index 23e0590..a871318 100644 --- a/flutter_app/lib/presentation/details_page/details_page.dart +++ b/flutter_app/lib/presentation/details_page/details_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_app/components/extensions/context_x.dart'; import '../../domain/models/card.dart'; @@ -49,22 +50,22 @@ class DetailsPage extends StatelessWidget { ), const SizedBox(height: 16.0), Text( - 'First Name: ${data.firstName}', + '${context.locale.fstname} ${data.firstName}', style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: 8.0), Text( - 'Last Name: ${data.lastName}', + '${context.locale.lstname} ${data.lastName}', style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: 8.0), Text( - 'Title: ${data.title}', + '${context.locale.title} ${data.title}', style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: 8.0), Text( - 'Family: ${data.family}', + '${context.locale.family} ${data.family}', style: Theme.of(context).textTheme.bodyMedium, ), const SizedBox(height: 8.0),