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

[julia/es] Fix typos in Spanish Julia #580

Merged
merged 3 commits into from
Apr 3, 2014

Conversation

ggarza
Copy link
Contributor

@ggarza ggarza commented Mar 21, 2014

I fixed some typos and changed the language in the Julia Spanish language version. I hope that somebody, who uses technical Spanish more than I do, takes a look at it.

Also, does the code that colors the source code understand julia by any chance? At present, the language is declared to be ruby.

@ggarza
Copy link
Contributor Author

ggarza commented Mar 21, 2014

Also, the title of the last commit is wrong. It's supposed to be "back to ruby from julia".

@levibostian
Copy link
Collaborator

First off, you can edit the message of your last commit made with command:

git commit --amend -m "New commit message"

But because you have already pushed the commit online, you would have to do a force push (-f flag) to reset the message on your repo (Be careful when using -f !! But because this is your repo, chances are others have not pulled your branch and made updates to it so you are safe to do it in this case):

git push -uf origin julia_spanish 

After that your changes on your repo will be updated here.

To answer your question about the file markdown being declared as Ruby, the list of supported languages for Github markdown does not list Julia so that must be the reason that Ruby is used.

@ggarza
Copy link
Contributor Author

ggarza commented Mar 25, 2014

@levibostian Thanks. Should I also rebase on top of origin/master?

@ggarza
Copy link
Contributor Author

ggarza commented Mar 25, 2014

It looks like https://github.com/adambard/learnxinyminutes-site is using https://github.com/jayferd/rouge for syntax coloring. It appears that rouge doesn't have a lexer for julia yet.

@levibostian
Copy link
Collaborator

@ggarza Nice research. It looks like Ruby is the best we are going to do at the moment.

Yes, doing a rebase is always a good idea. Do this before you make pull requests to this project for sure.

@@ -159,7 +158,7 @@ b[end] # => 6
# separados por punto y coma.
matrix = [1 2; 3 4] # => 2x2 Int64 Array: [1 2; 3 4]

# Añadir cosas a la final de una lista con push! y append!
# Añadir cosas al final de una lista con push! y append!
Copy link
Collaborator

Choose a reason for hiding this comment

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

Reading this change in English (Google translated) you changed "the" to "1". Translation might be off, but it sounds like it was not supposed to be changed.

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 think the translation is off.

To my ear, "al final" sounded better than "a la final." They're equivalent to "at the end" and "to the end."

I think I've changed my mind, though. "A la final," which is equivalent to "to the end" sounds better after thinking about the English translation.

@ggarza
Copy link
Contributor Author

ggarza commented Mar 27, 2014

@levibostian Thanks for looking this over!

@levibostian
Copy link
Collaborator

@ggarza I will look over the rest soon and make comments. Thank you for the cooperation as I am reading over the code with a translator. Who knows how accurate the translations are, so thank you for answering my concerns and being patient with me.

Great work by the way making these fixes! You seem to know your Spanish.

@vendethiel
Copy link
Collaborator

@levibostian Doing a good job :).

@levibostian
Copy link
Collaborator

@ggarza I reviewed the rest of the changes. After some questions getting answered and potentially fixing some parts, it is all ready to go in!

I am excited about this merge, going to make it much better of a reference! So many great fixes here.

@adambard
Copy link
Owner

Quick correction: We use a rouge fork at https://github.com/adambard/rouge for syntax highlighting, so we can include a few extra lexers that are too half-assed for jayferd to merge into the main fork. Pull requests welcome!

@ggarza
Copy link
Contributor Author

ggarza commented Apr 3, 2014

@levibostian Tell me what you think and I'll push some changes and maybe do a rebase.

@ggarza
Copy link
Contributor Author

ggarza commented Apr 3, 2014

@Nami-Doc @levibostian Ok. I made the changes. Thanks for reviewing.

@levibostian
Copy link
Collaborator

@ggarza Thank you VERY much for all the work! Great fixes here!

levibostian added a commit that referenced this pull request Apr 3, 2014
[julia/es] Fix typos in Spanish Julia
@levibostian levibostian merged commit 6fcf30a into adambard:master Apr 3, 2014
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.

4 participants