From 670ac40a14592fecc6a4831933aea28b11824e1a Mon Sep 17 00:00:00 2001 From: Micah Morrison Date: Wed, 6 Sep 2023 23:00:16 -0400 Subject: [PATCH 1/2] Improve text/labels on profile page --- lib/l10n/app_en.arb | 3 +++ lib/l10n/app_es.arb | 3 +++ lib/l10n/app_fi.arb | 3 +++ lib/l10n/app_pl.arb | 3 +++ lib/l10n/app_sv.arb | 3 +++ lib/user/pages/user_page_success.dart | 27 ++++++++++++++++----------- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 679eb74ba..a5db0ea4c 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1,4 +1,7 @@ { + "posts": "Posts", + "saved": "Saved", + "history": "History", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index 06f30ca07..6a7a63db7 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -1,4 +1,7 @@ { + "posts": "Posts", + "saved": "Saved", + "history": "History", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_fi.arb b/lib/l10n/app_fi.arb index f4997f2f3..9a1d3fbd1 100644 --- a/lib/l10n/app_fi.arb +++ b/lib/l10n/app_fi.arb @@ -1,4 +1,7 @@ { + "posts": "Posts", + "saved": "Saved", + "history": "History", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index 6e4ea2bfc..942da8cde 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -1,4 +1,7 @@ { + "posts": "Posts", + "saved": "Saved", + "history": "History", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index f4997f2f3..9a1d3fbd1 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -1,4 +1,7 @@ { + "posts": "Posts", + "saved": "Saved", + "history": "History", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/user/pages/user_page_success.dart b/lib/user/pages/user_page_success.dart index 6e405e0ea..393356b9a 100644 --- a/lib/user/pages/user_page_success.dart +++ b/lib/user/pages/user_page_success.dart @@ -9,14 +9,16 @@ import 'package:thunder/user/widgets/user_header.dart'; import 'package:thunder/core/models/comment_view_tree.dart'; import 'package:thunder/core/models/post_view_media.dart'; import 'package:thunder/user/bloc/user_bloc.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:thunder/utils/global_context.dart'; import '../../post/pages/create_comment_page.dart'; import '../../thunder/bloc/thunder_bloc.dart'; import '../widgets/user_sidebar.dart'; -const List userOptionTypes = [ - Padding(padding: EdgeInsets.all(8.0), child: Text('Posts')), - Padding(padding: EdgeInsets.all(8.0), child: Text('Comments')), +List userOptionTypes = [ + Padding(padding: const EdgeInsets.all(8.0), child: Text(AppLocalizations.of(GlobalContext.context)!.posts)), + Padding(padding: const EdgeInsets.all(8.0), child: Text(AppLocalizations.of(GlobalContext.context)!.comment)), ]; class UserPageSuccess extends StatefulWidget { @@ -176,20 +178,23 @@ class _UserPageSuccessState extends State with TickerProviderSt padding: EdgeInsets.zero, ), child: !savedToggle - ? const Row( + ? Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox(width: 8.0), - Text('Saved'), - Icon(Icons.chevron_right), + const SizedBox(width: 8.0), + Text(AppLocalizations.of(context)!.saved), + const Icon(Icons.chevron_right), ], ) - : const Row( + : Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.chevron_left), - Text('History'), - SizedBox(width: 8.0), + const Icon(Icons.chevron_left), + Text( + AppLocalizations.of(context)!.history, + semanticsLabel: '${AppLocalizations.of(context)!.history}, ${AppLocalizations.of(context)!.back}', + ), + const SizedBox(width: 8.0), ], ), ), From 9c4888ed0ccbafeda27aa576f3be99a4b24a707b Mon Sep 17 00:00:00 2001 From: Micah Morrison Date: Thu, 7 Sep 2023 10:01:56 -0400 Subject: [PATCH 2/2] Change 'history' to 'overview' --- lib/l10n/app_en.arb | 2 +- lib/l10n/app_es.arb | 2 +- lib/l10n/app_fi.arb | 2 +- lib/l10n/app_pl.arb | 2 +- lib/l10n/app_sv.arb | 2 +- lib/user/pages/user_page_success.dart | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index a5db0ea4c..0007cfcf4 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1,7 +1,7 @@ { "posts": "Posts", "saved": "Saved", - "history": "History", + "overview": "Overview", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index 6a7a63db7..d39086575 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -1,7 +1,7 @@ { "posts": "Posts", "saved": "Saved", - "history": "History", + "overview": "Overview", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_fi.arb b/lib/l10n/app_fi.arb index 9a1d3fbd1..fb4aa6ce4 100644 --- a/lib/l10n/app_fi.arb +++ b/lib/l10n/app_fi.arb @@ -1,7 +1,7 @@ { "posts": "Posts", "saved": "Saved", - "history": "History", + "overview": "Overview", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index 942da8cde..962484354 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -1,7 +1,7 @@ { "posts": "Posts", "saved": "Saved", - "history": "History", + "overview": "Overview", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index 9a1d3fbd1..fb4aa6ce4 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -1,7 +1,7 @@ { "posts": "Posts", "saved": "Saved", - "history": "History", + "overview": "Overview", "somethingWentWrong": "Oops, something went wrong!", "unableToLoadPostsFrominstance": "Unable to load posts from {instance}", "internetOrInstanceIssues": "You may not be connected to the internet, or your instance may be currently unavailable.", diff --git a/lib/user/pages/user_page_success.dart b/lib/user/pages/user_page_success.dart index 393356b9a..0b4496977 100644 --- a/lib/user/pages/user_page_success.dart +++ b/lib/user/pages/user_page_success.dart @@ -191,8 +191,8 @@ class _UserPageSuccessState extends State with TickerProviderSt children: [ const Icon(Icons.chevron_left), Text( - AppLocalizations.of(context)!.history, - semanticsLabel: '${AppLocalizations.of(context)!.history}, ${AppLocalizations.of(context)!.back}', + AppLocalizations.of(context)!.overview, + semanticsLabel: '${AppLocalizations.of(context)!.overview}, ${AppLocalizations.of(context)!.back}', ), const SizedBox(width: 8.0), ],