Merge branch 'main' into 'feature/prods'

# Conflicts:
#   components/cycle-day/symptom-edit-view.js
#   i18n/en/cycle-day.js
This commit is contained in:
bl00dymarie
2024-04-03 19:56:12 +00:00
116 changed files with 5090 additions and 4628 deletions
+3 -8
View File
@@ -47,8 +47,7 @@ export const cervix = {
explainer: 'How high up in the vagina is the cervix?',
},
excludeExplainer:
"You can exclude these values if you don't want to use them for fertility detection.",
actionHint: 'Choose values for at least "Opening" and "Firmness" to save.',
"You can exclude this value if you don't want to use it for fertility detection.",
}
export const mucus = {
@@ -66,8 +65,7 @@ export const mucus = {
'Looking at and touching your cervical mucus, which describes it best?',
},
excludeExplainer:
"You can exclude these values if you don't want to use them for fertility detection",
actionHint: 'Choose values for both "Feeling" and "Texture" to save.',
"You can exclude this value if you don't want to use it for fertility detection",
}
export const desire = {
@@ -131,13 +129,10 @@ export const mood = {
}
export const temperature = {
// disabled temporarily, TODO https://gitlab.com/bloodyhealth/drip/-/issues/545 */}
// outOfRangeWarning: 'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
outOfRangeWarning:
'This temperature value is too high or low to be shown on the temperature chart.',
'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
outOfAbsoluteRangeWarning:
'This temperature value is too high or low to be shown on the temperature chart.',
saveAnyway: 'Save anyway',
temperature: {
header: 'Temperature',
explainer: