Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update translations from transifex #154

Merged
merged 5 commits into from
Sep 14, 2017
Merged

update translations from transifex #154

merged 5 commits into from
Sep 14, 2017

Conversation

mcwhittemore
Copy link
Contributor

This is my first translation update. I think I did this right, but some 👀 would be nice.

@mcwhittemore mcwhittemore requested a review from 1ec5 September 13, 2017 21:23
"destination": "{modifier} weiterfahren Richtung {destination}"
"default": "Turn {modifier}",
"name": "Turn {modifier} to stay on {way_name}",
"destination": "Turn {modifier} towards {destination}",
Copy link
Member

Choose a reason for hiding this comment

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

Before we merge this, let’s go into Transifex and accept any 100% match suggestions so that perfectly acceptable translations don’t get overridden by the original English versions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@1ec5 - I'm not sure how to do that

Copy link
Member

@daniel-j-h daniel-j-h left a comment

Choose a reason for hiding this comment

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

It looks like some German translation was ripped out for its English counterpart? Care to elaborate what's going on here?

"default": "{modifier} weiterfahren",
"name": "{modifier} weiterfahren auf {way_name}",
"destination": "{modifier} weiterfahren Richtung {destination}"
"default": "{modifier} abbiegen",
Copy link
Member

Choose a reason for hiding this comment

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

Does "abbiegen" make sense here? It basically means "to turn", but you can get a continue straight which we would then translate into "Geradeaus abbiegen" -> "turn straight" (?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds like we need a continue straight override like we've done here: https://github.com/Project-OSRM/osrm-text-instructions/blob/master/languages/translations/en.json#L93

"name": "{modifier} weiterfahren auf {way_name}",
"destination": "{modifier} weiterfahren Richtung {destination}"
"default": "{modifier} abbiegen",
"name": "Turn {modifier} to stay on {way_name}",
Copy link
Member

Choose a reason for hiding this comment

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

This is English still

},
"sharp left": {
"default": "Scharf links",
"name": "Make a sharp left to stay on {way_name}",
Copy link
Member

Choose a reason for hiding this comment

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

Still English

"sharp left": {
"default": "Scharf links",
"name": "Make a sharp left to stay on {way_name}",
"destination": "Scharf links Richtung {destination}"
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: this feels a bit too short, it's basically

"Sharp right towards"

"default": "{modifier} weiterfahren",
"name": "{modifier} weiterfahren auf {way_name}",
"destination": "{modifier} weiterfahren Richtung {destination}"
"default": "{modifier} abbiegen",
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: for all the continue maneuvers I think we should highlight that the road actually continues.

"name": "Leicht links weiter auf {way_name}",
"destination": "Leicht links weiter Richtung {destination}"
"default": "Scharf links",
"name": "Make a slight left to stay on {way_name}",
Copy link
Member

Choose a reason for hiding this comment

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

Here and below: English still in here

"default": "Fortsätt åt vänster",
"name": "Fortsätt åt vänster in på {way_name}",
"destination": "Fortsätt åt vänster mot {destination}"
"default": "Make a slight left",
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here, english. several of the continue has a history of having a translation previously. But now they are empty and untranslated.

@davols
Copy link
Contributor

davols commented Sep 14, 2017

Swedish has been updated. Both the new not previously used strings are translated and also the ones that disappeared for some reason in Transifex.

Would assume that fixes the comment I made.
Latest commit was as of this writing 7min ago - And I just finished fixing the last Swedish bits.

Please check if there are any changes to have Swedish in this PR, or I could make my own PR for Swedish specifically.

ping @frederoni for some extra eyes

@mcwhittemore mcwhittemore force-pushed the translate branch 2 times, most recently from 258dc07 to 239cecb Compare September 14, 2017 14:11
@mcwhittemore
Copy link
Contributor Author

@davols - Thanks for the heads up.

I've pulled from Transifex again and then ran a script to compare the post Transifex version of the translations with the English translation. Where the non-english and english matched up, I reset the value to what is currently in master. I think this should mean that the leaking of English has been fixed up. I'm scrolling through the changes now to confirm.

  revert to old values where new values match english
@mcwhittemore
Copy link
Contributor Author

It looks like some German translation was ripped out for its English counterpart? Care to elaborate what's going on here?

I'm not 100% sure why this has happened. @1ec5 mentioned that this is partial because we blindly pull files down from Transifex and that if we used the tx cli tool this would be less likely to happen.

Thanks for your eyes @davols and @daniel-j-h. If I can get one last review, I think we can merge this.

"name": "{modifier} weiterfahren auf {way_name}",
"destination": "{modifier} weiterfahren Richtung {destination}"
"destination": "{modifier} abbiegen Richtung {destination}"
Copy link
Member

Choose a reason for hiding this comment

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

Why did we change from "weiterfahren" (continue) here to "abbiegen" (turn) for the continue instruction?

Copy link
Contributor Author

@mcwhittemore mcwhittemore Sep 14, 2017

Choose a reason for hiding this comment

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

So, most of the continue maneuvers require you to make a turn so we changed the default to use turn and then created an override for straight to say continue. I'm guess that the translator saw this change in english and made it here, but didn't provide straight override.

},
"slight left": {
"default": "Leicht links weiter",
"default": "Scharf links",
Copy link
Member

Choose a reason for hiding this comment

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

slight left should be "Leicht links" - Scharf means sharp, maybe a mixup in the translations

"nl": "Ga links naar Way Name",
"pl": "Kontynuuj lewo na Way Name",
"pt-BR": "Continue à esquerda em Way Name",
"ru": "Двигайтесь налево по Way Name",
"sv": "Fortsätt vänster in på Way Name",
"sv": "Sväng vänsteroch fortsätt på Way Name",
Copy link
Contributor

@frederoni frederoni Sep 14, 2017

Choose a reason for hiding this comment

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

missing whitespace (fixed in Transifex) /cc @davols

@1ec5
Copy link
Member

1ec5 commented Sep 14, 2017

Regarding the English strings creeping in, this is unfortunately quite normal for translation systems. Whenever a base string (in English for this project) changes, all the translations of that string are “dirtied” in Transifex, so translators need to go in and update the translations. For minor changes like “Take a sharp left” → “Make a sharp left”, this should just be a matter of accepting the closest-matching suggestion. Meanwhile, any updates to this project will cause an English string to be substituted for the dirtied string, because outdated strings can be problematic (consider a change that adds or removes a placeholder token).

Replacing our ad-hoc tool with tx (#94) will help somewhat, as it would give us options for skipping a resource that’s inadequately translated according to Transifex. Choosing a different message format (#19) would help by giving us the ability to break up en.json into multiple resources, minimizing the disruption caused by changes to one resource.

@mcwhittemore mcwhittemore merged commit e04dc23 into master Sep 14, 2017
@mcwhittemore mcwhittemore deleted the translate branch September 14, 2017 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants