The Wayback Machine - https://web.archive.org/web/20201224035345/https://github.com/javascript-tutorial/es.javascript.info/pull/293
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

Sincronización 5 Julio #293

Merged
merged 8 commits into from Jul 9, 2020
Merged

Sincronización 5 Julio #293

merged 8 commits into from Jul 9, 2020

Conversation

@vplentinax
Copy link
Contributor

@vplentinax vplentinax commented Jul 5, 2020

Repo actualizada. Añadidos cambios de la repo EN desde los últimos 25 días después de la última actualización. Si el ariculo estaba traducido, añadí el cambio traducido.
@vplentinax
syncJuly-5
Loading status checks…
861ef4a
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-es Jul 5, 2020
@vplentinax vplentinax changed the title Sincronización 5 July Sincronización 5 Julio Jul 6, 2020
@EzequielCaste
EzequielCaste requested changes Jul 6, 2020
View changes
Copy link
Contributor

@EzequielCaste EzequielCaste left a comment

Ok con algunos cambios
1-js/13-modules/01-modules-intro/article.md Outdated Show resolved Hide resolved
1-js/13-modules/01-modules-intro/article.md Outdated Show resolved Hide resolved
2-ui/1-document/01-browser-environment/article.md Outdated Show resolved Hide resolved
2-ui/1-document/01-browser-environment/article.md Outdated Show resolved Hide resolved
2-ui/1-document/01-browser-environment/article.md Outdated Show resolved Hide resolved
@javascript-translate-bot
Copy link

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

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻
vplentinax and others added 5 commits Jul 6, 2020
@vplentinax @EzequielCaste
Update 1-js/13-modules/01-modules-intro/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…
240f32f 
Co-authored-by: Ezequiel Castellanos <51804994+ezzep66@users.noreply.github.com>
@vplentinax @EzequielCaste
Update 1-js/13-modules/01-modules-intro/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…
abb90a9 
Co-authored-by: Ezequiel Castellanos <51804994+ezzep66@users.noreply.github.com>
@vplentinax @EzequielCaste
Update 2-ui/1-document/01-browser-environment/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…
f8ab700 
Co-authored-by: Ezequiel Castellanos <51804994+ezzep66@users.noreply.github.com>
@vplentinax @EzequielCaste
Update 2-ui/1-document/01-browser-environment/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…
ce707cc 
Co-authored-by: Ezequiel Castellanos <51804994+ezzep66@users.noreply.github.com>
@vplentinax @EzequielCaste
Update 2-ui/1-document/01-browser-environment/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…
1f7e30e 
Co-authored-by: Ezequiel Castellanos <51804994+ezzep66@users.noreply.github.com>
@vplentinax
Copy link
Contributor Author

@vplentinax vplentinax commented Jul 6, 2020

/done
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-es Jul 6, 2020
@joaquinelio
joaquinelio requested changes Jul 7, 2020
View changes
Copy link
Contributor

@joaquinelio joaquinelio left a comment

No problem. Un solo cambio, hagan commit de eso y consideren que lo aprobé.

Hay cambios en ingles que afectan PR en curso:
no importa, serán conflictos simples. Y no importa quien merge primero.

Hay cambios que afectan ya traducidos:

1- 6- 6 / 5 agregas algo al ejercicio, no probe como lo afecta, asumo que si hubiera que cambiarlo lo habrias visto.

Problema de ejercicios agregados: Cuando article ya está traducido.
Cuando hagas merge hay que destildarlo para traducir el ejercicio:
1-9-3-3
[X] Static properties and methods (@cortizg) #172
1-js/13-modules/01-modules-intro/article.md Outdated Show resolved Hide resolved
@javascript-translate-bot
Copy link

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

Please make the requested changes. After it, add a comment "/done".
Then I'll ask for a new review 👻
@vplentinax @joaquinelio
Update 1-js/13-modules/01-modules-intro/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…
1929ea3 
Co-authored-by: joaquinelio <joaquinelio@gmail.com>
@vplentinax
Copy link
Contributor Author

@vplentinax vplentinax commented Jul 7, 2020

/done
@javascript-translate-bot javascript-translate-bot requested a review from javascript-tutorial/translate-es Jul 7, 2020
@vplentinax
Merge branch 'master' into syncJuly-5
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…
0dd12c7
@vplentinax
Copy link
Contributor Author

@vplentinax vplentinax commented Jul 8, 2020

Confirmen... @joaquinelio @ezzep66
@joaquinelio
joaquinelio approved these changes Jul 9, 2020
View changes
Copy link
Contributor

@joaquinelio joaquinelio left a comment

@vplentinax , Ok.
cc @ezzep66
solo 12 PR, de los 80 al empezar y el repo abandonado,
y el más viejo de 2 semanas...
más: de los pocos y mal contabilizados traducidos estamos a menos de diez de la mitad del repo.
Comming soon:
Para el peor lenguaje al que estamos condenados: El MEJOR tutorial de la web.
🍺 🍰 y deberia estar c4 en la fiesta.

Bueno.
¿Será tiempo de estudiar los pr foráneos...? en lugar del artesanal.
Creo que no rompen nada.
Anduve perezoso, pero se puede probar con el pr sobre un branch local,
serán MUCHOS conflictos, pero no debieran ser más que los que estás haciendo manualmente. Si son más es porque los estamos perdiendo.
Lo único que desanima es el terrible sistema del git para resolverlos, agergando marcas y las dos versiones en el arch de trabajo. ¿Habrá otra forma?
Además es la manera correcta. Al sincronizar sin pull se pierde su registro de commits (y colaboradores de inglés), no me opuse porque esto no es código.
Veremos...
@EzequielCaste
EzequielCaste approved these changes Jul 9, 2020
View changes
@EzequielCaste EzequielCaste merged commit c2a0dc3 into javascript-tutorial:master Jul 9, 2020
1 check passed
1 check passed
license/cla Contributor License Agreement is signed.
Details
@iliakan iliakan mentioned this pull request Aug 11, 2020
Open
159 of 174 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joaquinelio joaquinelio

@EzequielCaste EzequielCaste

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
@vplentinax @javascript-translate-bot @joaquinelio @EzequielCaste
You can’t perform that action at this time.
HTTPS · web.archive.org
← Home