From ccb0d5c09d45bc28e2d9bd549a1e4b87b1e4f49e Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 6 Jun 2024 18:07:40 +0300 Subject: [PATCH] l10n --- lib/l10n/app_en.arb | 4 +++- lib/screens/log_meals_screen.dart | 3 ++- lib/screens/nutritional_plan_screen.dart | 2 +- lib/widgets/dashboard/widgets.dart | 5 ++--- lib/widgets/nutrition/forms.dart | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index efe8db47..5926d43d 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -256,7 +256,8 @@ "@addMeal": {}, "mealLogged": "Meal logged to diary", "@mealLogged": {}, - "logMeal": "Log this meal", + "ingredientLogged": "Ingredient logged to diary", + "logMeal": "Save meal to nutrition diary", "@logMeal": {}, "addIngredient": "Add ingredient", "@addIngredient": {}, @@ -282,6 +283,7 @@ "@goalMacro": { "description": "The goal for macronutrients" }, + "selectMealToLog": "Select a meal to save to diary", "goalEnergy": "Energy goal", "goalProtein": "Protein goal", "goalCarbohydrates": "Carbohydrates goal", diff --git a/lib/screens/log_meals_screen.dart b/lib/screens/log_meals_screen.dart index ebd88a8a..54e772d5 100644 --- a/lib/screens/log_meals_screen.dart +++ b/lib/screens/log_meals_screen.dart @@ -17,6 +17,7 @@ */ import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:wger/models/nutrition/nutritional_plan.dart'; import 'package:wger/widgets/nutrition/meal.dart'; @@ -36,7 +37,7 @@ class _LogMealsScreenState extends State { return Scaffold( appBar: AppBar( - title: Text('Select a meal to log to diary'), + title: Text(AppLocalizations.of(context).selectMealToLog), ), body: ListView.builder( itemCount: nutritionalPlan.meals.length, diff --git a/lib/screens/nutritional_plan_screen.dart b/lib/screens/nutritional_plan_screen.dart index e8e89959..e550cc30 100644 --- a/lib/screens/nutritional_plan_screen.dart +++ b/lib/screens/nutritional_plan_screen.dart @@ -73,7 +73,7 @@ class NutritionalPlanScreen extends StatelessWidget { ), FloatingActionButton( heroTag: null, - tooltip: 'Save meal to nutrition diary', + tooltip: AppLocalizations.of(context).logMeal, onPressed: () { Navigator.of(context).pushNamed(LogMealsScreen.routeName, arguments: nutritionalPlan); }, diff --git a/lib/widgets/dashboard/widgets.dart b/lib/widgets/dashboard/widgets.dart index e0b88be1..083f77a6 100644 --- a/lib/widgets/dashboard/widgets.dart +++ b/lib/widgets/dashboard/widgets.dart @@ -207,8 +207,7 @@ class _DashboardNutritionWidgetState extends State { Expanded(child: Container()), IconButton( icon: const SvgIcon(icon: SvgIconData('assets/icons/ingredient-diary.svg')), - tooltip: AppLocalizations.of(context) - .logIngredient, // TODO: message should mention *ingredient* + tooltip: AppLocalizations.of(context).logIngredient, onPressed: () { Navigator.pushNamed( context, @@ -223,7 +222,7 @@ class _DashboardNutritionWidgetState extends State { ), IconButton( icon: const SvgIcon(icon: SvgIconData('assets/icons/meal-diary.svg')), - tooltip: 'Save meal to nutrition diary', + tooltip: AppLocalizations.of(context).logMeal, onPressed: () { Navigator.of(context).pushNamed(LogMealsScreen.routeName, arguments: _plan); }, diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart index 5bb1b0a5..4bafbe2d 100644 --- a/lib/widgets/nutrition/forms.dart +++ b/lib/widgets/nutrition/forms.dart @@ -136,9 +136,9 @@ Widget IngredientLogForm(NutritionalPlan plan) { Provider.of(context, listen: false) .logIngredientToDiary(mealItem, plan.id!, dt); ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( + SnackBar( content: Text( - 'Ingredient logged to diary', + AppLocalizations.of(context).ingredientLogged, textAlign: TextAlign.center, ), ),