From 5fc2320afe0edfb349035135cc14b1216744eeb6 Mon Sep 17 00:00:00 2001 From: emelko Date: Fri, 8 Jan 2021 17:25:29 +0100 Subject: [PATCH 1/3] Adds updated text about credits. --- i18n/en/links.js | 22 +++++++++++++++++++++- i18n/en/settings.js | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/i18n/en/links.js b/i18n/en/links.js index c677b28..c738749 100644 --- a/i18n/en/links.js +++ b/i18n/en/links.js @@ -17,5 +17,25 @@ export default { donate: { url: 'https://ko-fi.com/dripapp', text: 'here' - } + }, + smashicons: { + url: 'https://smashicons.com/', + text: 'Smashicons', + }, + pause08: { + url: 'https://www.flaticon.com/authors/pause08', + text: 'Pause08', + }, + kazachek: { + url: 'https://www.flaticon.com/authors/kirill-kazachek', + text: 'Kirill Kazachek', + }, + freepik: { + url: 'https://www.flaticon.com/authors/freepik', + text: 'Freepik', + }, + flaticon: { + url: 'https://www.flaticon.com', + text: 'Flaticon', + }, } diff --git a/i18n/en/settings.js b/i18n/en/settings.js index ca83862..e104971 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -138,7 +138,7 @@ You can contact us by bloodyhealth@mailbox.org.` }, credits: { title: 'Credits', - note: 'Thanks and lots of <3 to all of our contributors as well as Susanne Umscheid for the wonderful design, and Paula Härtel for the symptom icons.' + note: `We love the drip team. Thanks and lots of <3 to all of our condributors. Thanks to Paula Härtel for the symptom tracking icons. All the other icons are made by ${links.smashicons.url}, ${links.pause08.url}, ${links.kazachek.url} & ${links.freepik.url} from ${links.flaticon.url}.` }, donate: { title: 'Buy us a coffee!', From e5d2a7e4cf77410b1e9c44171d2ea2747733ae9b Mon Sep 17 00:00:00 2001 From: emelko Date: Fri, 8 Jan 2021 17:39:14 +0100 Subject: [PATCH 2/3] Fix drip typo --- CONTRIBUTING.md | 10 +++++----- i18n/en/settings.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11be4df..2bbf312 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to drip aka CONDRIBUTING +# Contributing to drip aka CONDRIPUTING So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_tone4: :wave\_tone5: @@ -8,7 +8,7 @@ So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_ [What should I know before I get started?](#what-should-i-know-before-i-get-started) -[How can I condribute?](#how-can-i-condribute) +[How can I condripute?](#how-can-i-condripute) [Thank you](#thank-you) @@ -23,9 +23,9 @@ We have prepared something for **you**: check out our [README](https://gitlab.co Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request) -## How can I condribute? +## How can I condripute? -### Your First Code Condribution +### Your First Code Condripution We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie). If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`. @@ -54,5 +54,5 @@ To send us a new issue you can also use our [gitlab email](mailto:incoming+blood ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif) -Thank you for condributing to open source, thank you for condributing to drip! +Thank you for condriputing to open source, thank you for condriputing to drip! Much love from Bloody Health :heart\_exclamation: diff --git a/i18n/en/settings.js b/i18n/en/settings.js index e104971..cc63775 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -138,7 +138,7 @@ You can contact us by bloodyhealth@mailbox.org.` }, credits: { title: 'Credits', - note: `We love the drip team. Thanks and lots of <3 to all of our condributors. Thanks to Paula Härtel for the symptom tracking icons. All the other icons are made by ${links.smashicons.url}, ${links.pause08.url}, ${links.kazachek.url} & ${links.freepik.url} from ${links.flaticon.url}.` + note: `We love the drip team. Thanks and lots of <3 to all of our condriputors. Thanks to Paula Härtel for the symptom tracking icons. All the other icons are made by ${links.smashicons.url}, ${links.pause08.url}, ${links.kazachek.url} & ${links.freepik.url} from ${links.flaticon.url}.` }, donate: { title: 'Buy us a coffee!', From 9aba800119ced9df20e81d0e8c5097cf0304d727 Mon Sep 17 00:00:00 2001 From: emelko Date: Fri, 8 Jan 2021 17:45:28 +0100 Subject: [PATCH 3/3] Better wording for prediction text --- i18n/en/labels.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en/labels.js b/i18n/en/labels.js index 3fb046b..c454423 100644 --- a/i18n/en/labels.js +++ b/i18n/en/labels.js @@ -71,7 +71,7 @@ export const stats = { export const bleedingPrediction = { noPrediction: `As soon as you have tracked 3 menstrual cycles, drip will make predictions for the next ones.`, predictionInFuture: (startDays, endDays) => `Your next period is likely to start in ${startDays} to ${endDays} days.`, - predictionStartedXDaysLeft: (numberOfDays) => `Your period is likely to start today or during the next ${numberOfDays} days.`, + predictionStartedXDaysLeft: (numberOfDays) => `Your period is likely to start today or within the next ${numberOfDays} days.`, predictionStarted1DayLeft: 'Your period is likely to start today or tomorrow.', predictionStartedNoDaysLeft: 'Your period is likely to start today.', predictionInPast: (startDate, endDate) => `Based on your documented data, your period was likely to start between ${startDate} and ${endDate}.`