From 7864ebfc41337f14dc5dad3a07ad671215b70a92 Mon Sep 17 00:00:00 2001 From: emelko Date: Mon, 27 May 2019 22:39:14 +0200 Subject: [PATCH] Adds subcategories of cevix and mucus as labels --- components/cycle-day/cycle-day-overview.js | 4 ++-- i18n/en/cycle-day.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js index cb2b19c..557c4ed 100644 --- a/components/cycle-day/cycle-day-overview.js +++ b/components/cycle-day/cycle-day-overview.js @@ -70,7 +70,7 @@ export default class CycleDayOverView extends Component { mucus: mucus => { const filledCategories = ['feeling', 'texture'].filter(c => isNumber(mucus[c])) let label = filledCategories.map(category => { - return category + ': ' + labels.mucus[category].categories[mucus[category]] + return labels.mucus.subcategories[category] + ': ' + labels.mucus[category].categories[mucus[category]] }).join(', ') if (isNumber(mucus.value)) label += `\n => ${labels.mucusNFP[mucus.value]}` @@ -81,7 +81,7 @@ export default class CycleDayOverView extends Component { cervix: cervix => { const filledCategories = ['opening', 'firmness', 'position'].filter(c => isNumber(cervix[c])) let label = filledCategories.map(category => { - return category + ': ' + labels.cervix[category].categories[cervix[category]] + return labels.cervix.subcategories[category] + ': ' + labels.cervix[category].categories[cervix[category]] }).join(', ') if (cervix.exclude) label = `(${label})` diff --git a/i18n/en/cycle-day.js b/i18n/en/cycle-day.js index e5dc450..4399ca5 100644 --- a/i18n/en/cycle-day.js +++ b/i18n/en/cycle-day.js @@ -14,6 +14,11 @@ export const bleeding = { } export const cervix = { + subcategories: { + opening: 'opening', + firmness: 'firmness', + position: 'position' + }, opening: { categories: ['closed', 'medium', 'open'], explainer: 'Is your cervix open or closed?' @@ -30,6 +35,10 @@ export const cervix = { } export const mucus = { + subcategories: { + feeling: 'feeling', + texture: 'texture' + }, feeling: { categories: ['dry', 'nothing', 'wet', 'slippery'], explainer: 'What does your vaginal entrance feel like?'