Merge branch '376-consider-rename-mucus-into-cervical-mucus' into 'master'

Specifying mucus as cervical mucus

Closes #376

See merge request bloodyhealth/drip!222

README.md

@@ -92,7 +92,7 @@ More information about how the app calculates fertility status and bleeding pred
 
 ## Adding a new tracking icon
 
-1.  We use [fontello](http://fontello.com/) to create icon fonts for us. You need to upload the complete set of tracking icons (bleeding, mucus, ...) including the new icon you wish to add, all in SVG.
+1.  We use [fontello](http://fontello.com/) to create icon fonts for us. You need to upload the complete set of tracking icons (bleeding, cervical mucus, ...) including the new icon you wish to add, all in SVG.
 2.  Download webfont from fontello
 3.  Copy both the content of `config.json` and `font.tff` into `assets/fonts`, replacing it with the current content of `config-drip-icon-font.json` and `drip-icon-font.tff`.
 4.  Now run the following command in your console:

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

@@ -11,6 +11,7 @@ import { getCycleDay } from '../../db'
 import cycleModule from '../../lib/cycle'
 import styles from '../../styles'
 import * as labels from '../../i18n/en/cycle-day'
+import { headerTitles as symptomTitles } from '../../i18n/en/labels'
 import AppText from '../app-text'
 import DripIcon from '../../assets/drip-icons'
 
@@ -180,7 +181,7 @@ export default class CycleDayOverView extends Component {
         <ScrollView>
           <View style={styles.symptomBoxesView}>
             <SymptomBox
-              title='Bleeding'
+              title={symptomTitles.bleeding}
               onPress={() => this.navigate('BleedingEditView')}
               data={this.getLabel('bleeding')}
               disabled={dateInFuture}
@@ -188,7 +189,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Temperature'
+              title={symptomTitles.temperature}
               onPress={() => this.navigate('TemperatureEditView')}
               data={this.getLabel('temperature')}
               disabled={dateInFuture}
@@ -196,7 +197,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Mucus'
+              title={symptomTitles.mucus}
               onPress={() => this.navigate('MucusEditView')}
               data={this.getLabel('mucus')}
               disabled={dateInFuture}
@@ -204,7 +205,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Cervix'
+              title={symptomTitles.cervix}
               onPress={() => this.navigate('CervixEditView')}
               data={this.getLabel('cervix')}
               disabled={dateInFuture}
@@ -212,7 +213,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Desire'
+              title={symptomTitles.desire}
               onPress={() => this.navigate('DesireEditView')}
               data={this.getLabel('desire')}
               disabled={dateInFuture}
@@ -220,7 +221,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Sex'
+              title={symptomTitles.sex}
               onPress={() => this.navigate('SexEditView')}
               data={this.getLabel('sex')}
               disabled={dateInFuture}
@@ -228,7 +229,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Pain'
+              title={symptomTitles.pain}
               onPress={() => this.navigate('PainEditView')}
               data={this.getLabel('pain')}
               disabled={dateInFuture}
@@ -236,7 +237,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Mood'
+              title={symptomTitles.mood}
               onPress={() => this.navigate('MoodEditView')}
               data={this.getLabel('mood')}
               disabled={dateInFuture}
@@ -244,7 +245,7 @@ export default class CycleDayOverView extends Component {
             >
             </SymptomBox>
             <SymptomBox
-              title='Note'
+              title={symptomTitles.note}
               onPress={() => this.navigate('NoteEditView')}
               data={this.getLabel('note')}
               iconName='drip-icon-note'

i18n/en/labels.js

@@ -32,7 +32,7 @@ export const headerTitles = {
   License: settingsTitles.license,
   bleeding: 'Bleeding',
   temperature: 'Temperature',
-  mucus: 'Mucus',
+  mucus: 'Cervical Mucus',
   cervix: 'Cervix',
   note: 'Note',
   desire: 'Desire',
@@ -109,12 +109,12 @@ export const fertilityStatus = {
   infertile: 'infertile',
   fertileUntilEvening: 'Fertile phase ends in the evening',
   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 mucus or cervix values.",
-  periOvuText: "We have not been able to detect both a temperature shift and mucus or cervix shift. Please find more information on NFP rules here:",
+  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.",
+  periOvuText: "We have not been able to detect both a temperature shift and cervical mucus or cervix shift. Please find more information on NFP rules here:",
   postOvuText: tempRule => {
     return (
       'We have detected a temperature shift (' + ['regular', '1st exception', '2nd exception'][tempRule] +
-      ' temperature rule), as well as a mucus shift according to NFP rules. You may assume infertility, but always remember to ' +
+      ' temperature rule), as well as a cervical mucus shift according to NFP rules. You may assume infertility, but always remember to ' +
       'double-check for yourself. Make sure the data makes sense to you.'
     )
   }

i18n/en/settings.js

@@ -74,8 +74,8 @@ export default {
   },
   useCervix: {
     title: 'Secondary symptom',
-    cervixModeOn: 'Cervix values are being used for symptothermal fertility detection. You can switch here to use mucus values for symptothermal fertility detection',
-    cervixModeOff: 'By default, mucus values are being used for symptothermal fertility detection. You can switch here to use cervix values for symptothermal fertility detection'
+    cervixModeOn: 'Cervix values are being used for symptothermal fertility detection. You can switch here to use cervical mucus values for symptothermal fertility detection',
+    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'
   },
   passwordSettings: {
     title: 'App password',

i18n/en/symptom-info.js

 import links from './links'
 
 export const generalInfo = {
-  chartNfp: `On the chart, you can track fertility signs. When both a valid temperature shift and a mucus or cervix shift have been detected, an orange line will be displayed on the chart. This indicates the end of the peri-ovulatory and the beginning of the post-ovulatory phase.`,
+  chartNfp: `On the chart, you can track fertility signs. When both a valid temperature shift and a cervical mucus or cervix shift have been detected, an orange line will be displayed on the chart. This indicates the end of the peri-ovulatory and the beginning of the post-ovulatory phase.`,
   curiousNfp: `If you are curious to learn more about the sympto-thermal method that is used for fertility tracking within the app, you can visit ${links.wiki.url}.`,
   cycleRelation: `It may be influenced by or have an impact on your menstrual cycles and its hormonal changes.`,
   excludeExplainer: `You can exclude these values, so they won't be taken into account for any fertility calculation.`,
@@ -85,9 +85,9 @@ From lowest to best quality:
 · S = (no OR wet feeling + creamy texture),
 · S+ = (any feeling + egg white texture) OR (slippery feeling + any texture).
 
-On the chart, mucus is colored in blue: the darker the shade of blue the better the quality of your mucus.
+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 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 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.
 
 ${generalInfo.chartNfp}