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
+24
-19
@@ -7,18 +7,16 @@
|
||||
"chart": {
|
||||
"tutorial": "You can swipe the chart to view more dates."
|
||||
},
|
||||
"cycleDay": {
|
||||
"symptomBox": {
|
||||
"bleeding": "Bleeding",
|
||||
"temperature": "Temperature",
|
||||
"mucus": "Cervical Mucus",
|
||||
"cervix": "Cervix",
|
||||
"note": "Note",
|
||||
"desire": "Desire",
|
||||
"sex": "Sex",
|
||||
"pain": "Pain",
|
||||
"mood": "Mood"
|
||||
}
|
||||
"symptoms": {
|
||||
"bleeding": "bleeding",
|
||||
"temperature": "temperature",
|
||||
"mucus": "cervical mucus",
|
||||
"cervix": "cervix",
|
||||
"note": "note",
|
||||
"desire": "desire",
|
||||
"sex": "sex",
|
||||
"pain": "pain",
|
||||
"mood": "mood"
|
||||
},
|
||||
"labels": {
|
||||
"bleedingPrediction": {
|
||||
@@ -51,7 +49,7 @@
|
||||
},
|
||||
"philosophy": {
|
||||
"title": "Remember to think for yourself",
|
||||
"text": "drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure."
|
||||
"text": "drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure."
|
||||
},
|
||||
"title": "About",
|
||||
"version": {
|
||||
@@ -114,22 +112,29 @@
|
||||
"menuItem": {
|
||||
"dataManagement": {
|
||||
"name": "Data",
|
||||
"text": "import, export or delete your data"
|
||||
"text": "Import, export or delete your data"
|
||||
},
|
||||
"nfpSettings": {
|
||||
"name": "NFP settings",
|
||||
"text": "define how you want to use NFP"
|
||||
"customization": {
|
||||
"name": "Customization",
|
||||
"text": "Define how you want to use drip"
|
||||
},
|
||||
"password": {
|
||||
"name": "Password",
|
||||
"text": ""
|
||||
"text": "Set, edit or delete your password"
|
||||
},
|
||||
"reminders": {
|
||||
"name": "Reminders",
|
||||
"text": "turn on/off reminders"
|
||||
"text": "Turn on/off reminders"
|
||||
},
|
||||
"info": {
|
||||
"name": "Info",
|
||||
"text": "Learn more about how drip works"
|
||||
}
|
||||
},
|
||||
"title": "Settings"
|
||||
},
|
||||
"info": {
|
||||
"title": "info"
|
||||
}
|
||||
},
|
||||
"stats": {
|
||||
|
||||
@@ -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:
|
||||
|
||||
+3
-3
@@ -70,14 +70,14 @@ export const fertilityStatus = {
|
||||
unknown:
|
||||
'We cannot show any cycle information because no period data has been added.',
|
||||
preOvuText:
|
||||
"With NFP rules, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.",
|
||||
"According to the sympto-thermal method, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.",
|
||||
periOvuText:
|
||||
'We were not able to detect both a temperature shift and cervical mucus or cervix shift.',
|
||||
periOvuUntilEveningText: (tempRule) => {
|
||||
return (
|
||||
'We detected a temperature shift (' +
|
||||
['regular', '1st exception', '2nd exception'][tempRule] +
|
||||
' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. In the evening today you may assume infertility, but ' +
|
||||
' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. In the evening today you may assume infertility, but ' +
|
||||
'always remember to double-check for yourself. Make sure the data makes sense to you.'
|
||||
)
|
||||
},
|
||||
@@ -85,7 +85,7 @@ export const fertilityStatus = {
|
||||
return (
|
||||
'We detected a temperature shift (' +
|
||||
['regular', '1st exception', '2nd exception'][tempRule] +
|
||||
' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. You may assume infertility, but always remember to ' +
|
||||
' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. You may assume infertility, but always remember to ' +
|
||||
'double-check for yourself. Make sure the data makes sense to you.'
|
||||
)
|
||||
},
|
||||
|
||||
+48
-5
@@ -1,6 +1,11 @@
|
||||
import links from './links'
|
||||
|
||||
export default {
|
||||
customization: {
|
||||
title: 'Customization',
|
||||
trackingCategories: 'Tracking categories',
|
||||
subheaderSymptoThermalMethod: 'Sympto-thermal method settings',
|
||||
},
|
||||
export: {
|
||||
errors: {
|
||||
noData: 'There is no data to export',
|
||||
@@ -32,17 +37,26 @@ export default {
|
||||
tempScale: {
|
||||
segmentTitle: 'Temperature scale',
|
||||
segmentExplainer:
|
||||
'Change the minimum and maximum value for the temperature chart',
|
||||
'Change the minimum and maximum value for the temperature chart.',
|
||||
min: 'Min',
|
||||
max: 'Max',
|
||||
loadError: 'Could not load saved temperature scale settings',
|
||||
saveError: 'Could not save temperature scale settings',
|
||||
disabled: 'Disabled',
|
||||
disabledMessage:
|
||||
'To use the temperature scale please first enable temperature tracking above.',
|
||||
},
|
||||
|
||||
tempReminder: {
|
||||
title: 'Temperature reminder',
|
||||
noTimeSet: 'Set a time for a daily reminder to take your temperature',
|
||||
timeSet: (time) => `Daily reminder set for ${time}`,
|
||||
notification: 'Record your morning temperature',
|
||||
alertNoTempReminder: {
|
||||
title: 'Temperature turned off',
|
||||
message:
|
||||
'To use the temperature reminder please first enable the temperature tracking category in the customization settings.',
|
||||
},
|
||||
},
|
||||
periodReminder: {
|
||||
title: 'Next period reminder',
|
||||
@@ -50,13 +64,42 @@ export default {
|
||||
'Get a notification 3 days before your next period is likely to start.',
|
||||
notification: (daysToEndOfPrediction) =>
|
||||
`Your next period is likely to start in 3 to ${daysToEndOfPrediction} days.`,
|
||||
alertNoPeriodReminder: {
|
||||
title: 'Period predictions turned off',
|
||||
message:
|
||||
'To use the period reminder please first enable period predictions in the customization settings.',
|
||||
},
|
||||
},
|
||||
useCervix: {
|
||||
fertilityTracking: {
|
||||
title: 'Fertility phases calculation',
|
||||
disabledTitle: 'Disabled',
|
||||
disabled:
|
||||
'To use fertility phases calculation please enable both temperature tracking and either cervical mucus or cervix tracking above.',
|
||||
message:
|
||||
'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal method, drip will calculate cycle phases with the provided data.',
|
||||
on: 'If you switch this off, drip will not show fertility related information.',
|
||||
off: 'If you switch this on, drip will show fertility related information.',
|
||||
},
|
||||
secondarySymptom: {
|
||||
title: 'Secondary symptom',
|
||||
cervixModeOn:
|
||||
'Cervix values are being used for symptothermal fertility detection. You can switch here to use cervical mucus values for symptothermal fertility detection',
|
||||
'Cervix values are being used for fertility detection according to the sympto-thermal method.',
|
||||
cervixModeOff:
|
||||
'By default, cervical mucus values are being used for symptothermal fertility detection. You can switch here to use cervix values for symptothermal fertility detection',
|
||||
'Cervical mucus values are being used for fertility detection according to the sympto-thermal method.',
|
||||
disabled: {
|
||||
title: 'Disabled',
|
||||
message:
|
||||
'To set a secondary symptom please first enable the cervical mucus or cervix tracking category as well as temperature and fertility phases calculation above.',
|
||||
noSecondaryEnabled:
|
||||
'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.',
|
||||
},
|
||||
mucus: 'cervical mucus',
|
||||
cervix: 'cervix',
|
||||
},
|
||||
periodPrediction: {
|
||||
title: 'Period predictions',
|
||||
on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.',
|
||||
off: 'There are no predictions for menstrual cycles displayed. If turned on, the calendar and the home screen will display period predictions.',
|
||||
},
|
||||
passwordSettings: {
|
||||
title: 'App password',
|
||||
@@ -99,6 +142,6 @@ Making any changes to your password setting will keep your data as it was before
|
||||
},
|
||||
preOvu: {
|
||||
title: 'Infertile days at cycle start',
|
||||
note: `drip. applies NFP's rules for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past symptothermal info is available.`,
|
||||
note: `drip. applies the sympto-thermal method for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past sympto-thermal info is available.`,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ export const generalInfo = {
|
||||
3. and menstrual bleeding
|
||||
the app helps you identify in which phase of the menstrual cycle you are.
|
||||
|
||||
drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure.
|
||||
drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure.
|
||||
|
||||
Please find more info on the sympto-thermal method in ${links.wiki.url}.`,
|
||||
noNfpSymptom: `The app allows you to track this symptom for your information, it is not taken into account for any calculation. On the chart you can check how often you track this symptom.`,
|
||||
@@ -25,9 +25,9 @@ export default {
|
||||
After tracking at least 3 menstrual cycles, drip. will give you an overview of
|
||||
· how long your cycles last on average (in "stats"),
|
||||
· whether the length of your cycles varied significantly (in "stats" and in bleeding predictions)
|
||||
· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar").
|
||||
· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar") if this functionality is enabled in the customization settings.
|
||||
|
||||
The app allows you to track different intensities of bleeding. On the chart and on the calendar, bleeding values are colored in different shades of red. The darker, the more intense your bleeding. Every bleeding value that is not excluded is taken into account for fertility calculation and prediction for the start of next cycles.
|
||||
The app allows you to track different intensities of bleeding. On the chart and on the calendar, bleeding values are colored in different shades of red. The darker, the more intense your bleeding. Every bleeding value that is not excluded is taken into account for fertility calculation and period predictions.
|
||||
|
||||
Excluding bleeding values is for tracking bleeding when it's not marking the start of a new cycle or the continuation of menstrual bleeding the day(s) before, e.g. bleeding caused by ovulation or a miscarriage.
|
||||
|
||||
@@ -39,7 +39,7 @@ ${generalInfo.nfpTfyReminder}`,
|
||||
|
||||
Tracking how open or closed and how firm or soft the cervix feels can help determine in which phase of the menstrual cycle you are.
|
||||
|
||||
By default, the secondary symptom the app uses for NFP evaluation is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings".
|
||||
By default, the secondary symptom the app uses for the sympto-thermal method is cervical mucus, but you can change it to cervix in "Settings" -> "Customization".
|
||||
|
||||
· How to identify a fertile cervix?
|
||||
A fertile cervix is open and feels soft like your earlobes. In contrast, an infertile cervix feels closed and hard, like the tip of your nose. If the cervix feels anything other than closed and hard, drip. takes it as a sign of fertility. On the chart, a fertile cervix is colored in dark yellow, and infertile cervix is colored in light yellow.
|
||||
@@ -74,10 +74,10 @@ ${generalInfo.curiousNfp}`,
|
||||
title: 'Tracking cervical mucus',
|
||||
text: `Cervical mucus can help determine in which phase of the menstrual cycle you are.
|
||||
|
||||
By default the secondary symptom the app uses for NFP evaluation is cervical mucus.
|
||||
By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. You can change this in the customization settings.
|
||||
|
||||
· How to identify fertile cervical mucus?
|
||||
Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five NFP-conforming values.
|
||||
Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five values following the sympto-thermal method.
|
||||
From lowest to best quality:
|
||||
· t = (dry feeling + no texture),
|
||||
· ∅ = (no feeling + no texture),
|
||||
@@ -87,7 +87,7 @@ From lowest to best quality:
|
||||
|
||||
On the chart, cervical mucus is colored in blue: the darker the shade of blue the better the quality of your cervical mucus.
|
||||
|
||||
Please note that drip. does not yet support "parenthesis values": According to NFP rules, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future.
|
||||
Please note that drip. does not yet support "parenthesis values": According to the sympto-thermal method, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future.
|
||||
|
||||
${generalInfo.chartNfp}
|
||||
|
||||
@@ -125,7 +125,7 @@ ${generalInfo.curiousNfp}`,
|
||||
title: 'Tracking body basal temperature',
|
||||
text: `One of the body signs you need to track for knowing your fertility status is your body basal temperature. The body temperature changes over the course of a menstrual cycle, it rises after ovulation.
|
||||
|
||||
By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings".
|
||||
By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "Customization".
|
||||
|
||||
· What is body basal temperature?
|
||||
It's your temperature after lying still for at least 6 hours. For many, this is when they are waking up in the morning after sleeping at least 6 hours and before getting up.
|
||||
|
||||
Reference in New Issue
Block a user