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.

Sign up for GitHub

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

Jump to bottom

Indenting and adding spanish translation of Object Oriented and Functional Programming. #4768

Merged
merged 1 commit into from
Dec 3, 2015
Merged

Indenting and adding spanish translation of Object Oriented and Functional Programming. #4768

merged 1 commit into from
Dec 3, 2015

Conversation

vtamara
Copy link
Member

@vtamara vtamara commented Nov 29, 2015

Closes #4543

justinian336
justinian336 reviewed Nov 29, 2015
View reviewed changes
seed/challenges/object-oriented-and-functional-programming.json
"nameEs": "Declarar objetos de JavaScript como variables",
"descriptionEs": [
"Antes de sumergirnos en Programación Orientada a Objetos, vamos a revisar los objetos de JavaScript.",
"Dale a tu objeto <code>motorBike</code> un atributo <code>wheels</code>, otro <code>motors</code> y otro <code>seats</code> y asignales números."

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@justinian336
Copy link
Contributor

Great translation! I just pointed out a few typos and minor terminology suggestions. This challenge's JSON didn't have the nameLanguage and descriptionLanguage properties as the others. It would be nice if you guys could add these properties in future new challenges, so translators don't have to deal with changing the structure of the JSON file beyond necessary (it's not difficult anyway, just saying). Maybe @vtamara can verify that everything's in order using the test instance he created?

@vtamara vtamara force-pushed the add/ES-translation-object-oriente-and-functional-programming branch from 4248c97 to 3a2b9ad Compare November 29, 2015 04:18
@vtamara vtamara changed the title Indentig and adding spanish translation. Indentig and adding spanish translation of Object Oriented and Functional Programming. Nov 29, 2015
@bugron
Copy link
Contributor

bugron commented Nov 29, 2015

@vtamara thanks for the PR. Please, squash your commits into one and fix a typo in the title: "Indentig" -> "Indenting", thanks.

@vtamara vtamara changed the title Indentig and adding spanish translation of Object Oriented and Functional Programming. Indenting and adding spanish translation of Object Oriented and Functional Programming. Nov 29, 2015
@vtamara vtamara force-pushed the add/ES-translation-object-oriente-and-functional-programming branch 2 times, most recently from 1f3f137 to a4a1816 Compare November 29, 2015 13:37
@bugron
Copy link
Contributor

bugron commented Dec 1, 2015

@vtamara, please, resolve merge conflicts.

@vtamara vtamara force-pushed the add/ES-translation-object-oriente-and-functional-programming branch from a4a1816 to d5180d3 Compare December 2, 2015 01:23
@vtamara
Copy link
Member Author

vtamara commented Dec 2, 2015

@bugron and @ltegman I already resolved merge conflicts in this PR. Could you please merge it? Thanks for your good work.

@bugron
Copy link
Contributor

bugron commented Dec 2, 2015

@vtamara I just saw you've resolved conflicts but right now they're back again.

@vtamara vtamara force-pushed the add/ES-translation-object-oriente-and-functional-programming branch from d5180d3 to ccdab5a Compare December 3, 2015 01:42
@vtamara
Copy link
Member Author

vtamara commented Dec 3, 2015

@bugron and @ltegman I resolved merge conflicts again in this PR. Could you please merge it?

@bugron
Copy link
Contributor

bugron commented Dec 3, 2015

Merged. Thanks all for your hard work on this translation.

bugron added a commit that referenced this pull request Dec 3, 2015
@bugron
Merge pull request #4768 from vtamara/add/ES-translation-object-orien…
0044d66 
…te-and-functional-programming

Indenting and adding spanish translation of Object Oriented and Functional Programming.
@bugron bugron merged commit 0044d66 into freeCodeCamp:staging Dec 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@vtamara @justinian336 @bugron