wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

New language keys have been added for some short names of macronutrients (energy, fats, carbohydrates, proteins)

Browse Source
This commit is contained in:
Sandi Milohanić
2021-10-08 13:14:02 +02:00
parent 0c1e80e660
commit bed7da48c6
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/l10n/app_en.arb
View File

@@ -296,6 +296,10 @@
"@energy": {
"description": "Energy in a meal, ingredient etc. e.g. in kJ"
},
"energyShort": "E",
"@energyShort": {
"description": "The first letter or short name of the word 'Energy', used in overviews"
},
"kcal": "kcal",
"@kcal": {
"description": "Energy in a meal in kilocalories, kcal"
@@ -329,12 +333,24 @@
},
"protein": "Protein",
"@protein": {},
"proteinShort": "P",
"@proteinShort": {
"description" : "The first letter or short name of the word 'Protein', used in overviews"
},
"carbohydrates": "Carbohydrates",
"@carbohydrates": {},
"carbohydratesShort": "C",
"@carbohydratesShort": {
"description" : "The first letter or short name of the word 'Carbohydrates', used in overviews"
},
"sugars": "Sugars",
"@sugars": {},
"fat": "Fat",
"@fat": {},
"fatShort": "F",
"@fatShort": {
"description" : "The first letter or short name of the word 'Fat', used in overviews"
},
"saturatedFat": "Saturated fat",
"@saturatedFat": {},
"fibres": "Fibre",

9
lib/widgets/dashboard/widgets.dart
View File

@@ -37,7 +37,6 @@ import 'package:wger/widgets/core/charts.dart';
import 'package:wger/widgets/core/core.dart';
import 'package:wger/widgets/nutrition/charts.dart';
import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/nutrition/helpers.dart';
import 'package:wger/widgets/weight/forms.dart';
import 'package:wger/widgets/workouts/forms.dart';
@@ -81,16 +80,16 @@ class _DashboardNutritionWidgetState extends State<DashboardNutritionWidget> {
mainAxisSize: MainAxisSize.min,
children: [
MutedText(
'${getFirstWord(AppLocalizations.of(context).energy)} ${meal.nutritionalValues.energy.toStringAsFixed(0)}${AppLocalizations.of(context).kcal}'),
'${AppLocalizations.of(context).energyShort} ${meal.nutritionalValues.energy.toStringAsFixed(0)}${AppLocalizations.of(context).kcal}'),
MutedText(' / '),
MutedText(
'${getFirstWord(AppLocalizations.of(context).protein)} ${meal.nutritionalValues.protein.toStringAsFixed(0)}${AppLocalizations.of(context).g}'),
'${AppLocalizations.of(context).proteinShort} ${meal.nutritionalValues.protein.toStringAsFixed(0)}${AppLocalizations.of(context).g}'),
MutedText(' / '),
MutedText(
'${getFirstWord(AppLocalizations.of(context).carbohydrates)} ${meal.nutritionalValues.carbohydrates.toStringAsFixed(0)}${AppLocalizations.of(context).g}'),
'${AppLocalizations.of(context).carbohydratesShort} ${meal.nutritionalValues.carbohydrates.toStringAsFixed(0)}${AppLocalizations.of(context).g}'),
MutedText(' / '),
MutedText(
'${getFirstWord(AppLocalizations.of(context).fat)} ${meal.nutritionalValues.fat.toStringAsFixed(0)}${AppLocalizations.of(context).g} '),
'${AppLocalizations.of(context).fatShort} ${meal.nutritionalValues.fat.toStringAsFixed(0)}${AppLocalizations.of(context).g} '),
],
),
IconButton(

4
lib/widgets/nutrition/helpers.dart
View File

@@ -48,7 +48,3 @@ List<Widget> getMutedNutritionalValues(NutritionalValues values, BuildContext co
];
return out;
}
String getFirstWord(String macroNutrientName) => macroNutrientName.isNotEmpty
? macroNutrientName.trim().split(' ').map((l) => l[0]).join()
: '';

9
lib/widgets/nutrition/nutritional_plan_detail.dart
View File

@@ -28,7 +28,6 @@ import 'package:wger/screens/nutritional_diary_screen.dart';
import 'package:wger/theme/theme.dart';
import 'package:wger/widgets/nutrition/charts.dart';
import 'package:wger/widgets/nutrition/forms.dart';
import 'package:wger/widgets/nutrition/helpers.dart';
import 'package:wger/widgets/nutrition/meal.dart';
class NutritionalPlanDetailWidget extends StatelessWidget {
@@ -226,13 +225,13 @@ class NutritionalPlanDetailWidget extends StatelessWidget {
children: [
TextButton(onPressed: () {}, child: const Text('')),
Text(
'${getFirstWord(AppLocalizations.of(context).energy)} (${AppLocalizations.of(context).kcal})'),
'${AppLocalizations.of(context).energyShort} (${AppLocalizations.of(context).kcal})'),
Text(
'${getFirstWord(AppLocalizations.of(context).protein)} (${AppLocalizations.of(context).g})'),
'${AppLocalizations.of(context).proteinShort} (${AppLocalizations.of(context).g})'),
Text(
'${getFirstWord(AppLocalizations.of(context).carbohydrates)} (${AppLocalizations.of(context).g})'),
'${AppLocalizations.of(context).carbohydratesShort} (${AppLocalizations.of(context).g})'),
Text(
'${getFirstWord(AppLocalizations.of(context).fat)} (${AppLocalizations.of(context).g})'),
'${AppLocalizations.of(context).fatShort} (${AppLocalizations.of(context).g})'),
],
),
),