Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flexible routines #682

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
7db93f0
Start implementing new flexible routines
rolandgeider Oct 30, 2024
a79b6d6
Start implementing new flexible routines
rolandgeider Oct 30, 2024
9ff2bba
Load the new DayData entries and the regular data objects from struct…
rolandgeider Oct 30, 2024
abf9413
Start rendering the new routines
rolandgeider Nov 2, 2024
05b13d8
Further work on rendering the new routines
rolandgeider Nov 7, 2024
415daf1
Workaround for duplicate exercises in the DB
rolandgeider Nov 10, 2024
5c94737
Rename provider
rolandgeider Nov 10, 2024
12f22d2
Rename widget folder
rolandgeider Nov 10, 2024
47e36ef
More refactoring of routine screens and widgets
rolandgeider Nov 10, 2024
cd4a848
Remove the CustomScrollView
rolandgeider Nov 10, 2024
a35336f
Allow editing the fit in week toggle as well as start and end dates
rolandgeider Nov 12, 2024
1d93b2f
Refactor forms into individual files
rolandgeider Nov 12, 2024
9e9fa6b
Allow setting the day order per drag and drop
rolandgeider Nov 12, 2024
d76fcdc
Allow editing the currently selected day
rolandgeider Nov 12, 2024
4d4120c
Select newly created day for editing
rolandgeider Nov 12, 2024
bf73afd
Allow deleting days from a routine
rolandgeider Nov 12, 2024
056ed2b
Allow day objects to load slots
rolandgeider Nov 12, 2024
aa8c344
Allow reordering of slots
rolandgeider Nov 12, 2024
4b5ce9b
Remove reorderable from routine view widget
rolandgeider Nov 13, 2024
277628f
Merge branch 'master' into feature/flexible-routines
rolandgeider Nov 14, 2024
23119e6
Allow users to reorder the days and the slots within the days
rolandgeider Nov 15, 2024
04c6d6c
Save values to server
rolandgeider Nov 15, 2024
ffa87f6
Refactor update logic
rolandgeider Nov 16, 2024
c5f4eec
Extract exercise autocompleter to its own widget
rolandgeider Nov 16, 2024
e6e0ed3
Properly set or remove newly created objects
rolandgeider Nov 16, 2024
a4f334e
Allow deleting slots
rolandgeider Nov 16, 2024
f7461ab
Polish the crud workflow
rolandgeider Nov 16, 2024
7499033
Remove unused strings
rolandgeider Nov 16, 2024
8020bd2
More polish and i18n work
rolandgeider Nov 16, 2024
be28c27
Give feedback to the user when the form is being saved
rolandgeider Nov 16, 2024
aa6468e
Use a slider to select the number of sets
rolandgeider Nov 16, 2024
7794948
Cleanup
rolandgeider Nov 17, 2024
04e112d
Fix some widgets, polishing, renaming
rolandgeider Nov 20, 2024
f6bae10
Merge branch 'master' into feature/flexible-routines
rolandgeider Jan 5, 2025
ae4d223
WIP: Make gym mode display the exercises
rolandgeider Jan 5, 2025
ad5d1be
Pass the necessary IDs to the gym mode and load the rest of the data
rolandgeider Jan 5, 2025
b66aa74
Some polishing, adding missing fields and other QoL
rolandgeider Jan 5, 2025
ca6c682
Remove more unused code
rolandgeider Jan 5, 2025
1ad5948
Start implementing the expanded mode on the slot entry form
rolandgeider Jan 5, 2025
fde14c3
Merge branch 'master' into feature/flexible-routines
rolandgeider Jan 5, 2025
fd1ee42
fix: improve Gym Mode navigation and state persistence
Jackpkn Jan 6, 2025
5f89ab4
Add missing max fields to the slot entry form
rolandgeider Jan 6, 2025
4a60018
Fix tests
rolandgeider Jan 6, 2025
ede90b7
Remove unused code
rolandgeider Jan 6, 2025
462cc95
Fix test
rolandgeider Jan 6, 2025
d7094c3
Add target fields to workout log
rolandgeider Jan 6, 2025
b0e1da4
Some renaming for consistency
rolandgeider Jan 6, 2025
7aca931
Merge remote-tracking branch 'upstream/master' into fix/gym-mode-stat…
Jackpkn Jan 7, 2025
6bfcb3e
Round the value of the slider
rolandgeider Jan 7, 2025
6e7284e
Update the routine test data
rolandgeider Jan 7, 2025
6d97005
Update the routine test data
rolandgeider Jan 7, 2025
deaee53
Fix test
rolandgeider Jan 7, 2025
b421120
Also read max sets and mar rir from the API
rolandgeider Jan 8, 2025
5a39c6c
Rename some functions, a bit of cleanup
rolandgeider Jan 10, 2025
5d542c5
Use updated name of repetition in API response
rolandgeider Jan 14, 2025
abac774
Merge branch 'master' into feature/flexible-routines
rolandgeider Jan 18, 2025
392dc69
Merge branch 'fork/Jackpkn/fix/gym-mode-state-persistence-riverpod' i…
rolandgeider Jan 18, 2025
f5ab51f
Repetitions are not integers anymore
rolandgeider Jan 18, 2025
c397e10
Fix tests
rolandgeider Jan 18, 2025
9bb3567
Add day id to the gym state provider
rolandgeider Jan 18, 2025
9ab55a6
Save iteration and slot entry id to the logs
rolandgeider Jan 18, 2025
757eb4b
Almost everything is nullable in the Log
rolandgeider Jan 18, 2025
654fe61
Rename some more files
rolandgeider Jan 18, 2025
3a398d0
Simplify arguments for routine objects and add a smoke test
rolandgeider Jan 18, 2025
a770c97
Add smoke test for the routine edit form
rolandgeider Jan 21, 2025
eff176f
Merge branch 'master' into feature/flexible-routines
rolandgeider Jan 24, 2025
079db5d
Recreate generated files
rolandgeider Jan 24, 2025
1e94395
Replace day list
rolandgeider Jan 24, 2025
ce9c225
Don't break from the loop immediately
rolandgeider Jan 24, 2025
ffe5867
Add simple tests for SlotEntryForm
rolandgeider Jan 24, 2025
b4ff0b7
Some cleanup, renaming, reformating
rolandgeider Jan 24, 2025
4d55f8c
Add some more tests
rolandgeider Jan 24, 2025
4196157
Update goldens
rolandgeider Jan 24, 2025
58d6031
Merge branch 'master' into feature/flexible-routines
rolandgeider Jan 25, 2025
bc841d9
Merge remote-tracking branch 'origin/feature/flexible-routines' into …
rolandgeider Jan 25, 2025
9ea580a
Skip golden comparison when running on a non-linux platform
rolandgeider Jan 25, 2025
202349c
Make workout log charts work again
rolandgeider Jan 25, 2025
60c06b9
Update goldens
rolandgeider Jan 25, 2025
4b1dec2
Add some more tests
rolandgeider Jan 25, 2025
69ffdcf
Don't overflow the set representation
rolandgeider Jan 25, 2025
13998ec
Don't load the routine every time the log page are accessed
rolandgeider Jan 25, 2025
c093550
Load the session data from the new API as well
rolandgeider Jan 25, 2025
3c2e8fa
Merge remote-tracking branch 'origin/feature/flexible-routines' into …
rolandgeider Jan 25, 2025
123b45e
Update goldens
rolandgeider Jan 26, 2025
b4f8a59
Add the newly created session to the routine
rolandgeider Jan 26, 2025
6869dc9
Use logging package for debug messages in routines provider
rolandgeider Jan 26, 2025
51ed2ef
Format numeric log values
rolandgeider Jan 26, 2025
7c6fbeb
Show workout session information
rolandgeider Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unused strings
  • Loading branch information
rolandgeider committed Nov 16, 2024
commit 74990330da8117f918898b2fc0d5fb6f9754ac43
8 changes: 0 additions & 8 deletions lib/l10n/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@
"@goToToday": {
"description": "Label on button to jump back to 'today' in the calendar widget"
},
"enterRepetitionsOrWeight": "يرجى ملء التكرارات أو الوزن لواحدة على الأقل من المجموعات",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"baseData": "الأساسيات بالإنجليزية",
"@baseData": {
"description": "The base data for an exercise such as category, trained muscles, etc."
Expand Down Expand Up @@ -644,10 +640,6 @@
},
"measurementEntriesHelpText": "الوحدة المستخدمة لقياس الفئة مثل \"سم\" أو \"%\"",
"@measurementEntriesHelpText": {},
"supersetWith": "مجموعة شاملة مع",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"sugars": "سكريات",
"@sugars": {},
"customServerUrl": "رابط عنصر wger",
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_ca.arb
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
"@searchExercise": {
"description": "Label on set form. Selected exercises are added to the set"
},
"supersetWith": "en conjunt amb",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"equipment": "Equipament",
"@equipment": {
"description": "Equipment needed to perform an exercise"
Expand Down Expand Up @@ -458,10 +454,6 @@
"@proteinShort": {
"description": "The first letter or short name of the word 'Protein', used in overviews"
},
"enterRepetitionsOrWeight": "Ompliu les repeticions o bé el pes per a una de les sèries com a mínim",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"fatShort": "G",
"@fatShort": {
"description": "The first letter or short name of the word 'Fat', used in overviews"
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,6 @@
},
"calendar": "Kalendář",
"@calendar": {},
"enterRepetitionsOrWeight": "Prosím, vyplňte buď počet opakování, nebo hmotnost u alespoň jedné sady",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"enterValue": "Prosím zadejte hodnotu",
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
Expand Down Expand Up @@ -372,10 +368,6 @@
"@searchExercise": {
"description": "Label on set form. Selected exercises are added to the set"
},
"supersetWith": "superset s",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"logMeal": "Zaznamenat do nutričního diáře",
"@logMeal": {},
"muscles": "Svaly",
Expand Down
14 changes: 0 additions & 14 deletions lib/l10n/app_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
"@toggleDetails": {
"description": "Switch to toggle detail / overview"
},
"aboutText": "wger ist copylefted-Software, lizenziert unter der AGPLv3+ und verfügbar auf GitHub:",
"@aboutText": {
"description": "Text in the about dialog"
},
"newNutritionalPlan": "Neuer Ernährungsplan",
"@newNutritionalPlan": {},
"delete": "Löschen",
Expand Down Expand Up @@ -112,8 +108,6 @@
"@weight": {
"description": "The weight of a workout log or body weight entry"
},
"dismiss": "Verwerfen",
"@dismiss": {},
"anErrorOccurred": "Es ist ein Fehler aufgetreten!",
"@anErrorOccurred": {},
"nutritionalPlans": "Ernährungspläne",
Expand Down Expand Up @@ -321,10 +315,6 @@
"@reps": {
"description": "Shorthand for repetitions, used when space constraints are tighter"
},
"enterRepetitionsOrWeight": "Bitte gebe entweder die Wiederholungen oder das Gewicht für mindestens einen der Sätze an",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"start": "Starten",
"@start": {
"description": "Label on button to start the gym mode (i.e., an imperative)"
Expand Down Expand Up @@ -464,10 +454,6 @@
},
"timeStartAhead": "Die Startzeit kann nicht vor der Endzeit liegen",
"@timeStartAhead": {},
"supersetWith": "Supersatz mit",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"total": "Summe",
"@total": {
"description": "Label used for total sums of e.g. calories or similar"
Expand Down
4 changes: 0 additions & 4 deletions lib/l10n/app_el.arb
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,6 @@
"@noMatchingExerciseFound": {
"description": "Message returned if no exercises match the searched string"
},
"supersetWith": "υπερσύνολο με",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"equipment": "Εξοπλισμός",
"@equipment": {
"description": "Equipment needed to perform an exercise"
Expand Down
9 changes: 0 additions & 9 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@
"description": "Message returned if no exercises match the searched string"
},
"searchNamesInEnglish": "Also search for names in English",
"supersetWith": "superset with",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"equipment": "Equipment",
"@equipment": {
"description": "Equipment needed to perform an exercise"
Expand Down Expand Up @@ -462,7 +458,6 @@
"saturatedFat": "Saturated fat",
"@saturatedFat": {},
"fiber": "Fibers",
"@fibres": {},
"sodium": "Sodium",
"@sodium": {},
"amount": "Amount",
Expand Down Expand Up @@ -565,10 +560,6 @@
"@goToToday": {
"description": "Label on button to jump back to 'today' in the calendar widget"
},
"enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"enterValue": "Please enter a value",
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
Expand Down
10 changes: 0 additions & 10 deletions lib/l10n/app_es.arb
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
},
"enterRepetitionsOrWeight": "Por favor completa las repeticiones o pesos para al menos una de las series",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"goToToday": "Ir a \"hoy\"",
"@goToToday": {
"description": "Label on button to jump back to 'today' in the calendar widget"
Expand Down Expand Up @@ -180,8 +176,6 @@
"@weight": {
"description": "The weight of a workout log or body weight entry"
},
"dismiss": "Cerrar",
"@dismiss": {},
"anErrorOccurred": "¡Un error ha ocurrido!",
"@anErrorOccurred": {},
"noNutritionalPlans": "No tienes planes nutricionales",
Expand Down Expand Up @@ -494,10 +488,6 @@
"@searchIngredient": {
"description": "Label on ingredient search form"
},
"supersetWith": "en conjunto con",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"rirNotUsed": "Valor ReR sin usar",
"@rirNotUsed": {
"description": "Label used in RiR slider when the RiR value is not used/saved for the current setting or log"
Expand Down
14 changes: 0 additions & 14 deletions lib/l10n/app_fr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
},
"calendar": "Calendrier",
"@calendar": {},
"aboutText": "wger est un logiciel libre, sous licence AFPLv3+ et disponible sur GitHub:",
"@aboutText": {
"description": "Text in the about dialog"
},
"toggleDetails": "Afficher les détails",
"@toggleDetails": {
"description": "Switch to toggle detail / overview"
Expand Down Expand Up @@ -115,8 +111,6 @@
"@date": {
"description": "The date of a workout log or body weight entry"
},
"dismiss": "Rejeter",
"@dismiss": {},
"anErrorOccurred": "Une erreur s’est produite !",
"@anErrorOccurred": {},
"noNutritionalPlans": "Aucun programme nutritionnel",
Expand Down Expand Up @@ -300,10 +294,6 @@
"@selectExercise": {
"description": "Error message when the user hasn't selected an exercise in the form"
},
"enterRepetitionsOrWeight": "Veuillez indiquer les répétitions ou le poids pour au moins une des séries",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"aboutTranslationText": "Cette application est traduite sur Weblate. Si vous voulez aussi aider, cliquez sur le lien et commencez à traduire",
"@aboutTranslationText": {
"description": "Text for translation section in the about dialog"
Expand Down Expand Up @@ -451,10 +441,6 @@
},
"timeStartAhead": "L'heure de début ne peut pas être après à l'heure de fin",
"@timeStartAhead": {},
"supersetWith": "supersérie avec",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"plateCalculatorNotDivisible": "Impossible d'atteindre le poids avec les disques disponibles",
"@plateCalculatorNotDivisible": {
"description": "Error message when the current weight is not reachable with plates (e.g. 33.1 kg)"
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_he.arb
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
"@searchExercise": {
"description": "Label on set form. Selected exercises are added to the set"
},
"supersetWith": "סט תרגילים ראשי עם",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"muscles": "שרירים",
"@muscles": {
"description": "(main) muscles trained by an exercise"
Expand Down Expand Up @@ -341,10 +337,6 @@
"@aboutSourceText": {
"description": "Text for source code section in the about dialog"
},
"enterRepetitionsOrWeight": "אנא מלאו את החזרות או את המשקל בלפחות אחד מהסטים",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"setUnitsAndRir": "יחידות סט וחזרות בעתודה",
"@setUnitsAndRir": {
"description": "Label shown on the slider where the user can toggle showing units and RiR",
Expand Down
4 changes: 0 additions & 4 deletions lib/l10n/app_hi.arb
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@
"@exercise": {},
"searchExercise": "जोड़ने के लिए व्यायाम खोजें",
"@searchExercise": {},
"supersetWith": "सुपरसेट के साथ",
"@supersetWith": {},
"equipment": "उपकरण",
"@equipment": {},
"muscles": "मांसपेशियों",
Expand Down Expand Up @@ -277,8 +275,6 @@
"@aboutTranslationText": {},
"calendar": "कैलेंडर",
"@calendar": {},
"enterRepetitionsOrWeight": "कृपया इनमें से कम से कम एक सेट के लिए दोहराव या वजन भरें",
"@enterRepetitionsOrWeight": {},
"enterValue": "कृपया मान दर्ज करें",
"@enterValue": {},
"selectExercise": "कृपया एक पाठ्यक्रम का चयन करें",
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_hr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,6 @@
"@aboutContactUsTitle": {
"description": "Title for contact us section in the about dialog"
},
"enterRepetitionsOrWeight": "Upiši broj ponavljanja ili težinu za barem jednu seriju",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"enterValue": "Upiši vrijednost",
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
Expand Down Expand Up @@ -427,10 +423,6 @@
"@equipment": {
"description": "Equipment needed to perform an exercise"
},
"supersetWith": "u nasdkup sa",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"category": "Kategorija",
"@category": {
"description": "Category for an exercise, ingredient, etc."
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_id.arb
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@
"@searchExercise": {
"description": "Label on set form. Selected exercises are added to the set"
},
"supersetWith": "tambahkan dengan",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"equipment": "Perlengkapan",
"@equipment": {
"description": "Equipment needed to perform an exercise"
Expand Down Expand Up @@ -456,10 +452,6 @@
"@goToToday": {
"description": "Label on button to jump back to 'today' in the calendar widget"
},
"enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"enterValue": "Please enter a value",
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
Expand Down
14 changes: 0 additions & 14 deletions lib/l10n/app_it.arb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
},
"calendar": "Calendario",
"@calendar": {},
"aboutText": "wger è rilasciato con \"permesso d'autore\", licenza AGPLv3+ e disponibile su GitHub:",
"@aboutText": {
"description": "Text in the about dialog"
},
"toggleDetails": "Scegli dettagli",
"@toggleDetails": {
"description": "Switch to toggle detail / overview"
Expand Down Expand Up @@ -113,8 +109,6 @@
"@weight": {
"description": "The weight of a workout log or body weight entry"
},
"dismiss": "Annulla",
"@dismiss": {},
"noNutritionalPlans": "Non hai nessun piano nutrizionale",
"@noNutritionalPlans": {
"description": "Message shown when the user has no nutritional plans"
Expand Down Expand Up @@ -336,10 +330,6 @@
"@logout": {
"description": "Text for logout button"
},
"enterRepetitionsOrWeight": "Inserisci sia le ripetizioni che il peso per almeno una delle serie",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"aboutTranslationText": "Questa applicazione è tradotta su weblate. Se anche tu vuoi contribuire, clicca sul link e inizia a tradurre",
"@aboutTranslationText": {
"description": "Text for translation section in the about dialog"
Expand Down Expand Up @@ -515,10 +505,6 @@
"@recentlyUsedIngredients": {
"description": "A message when a user adds a new ingredient to a meal."
},
"supersetWith": "superset con",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"plateCalculator": "Piastre",
"@plateCalculator": {
"description": "Label used for the plate calculator in the gym mode"
Expand Down
8 changes: 0 additions & 8 deletions lib/l10n/app_ja.arb
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@
"@searchExercise": {
"description": "Label on set form. Selected exercises are added to the set"
},
"supersetWith": "セットで",
"@supersetWith": {
"description": "Text used between exercise cards when adding a new set. Translate as something like 'in a superset with'"
},
"equipment": "器具",
"@equipment": {
"description": "Equipment needed to perform an exercise"
Expand Down Expand Up @@ -455,10 +451,6 @@
"@goToToday": {
"description": "Label on button to jump back to 'today' in the calendar widget"
},
"enterRepetitionsOrWeight": "Please fill in either the repetitions or the weight for at least one of the sets",
"@enterRepetitionsOrWeight": {
"description": "Error message when the user hasn't filled in the forms for exercise sets"
},
"enterValue": "Please enter a value",
"@enterValue": {
"description": "Error message when the user hasn't entered a value on a required field"
Expand Down
7 changes: 0 additions & 7 deletions lib/l10n/app_nb.arb
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"aboutText": "wger arbeidsøkthåndterer er gemenhetslig fri programvare, lisensiert AGPLv3+ og tilgjengelig på GitHub:",
"@aboutText": {
"description": "Text in the about dialog"
},
"fiber": "Fiber",
"@fibres": {},
"mealLogged": "Måltid lagt til i dagbok",
"@mealLogged": {},
"successfullyDeleted": "Slettet",
Expand Down Expand Up @@ -91,8 +86,6 @@
"@weight": {
"description": "The weight of a workout log or body weight entry"
},
"dismiss": "Forkast",
"@dismiss": {},
"anErrorOccurred": "En feil inntraff.",
"@anErrorOccurred": {},
"nutritionalPlans": "Ernæringsplaner",
Expand Down
Loading