Skip to content

Commit e382387

Browse files
committed
fix localisation for 'open ended'
1 parent 20713ee commit e382387

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

lib/l10n/app_en.arb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,10 @@
392392
"@endDate": {
393393
"description": "The End date of a nutritional plan"
394394
},
395+
"openEnded": "Open ended",
396+
"@openEnded": {
397+
"description": "When a nutrition plan has no pre-defined end date"
398+
},
395399
"value": "Value",
396400
"@value": {
397401
"description": "The value of a measurement entry"

lib/widgets/nutrition/nutritional_plan_detail.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
5555
).format(_nutritionalPlan.endDate!)}'
5656
: 'from ${DateFormat.yMd(
5757
Localizations.localeOf(context).languageCode,
58-
).format(_nutritionalPlan.startDate)} (open ended)',
58+
).format(_nutritionalPlan.startDate)} (${AppLocalizations.of(context).openEnded})',
5959
style: Theme.of(context).textTheme.titleSmall?.copyWith(
6060
fontStyle: FontStyle.italic,
6161
),

test/nutrition/nutritional_plans_screen_test.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ import 'package:drift/native.dart';
2020
import 'package:flutter/material.dart';
2121
import 'package:flutter_test/flutter_test.dart';
2222
import 'package:http/http.dart' as http;
23+
import 'package:intl/intl.dart';
2324
import 'package:mockito/annotations.dart';
2425
import 'package:mockito/mockito.dart';
26+
import 'package:path/path.dart';
2527
import 'package:provider/provider.dart';
2628
import 'package:wger/database/ingredients/ingredients_database.dart';
2729
import 'package:wger/l10n/generated/app_localizations.dart';
@@ -149,14 +151,16 @@ void main() {
149151
testWidgets('Tests the localization of dates - EN', (WidgetTester tester) async {
150152
await tester.pumpWidget(createHomeScreen());
151153

152-
expect(find.text('1/1/2021'), findsOneWidget);
153-
expect(find.text('1/10/2021'), findsOneWidget);
154+
// note .. "(open ended)" at the time, depending on localisation strings
155+
expect(find.textContaining('from 1/1/2021 ('), findsOneWidget);
156+
expect(find.textContaining('from 1/10/2021 ('), findsOneWidget);
154157
});
155158

156159
testWidgets('Tests the localization of dates - DE', (WidgetTester tester) async {
157160
await tester.pumpWidget(createHomeScreen(locale: 'de'));
161+
// note .. "(open ended)" at the time, depending on localisation strings
158162

159-
expect(find.text('1.1.2021'), findsOneWidget);
160-
expect(find.text('10.1.2021'), findsOneWidget);
163+
expect(find.textContaining('from 1.1.2021 ('), findsOneWidget);
164+
expect(find.textContaining('from 10.1.2021 ('), findsOneWidget);
161165
});
162166
}

0 commit comments

Comments
 (0)