close
The Wayback Machine - https://web.archive.org/web/20201224035616/https://github.com/javascript-tutorial/es.javascript.info/pull/312
Skip to content

/ es.javascript.info

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

Jump to bottom

The old "var" #312

Merged
merged 29 commits into from Jul 25, 2020
Merged

The old "var" #312

merged 29 commits into from Jul 25, 2020

Conversation

@joaquinelio
Copy link
Contributor

@joaquinelio joaquinelio commented Jul 22, 2020

Basado en el repo EN,
varios cambios respecto al nuestro.
@joaquinelio
The old "var"
Loading status checks…
0e5b7e4
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-es Jul 22, 2020
@iliakan iliakan mentioned this pull request Jul 22, 2020
Open
159 of 174 tasks complete
joaquinelio added 4 commits Jul 22, 2020
@joaquinelio
esencia ortograf
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c5533f6
@joaquinelio
sep palabras
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c346db9
@joaquinelio
ortogr 3
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
5419f98
@joaquinelio
ortogr 4
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
91a7304
@vplentinax
vplentinax requested changes Jul 25, 2020
View changes
Copy link
Contributor

@vplentinax vplentinax left a comment

Lo encontre algo confuso. También hay líneas que no coinciden. Me gustaria que arreglaras eso y así volver a revisarlo. También agregué algunas sugerencias de cambios que ví por encima.
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jul 25, 2020

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻
@vplentinax
Copy link
Contributor

@vplentinax vplentinax commented Jul 25, 2020 •
edited

Basado en el repo EN,
varios cambios respecto al nuestro.

No había visto los cambios, tenía previsto hacer la revisión de sincronización el domingo, pero ya añadí lo nuevo ahora confiando que se arreglarían los problemas de las líneas que no coincidían, pero veo que no sucedió, se creó un pequeño conflicto.

Editado:
veo mejor que cierres y vuelvas a abrir el PR a ver si coincide con los nuevos cambios y se hace más fácil la revisión.
¿Tú que dices?
joaquinelio and others added 13 commits Jul 25, 2020
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b7ad468 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d87f753 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ef691eb 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
924e9cb 
Tuve que penarlo un poco...
No está nada mal "alcance"

Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
dee39a7 
De acuerdo, no me gusto cdo lo escribi.  No es lo que dice el original sino mejor.
Tamb voy a cambiar "mayoria" suena ffeo

Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d758e11 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3a9f23b 
mas animal que bestia, "soy animal de ciudad"..
me da igual, hecho.

Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
e02c4f6 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
46bd6d0 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a29e338 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio
article mejorado
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
84cbbe2
@joaquinelio
Merge branch 'master' into oldvar
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b0fa6c0
@joaquinelio @vplentinax
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f1ec4e8 
Co-authored-by: Valentina VP <34555644+vplentinax@users.noreply.github.com>
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Jul 25, 2020 •
edited

@vplentinax
ah, primero hice loas sug
desp resolve
desp resolvi confl y quedo... no se, una vez q se mete el P..O >>>===<<< es imposible confiar en las lineas
desp vi tu ssug de cerrarlo.. no need, conflicto siimple
EDIT:
Al resolver conflicto, el diff se actualizó solo, asi que la revision sera la correcta.
Algunos sug aplicados, otros loss reescribí
*me suena comodo viejo nuevo
apliqué sug porque supongo que muchos le da igual
y algunos como vos les choque, so, mejor.
*Otros hacen a la fluidez de lectura, muy buenas sugerencias ok
*reformulé lin 31, me aparté del literal espero sea más claro...
*ah, acá usamos saltear (8)... JA JA!! RAE saltear (me gusta 2)
1.Sofreír
2.Salir a los caminos y robar a los pasajeros.
...
8 .Omitir ¿8? ¡BBBUUUUU! (¿puedo mandar pr a la rae? Ilya rechazo dos mios asi q baja autoestima)
Pero tambien entendemos saltar, asi que ok.
joaquinelio added 2 commits Jul 25, 2020
@joaquinelio
update line108- better I hope
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
051f388
@joaquinelio
108 v3
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a87a5dd
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Jul 25, 2020

/done
@maksumi
Copy link
Collaborator

@maksumi maksumi commented Jul 25, 2020

Aguanten, ya va mi review
@vplentinax
vplentinax approved these changes Jul 25, 2020
View changes
Copy link
Contributor

@vplentinax vplentinax left a comment

OK, se solucionó el problema de líneas. Se lee más fluido. Correcto!
@maksumi
maksumi approved these changes Jul 25, 2020
View changes
Copy link
Collaborator

@maksumi maksumi left a comment •
edited

Muy buena traducción, algunos typos aún y esos mosquitos "el" en la línea 4 y 5 donde viviriamos más tranquilos si no estuvieran sin importar si fuera "código viejo" ó "'' antiguo"...
Arregla eso y te doy 5 estrellas....
Perdón, perdón. Solo esos detalles y... ¡Ya todo chido pa'l merge!
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
1-js/06-advanced-functions/04-var/article.md Outdated Show resolved Hide resolved
joaquinelio and others added 9 commits Jul 25, 2020
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
169cc2b 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4490827 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a32ebdd 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
aa2bd34 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ce56e75 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4afadec 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
a55388e 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b4d86cc 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio @maksumi
Update 1-js/06-advanced-functions/04-var/article.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0645882 
Co-authored-by: Maksumi Murakami <maksumimurakami@gmail.com>
@joaquinelio
Copy link
Contributor Author

@joaquinelio joaquinelio commented Jul 25, 2020 •
edited

@maksumi
FAAAA.., que buena vista, acepte todas lass ssugg

pero
"mosquitos" creo que es mejor "el codigo", pero las acepte porque queria las 5 estrellas
jejej

enteder el codigo
entender codigo
entiendo que te parecio incomodo, depende de cuan especifico sea

"entender sánscrito"
"entender el código que hice ayer"
nuestro caso es bien ambiguo asi que creo qye van las dos formas ok

ah, preaceptado? merde!!! digo MERGE!!!!!
@joaquinelio joaquinelio merged commit d7bc432 into javascript-tutorial:master Jul 25, 2020
1 check passed
1 check passed
license/cla Contributor License Agreement is signed.
Details
@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jul 25, 2020

Thank you 💖 I updated the Progress Issue #17 🎉 🎉 🎉
@joaquinelio joaquinelio deleted the joaquinelio:oldvar branch Jul 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maksumi maksumi

@vplentinax vplentinax

Assignees
No one assigned
Labels
needs +1
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@joaquinelio @javascript-translate-bot @vplentinax @maksumi
You can’t perform that action at this time.