Skip to content

Commit fe40951

Browse files
authored
Merge pull request #101 from flutter-news-app-full-source-code/fix/saved-filters-l10n
Fix/saved filters l10n
2 parents ccd6045 + 606d490 commit fe40951

File tree

7 files changed

+71
-72
lines changed

7 files changed

+71
-72
lines changed

lib/app_configuration/view/tabs/feed_configuration_tab.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:core/core.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/widgets/feed_decorator_form.dart';
4-
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/widgets/saved_headlines_filters_limit_form.dart';
4+
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/widgets/saved_feed_filters_limit_form.dart';
55
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/widgets/user_preference_limits_form.dart';
66
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/l10n.dart';
77
import 'package:flutter_news_app_web_dashboard_full_source_code/shared/extensions/feed_decorator_type_l10n.dart';
@@ -92,8 +92,8 @@ class _FeedConfigurationTabState extends State<FeedConfigurationTab> {
9292
builder: (context, expandedIndex, child) {
9393
const tileIndex = 1;
9494
return ExpansionTile(
95-
key: ValueKey('savedHeadlinesFilterLimitsTile_$expandedIndex'),
96-
title: Text(l10n.savedHeadlinesFilterLimitsTitle),
95+
key: ValueKey('savedFeedFilterLimitsTile_$expandedIndex'),
96+
title: Text(l10n.savedFeedFiltersLimitLabel),
9797
childrenPadding: const EdgeInsetsDirectional.only(
9898
start: AppSpacing.lg,
9999
top: AppSpacing.md,
@@ -106,15 +106,15 @@ class _FeedConfigurationTabState extends State<FeedConfigurationTab> {
106106
initiallyExpanded: expandedIndex == tileIndex,
107107
children: [
108108
Text(
109-
l10n.savedHeadlinesFilterLimitsDescription,
109+
l10n.savedFeedFilterLimitsDescription,
110110
style: Theme.of(context).textTheme.bodySmall?.copyWith(
111111
color: Theme.of(
112112
context,
113113
).colorScheme.onSurface.withOpacity(0.7),
114114
),
115115
),
116116
const SizedBox(height: AppSpacing.lg),
117-
SavedHeadlinesFiltersLimitForm(
117+
SavedFeedFiltersLimitForm(
118118
remoteConfig: widget.remoteConfig,
119119
onConfigChanged: widget.onConfigChanged,
120120
),

lib/app_configuration/widgets/saved_headlines_filters_limit_form.dart renamed to lib/app_configuration/widgets/saved_feed_filters_limit_form.dart

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/l10n.dart';
55
import 'package:flutter_news_app_web_dashboard_full_source_code/shared/extensions/app_user_role_l10n.dart';
66
import 'package:ui_kit/ui_kit.dart';
77

8-
/// {@template saved_headlines_filters_limit_form}
9-
/// A form for configuring saved headlines filter limits within the
8+
/// {@template saved_feed_filters_limit_form}
9+
/// A form for configuring saved feed filter limits within the
1010
/// [RemoteConfig].
1111
///
1212
/// This form provides fields to set the maximum number of saved filters
1313
/// for guest, authenticated, and premium users.
1414
/// {@endtemplate}
15-
class SavedHeadlinesFiltersLimitForm extends StatefulWidget {
16-
/// {@macro saved_headlines_filters_limit_form}
17-
const SavedHeadlinesFiltersLimitForm({
15+
class SavedFeedFiltersLimitForm extends StatefulWidget {
16+
/// {@macro saved_feed_filters_limit_form}
17+
const SavedFeedFiltersLimitForm({
1818
required this.remoteConfig,
1919
required this.onConfigChanged,
2020
super.key,
@@ -27,12 +27,11 @@ class SavedHeadlinesFiltersLimitForm extends StatefulWidget {
2727
final ValueChanged<RemoteConfig> onConfigChanged;
2828

2929
@override
30-
State<SavedHeadlinesFiltersLimitForm> createState() =>
31-
_SavedHeadlinesFiltersLimitFormState();
30+
State<SavedFeedFiltersLimitForm> createState() =>
31+
_SavedFeedFiltersLimitFormState();
3232
}
3333

34-
class _SavedHeadlinesFiltersLimitFormState
35-
extends State<SavedHeadlinesFiltersLimitForm>
34+
class _SavedFeedFiltersLimitFormState extends State<SavedFeedFiltersLimitForm>
3635
with SingleTickerProviderStateMixin {
3736
late TabController _tabController;
3837
late final Map<AppUserRole, TextEditingController> _controllers;
@@ -48,7 +47,7 @@ class _SavedHeadlinesFiltersLimitFormState
4847
}
4948

5049
@override
51-
void didUpdateWidget(covariant SavedHeadlinesFiltersLimitForm oldWidget) {
50+
void didUpdateWidget(covariant SavedFeedFiltersLimitForm oldWidget) {
5251
super.didUpdateWidget(oldWidget);
5352
if (widget.remoteConfig.userPreferenceConfig !=
5453
oldWidget.remoteConfig.userPreferenceConfig) {
@@ -125,8 +124,8 @@ class _SavedHeadlinesFiltersLimitFormState
125124
children: AppUserRole.values.map((role) {
126125
final config = widget.remoteConfig.userPreferenceConfig;
127126
return AppConfigIntField(
128-
label: l10n.savedHeadlinesLimitLabel,
129-
description: l10n.savedHeadlinesLimitDescription,
127+
label: l10n.savedFeedFiltersLimitLabel,
128+
description: l10n.savedFeedFiltersLimitLabel,
130129
value: _getSavedFiltersLimit(config, role),
131130
onChanged: (value) {
132131
widget.onConfigChanged(

lib/l10n/app_localizations.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,13 @@ abstract class AppLocalizations {
290290
/// **'General'**
291291
String get generalTab;
292292

293-
/// Title for the User Content & Feed Limits section
293+
/// Title for the User Content Limits section
294294
///
295295
/// In en, this message translates to:
296-
/// **'User Content & Feed Limits'**
296+
/// **'User Content Limits'**
297297
String get userContentLimitsTitle;
298298

299-
/// Description for the User Content & Feed Limits section
299+
/// Description for the User Content Limits section
300300
///
301301
/// In en, this message translates to:
302302
/// **'Set limits on followed items and saved headlines for each user tier.'**
@@ -1568,17 +1568,17 @@ abstract class AppLocalizations {
15681568
/// **'Maximum number of countries, news sources, or categories this user role can follow (each type has its own limit).'**
15691569
String get followedItemsLimitDescription;
15701570

1571-
/// Label for Saved Headlines Limit
1571+
/// Label for Saved filters Limits
15721572
///
15731573
/// In en, this message translates to:
1574-
/// **'Saved Headlines Limit'**
1575-
String get savedHeadlinesLimitLabel;
1574+
/// **'Saved Filters Limits'**
1575+
String get savedFeedFiltersLimitLabel;
15761576

15771577
/// Description for Saved Headlines Limit
15781578
///
15791579
/// In en, this message translates to:
1580-
/// **'Maximum number of headlines this user role can save.'**
1581-
String get savedHeadlinesLimitDescription;
1580+
/// **'Maximum number of feed filters this user role can save.'**
1581+
String get savedFeedFiltersLimitDescription;
15821582

15831583
/// Label for Ad Frequency
15841584
///
@@ -1592,17 +1592,17 @@ abstract class AppLocalizations {
15921592
/// **'How often an ad can appear for this user role (e.g., a value of 5 means an ad could be placed after every 5 news items).'**
15931593
String get adFrequencyDescription;
15941594

1595-
/// Description for the Saved Headlines Filter Limits section
1595+
/// Title for the Saved Feed Filter Limits section
15961596
///
15971597
/// In en, this message translates to:
1598-
/// **'Set limits on the number of saved headlines filters for each user tier.'**
1599-
String get savedHeadlinesFilterLimitsDescription;
1598+
/// **'Saved Filter Limits'**
1599+
String get savedFeedFilterLimitsTitle;
16001600

1601-
/// Title for the Saved Headlines Filter Limits section
1601+
/// Description for the Saved Headlines Filter Limits section
16021602
///
16031603
/// In en, this message translates to:
1604-
/// **'Saved Headlines Filter Limits'**
1605-
String get savedHeadlinesFilterLimitsTitle;
1604+
/// **'Set limits on the number of saved feed filters for each user tier.'**
1605+
String get savedFeedFilterLimitsDescription;
16061606

16071607
/// Label for Ad Placement Interval
16081608
///

lib/l10n/app_localizations_ar.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class AppLocalizationsAr extends AppLocalizations {
118118
String get generalTab => 'عام';
119119

120120
@override
121-
String get userContentLimitsTitle => 'حدود المحتوى والموجز للمستخدم';
121+
String get userContentLimitsTitle => 'حدود المحتوى';
122122

123123
@override
124124
String get userContentLimitsDescription =>
@@ -826,11 +826,11 @@ class AppLocalizationsAr extends AppLocalizations {
826826
'الحد الأقصى لعدد البلدان أو مصادر الأخبار أو المواضيع التي يمكن لهذا الدور المستخدم متابعتها (لكل نوع حد خاص به).';
827827

828828
@override
829-
String get savedHeadlinesLimitLabel => 'حد العناوين المحفوظة';
829+
String get savedFeedFiltersLimitLabel => 'حدود المرشحات';
830830

831831
@override
832-
String get savedHeadlinesLimitDescription =>
833-
'الحد الأقصى لعدد العناوين الرئيسية التي يمكن لهذا الدور المستخدم حفظها.';
832+
String get savedFeedFiltersLimitDescription =>
833+
'الحد الأقصى لعدد مرشحات موجز الأخبار التي يمكن لهذا الدور المستخدم حفظها.';
834834

835835
@override
836836
String get adFrequencyLabel => 'تكرار الإعلان';
@@ -840,11 +840,11 @@ class AppLocalizationsAr extends AppLocalizations {
840840
'عدد مرات ظهور الإعلان لهذا الدور المستخدم (على سبيل المثال، قيمة 5 تعني أنه يمكن وضع إعلان بعد كل 5 عناصر إخبارية).';
841841

842842
@override
843-
String get savedHeadlinesFilterLimitsDescription =>
844-
'الحد الأقصى لعدد مرشحات العناوين المحفوظة التي يمكن لهذا الدور إنشاؤها.';
843+
String get savedFeedFilterLimitsTitle => 'حد المرشحات المحفوظة';
845844

846845
@override
847-
String get savedHeadlinesFilterLimitsTitle => 'حدود مرشحات العناوين المحفوظة';
846+
String get savedFeedFilterLimitsDescription =>
847+
'الحد الأقصى لعدد مرشحات موجز الأخبار المحفوظة التي يمكن لهذا الدور إنشاؤها.';
848848

849849
@override
850850
String get adPlacementIntervalLabel => 'فترة وضع الإعلان';

lib/l10n/app_localizations_en.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class AppLocalizationsEn extends AppLocalizations {
117117
String get generalTab => 'General';
118118

119119
@override
120-
String get userContentLimitsTitle => 'User Content & Feed Limits';
120+
String get userContentLimitsTitle => 'User Content Limits';
121121

122122
@override
123123
String get userContentLimitsDescription =>
@@ -824,11 +824,11 @@ class AppLocalizationsEn extends AppLocalizations {
824824
'Maximum number of countries, news sources, or categories this user role can follow (each type has its own limit).';
825825

826826
@override
827-
String get savedHeadlinesLimitLabel => 'Saved Headlines Limit';
827+
String get savedFeedFiltersLimitLabel => 'Saved Filters Limits';
828828

829829
@override
830-
String get savedHeadlinesLimitDescription =>
831-
'Maximum number of headlines this user role can save.';
830+
String get savedFeedFiltersLimitDescription =>
831+
'Maximum number of feed filters this user role can save.';
832832

833833
@override
834834
String get adFrequencyLabel => 'Ad Frequency';
@@ -838,11 +838,11 @@ class AppLocalizationsEn extends AppLocalizations {
838838
'How often an ad can appear for this user role (e.g., a value of 5 means an ad could be placed after every 5 news items).';
839839

840840
@override
841-
String get savedHeadlinesFilterLimitsDescription =>
842-
'Set limits on the number of saved headlines filters for each user tier.';
841+
String get savedFeedFilterLimitsTitle => 'Saved Filter Limits';
843842

844843
@override
845-
String get savedHeadlinesFilterLimitsTitle => 'Saved Headlines Filter Limits';
844+
String get savedFeedFilterLimitsDescription =>
845+
'Set limits on the number of saved feed filters for each user tier.';
846846

847847
@override
848848
String get adPlacementIntervalLabel => 'Ad Placement Interval';

lib/l10n/arb/app_ar.arb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@
143143
"@generalTab": {
144144
"description": "عنوان تبويب الإعدادات العامة"
145145
},
146-
"userContentLimitsTitle": "حدود المحتوى والموجز للمستخدم",
146+
"userContentLimitsTitle": "حدود المحتوى",
147147
"@userContentLimitsTitle": {
148-
"description": "عنوان قسم حدود المحتوى والموجز للمستخدم"
148+
"description": "عنوان قسم حدود المحتوى للمستخدم"
149149
},
150150
"userContentLimitsDescription": "تعيين حدود للعناصر المتابعة والعناوين المحفوظة لكل فئة من فئات المستخدمين.",
151151
"@userContentLimitsDescription": {
152-
"description": "وصف قسم حدود المحتوى والموجز للمستخدم"
152+
"description": "وصف قسم حدود المحتوى للمستخدم"
153153
},
154154
"feedActionsTitle": "إجراءات الموجز",
155155
"@feedActionsTitle": {
@@ -1022,12 +1022,12 @@
10221022
"@followedItemsLimitDescription": {
10231023
"description": "وصف حد العناصر المتابعة"
10241024
},
1025-
"savedHeadlinesLimitLabel": "حد العناوين المحفوظة",
1026-
"@savedHeadlinesLimitLabel": {
1027-
"description": "تسمية حد العناوين المحفوظة"
1025+
"savedFeedFiltersLimitLabel": "حدود المرشحات",
1026+
"@savedFeedFiltersLimitLabel": {
1027+
"description": "تسمية حد مرشحات موجز الأخبار المحفوظة"
10281028
},
1029-
"savedHeadlinesLimitDescription": "الحد الأقصى لعدد العناوين الرئيسية التي يمكن لهذا الدور المستخدم حفظها.",
1030-
"@savedHeadlinesLimitDescription": {
1029+
"savedFeedFiltersLimitDescription": "الحد الأقصى لعدد مرشحات موجز الأخبار التي يمكن لهذا الدور المستخدم حفظها.",
1030+
"@savedFeedFiltersLimitDescription": {
10311031
"description": "وصف حد العناوين المحفوظة"
10321032
},
10331033
"adFrequencyLabel": "تكرار الإعلان",
@@ -1038,12 +1038,12 @@
10381038
"@adFrequencyDescription": {
10391039
"description": "وصف تكرار الإعلان"
10401040
},
1041-
"savedHeadlinesFilterLimitsTitle": "حدود مرشحات العناوين المحفوظة",
1042-
"@savedHeadlinesFilterLimitsTitle": {
1043-
"description": "وصف لحد المرشحات المحفوظة"
1041+
"savedFeedFilterLimitsTitle": "حد المرشحات المحفوظة",
1042+
"@savedFeedFilterLimitsTitle": {
1043+
"description": "وصف لحد مرشحات موجز الأخبار المحفوظة"
10441044
},
1045-
"savedHeadlinesFilterLimitsDescription": "الحد الأقصى لعدد مرشحات العناوين المحفوظة التي يمكن لهذا الدور إنشاؤها.",
1046-
"@savedHeadlinesFilterLimitsDescription": {
1045+
"savedFeedFilterLimitsDescription": "الحد الأقصى لعدد مرشحات موجز الأخبار المحفوظة التي يمكن لهذا الدور إنشاؤها.",
1046+
"@savedFeedFilterLimitsDescription": {
10471047
"description": "وصف لحد المرشحات المحفوظة"
10481048
},
10491049
"adPlacementIntervalLabel": "فترة وضع الإعلان",

lib/l10n/arb/app_en.arb

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@
143143
"@generalTab": {
144144
"description": "Tab title for General settings"
145145
},
146-
"userContentLimitsTitle": "User Content & Feed Limits",
146+
"userContentLimitsTitle": "User Content Limits",
147147
"@userContentLimitsTitle": {
148-
"description": "Title for the User Content & Feed Limits section"
148+
"description": "Title for the User Content Limits section"
149149
},
150150
"userContentLimitsDescription": "Set limits on followed items and saved headlines for each user tier.",
151151
"@userContentLimitsDescription": {
152-
"description": "Description for the User Content & Feed Limits section"
152+
"description": "Description for the User Content Limits section"
153153
},
154154
"feedActionsTitle": "Feed Actions",
155155
"@feedActionsTitle": {
@@ -1022,12 +1022,12 @@
10221022
"@followedItemsLimitDescription": {
10231023
"description": "Description for Followed Items Limit"
10241024
},
1025-
"savedHeadlinesLimitLabel": "Saved Headlines Limit",
1026-
"@savedHeadlinesLimitLabel": {
1027-
"description": "Label for Saved Headlines Limit"
1025+
"savedFeedFiltersLimitLabel": "Saved Filters Limits",
1026+
"@savedFeedFiltersLimitLabel": {
1027+
"description": "Label for Saved filters Limits"
10281028
},
1029-
"savedHeadlinesLimitDescription": "Maximum number of headlines this user role can save.",
1030-
"@savedHeadlinesLimitDescription": {
1029+
"savedFeedFiltersLimitDescription": "Maximum number of feed filters this user role can save.",
1030+
"@savedFeedFiltersLimitDescription": {
10311031
"description": "Description for Saved Headlines Limit"
10321032
},
10331033
"adFrequencyLabel": "Ad Frequency",
@@ -1038,13 +1038,13 @@
10381038
"@adFrequencyDescription": {
10391039
"description": "Description for Ad Frequency"
10401040
},
1041-
"savedHeadlinesFilterLimitsDescription": "Set limits on the number of saved headlines filters for each user tier.",
1042-
"@savedHeadlinesFilterLimitsDescription": {
1043-
"description": "Description for the Saved Headlines Filter Limits section"
1041+
"savedFeedFilterLimitsTitle": "Saved Filter Limits",
1042+
"@savedFeedFilterLimitsTitle": {
1043+
"description": "Title for the Saved Feed Filter Limits section"
10441044
},
1045-
"savedHeadlinesFilterLimitsTitle": "Saved Headlines Filter Limits",
1046-
"@savedHeadlinesFilterLimitsTitle": {
1047-
"description": "Title for the Saved Headlines Filter Limits section"
1045+
"savedFeedFilterLimitsDescription": "Set limits on the number of saved feed filters for each user tier.",
1046+
"@savedFeedFilterLimitsDescription": {
1047+
"description": "Description for the Saved Headlines Filter Limits section"
10481048
},
10491049
"adPlacementIntervalLabel": "Ad Placement Interval",
10501050
"@adPlacementIntervalLabel": {

0 commit comments

Comments
 (0)