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

Improve es-ES translation #1836

Merged
merged 12 commits into from
Mar 28, 2020
Merged

Improve es-ES translation #1836

merged 12 commits into from
Mar 28, 2020

Conversation

tupaschoal
Copy link
Member

tupaschoal and others added 12 commits March 27, 2020 22:50
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
Co-Authored-By: frenchiveruti <frenchiveruti@users.noreply.github.com>
@Gymnasiast Gymnasiast merged commit feabfcb into OpenRCT2:master Mar 28, 2020
@tupaschoal tupaschoal deleted the pr-es branch March 28, 2020 09:59
@frenchiveruti
Copy link
Contributor

Thank you for your time, in the future if I do a translation of the files I'll just tag you and send you the file. I have zero idea on how to make git work.

@tupaschoal
Copy link
Member Author

If you don't want to play around with git, the best way is to fork, do the changes in a small time window, submit the PR and then delete the fork once it is merged. That way you don't have to worry about rebasing or using the command line interface.

@frenchiveruti
Copy link
Contributor

Yeah but doing that over and over gets really tiresome to be honest.
I did that in the beginning but it got old so quickly...

@frenchiveruti
Copy link
Contributor

It's just because I can't really sync the upstream git of OpenRCT2/Localisation with my fork, if I had some script to do it automatically every time I am about to translate, there would be no conflicts really.
But I have 0 idea on how that's done.

@tupaschoal
Copy link
Member Author

If you have git on the command line all you need to do is git fetch upstream then git rebase upstream/master.

Make sure you always submit a PR from a branch, and this is probably all the commands you'll need to use.

@Gymnasiast
Copy link
Member

You can also just go here: https://github.com/OpenRCT2/Localisation/blob/master/data/language/es-ES.txt and click edit. No need to do difficult things with rebasing or anything.

@frenchiveruti
Copy link
Contributor

Alright.
By the way the name of the PR should have es-ES at the beginning, right?
So the issues get the checkmarks on the es-ES checkbox.

@Gymnasiast
Copy link
Member

The commits should have the form es-ES: Apply #1234 (or es-ES: Apply #1234, #1235 if it addresses multiple issues). For the PR, it doesn't matter too much. But it's probably easiest to use that form for both anyway.

I always have to manually check the checkboxes. But using the above form means that a reference gets posted on the issue, which makes it easier to keep track of.

@frenchiveruti
Copy link
Contributor

Ah okay, I thought it was automagic

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.

3 participants