Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

Implement translations in the views #205

Merged
merged 18 commits into from Mar 22, 2020
Merged

Implement translations in the views #205

merged 18 commits into from Mar 22, 2020

Conversation

Kilian
Copy link
Contributor

@Kilian Kilian commented Mar 22, 2020

This is a monster PR, sorry about that :) Should have all views translated and is rebased on latest master to should merge cleanly. Best to get that done asap to prevent conflicts with other work-in-progress!

@Kilian Kilian requested a review from fossecode March 22, 2020 13:11
@fossecode
Copy link
Member

Fantastic work! Will look through it now

app/locales/en.json Outdated Show resolved Hide resolved
app/locales/en.json Outdated Show resolved Hide resolved
app/locales/en.json Outdated Show resolved Hide resolved
"/healthcondition/": "/healthcondition/",
"Your age": "Your age",
"Choose your age": "Choose your age",
"Biological gender": "Biological gender/Sex",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably not use gender at all?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a strong opinion on this other than having "biological gender" there making it easier to understand "sex" in context.

"Statistics": "Statistics",
"Download the dataset as CSV": "Download the dataset as CSV",
"COVID-19 infected": "COVID-19 infected",
"In total <%= numberWithSpaces(totalInfectedPeopleWithSymptoms) %> people have reported that they have tested positive for COVID-19 and experience symptoms.": "In total <%= numberWithSpaces(totalInfectedPeopleWithSymptoms) %> people have reported that they have tested positive for COVID-19 and experience symptoms.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you check if using <%= numberWithSpaces(totalInfectedPeopleWithSymptoms) %>works? Should maybe rather be split up.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I overlooked this. It's fixed for one instance but I'll (or someone else) go over the others and fix them.

"Added to form": "Added to form",
"Headache": "Headache",
"Sore throat": "Sore throat",
"Loss of sense of taste": "Loss of sense of taste",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some dupes, don't know if that matters or not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what happens in merge-hell :( We can remove dupes

"Loss of sense of smell": "Loss of sense of smell",
"Mucus cough": "Mucus cough",
"Stuffy or runny nose": "Stuffy or runny nose",
"Statistics": "Statistieken",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 135-172 contains NL translations, should be removed

@Kilian
Copy link
Contributor Author

Kilian commented Mar 22, 2020

Not all translations made it into the dutch translation file, should be checked.

<h3 class="stat-heading">Nøkkeltall</h3>
<div>Av alle som har rapportert, har:</div>
<h3 class="stat-heading"><%= __('Key figures') %></h3>
<div><%= __('Everyone who has submitted a report, also has:') %></div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also have

@fossecode
Copy link
Member

👍 as you suggested, we should probably just merge this asap. Me and @michaelmcmillan can test the Norwegian version afterwords, and see if we find any errors.

@fossecode fossecode merged commit caf8b13 into master Mar 22, 2020
@fossecode fossecode deleted the translations branch March 24, 2020 17:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants