Merge branch '375-change-description-of-mucus-and-cervix-on-cycle-day-overview' into 'master'

Adds more descriptive mucus and cervix labels for cycle day overview

Closes #375

See merge request bloodyhealth/drip!221

components/cycle-day/cycle-day-overview.js

@@ -70,10 +70,10 @@ export default class CycleDayOverView extends Component {
       mucus: mucus => {
         const filledCategories = ['feeling', 'texture'].filter(c => isNumber(mucus[c]))
         let label = filledCategories.map(category => {
-          return 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]}`
+        if (isNumber(mucus.value)) label += `\n => ${labels.mucusNFP[mucus.value]}`
         if (mucus.exclude) label = `(${label})`
 
         return label
@@ -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 labels.cervix[category].categories[cervix[category]]
+          return labels.cervix.subcategories[category] + ': ' + labels.cervix[category].categories[cervix[category]]
         }).join(', ')
 
         if (cervix.exclude) label = `(${label})`

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?'