Skip to content

Sync with upstream @ fc3f811c #82

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

Closed
wants to merge 700 commits into from
Closed

Conversation

javascript-translate-bot

This PR was automatically generated to merge changes from en.javascript.info at fc3f811

Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.

Alternatively, you can close this PR and merge conflicting changes manually.

The following files have conflicts and may need updates of the translations:

To merge changes manually (instead of merging this PR):

  1. Add remote upstream that links to the English version (only needs to be done once)
    • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
  2. Commit all current work locally and git checkout master
  3. Pull the recent changes from the English version:
    • git pull upstream master
  4. Deal with the conflicts. If a conflict touches a few lines, then just fix it. Otherwise, following commands can help:
    • Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
      • git checkout --ours <path>
    • See the diff, what changed in the upstream file since branches diverged:
      • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
    • Then you can examine the changes in upstream and add them manually
  5. When conflicts resolved, commit them and git push origin master

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

This PR will be closed and replaced with a new one in a few days.

vsemozhetbyt and others added 30 commits November 4, 2020 20:32
Now this chapter is at the end of the general section.
Fix semicolons in 1.11.1 (Introduction: callbacks)
promisiefy -> promisify
Fix a typo in 1.11.3 (Promises chaining)
Revert "Fix a typo in 1.11.3 (Promises chaining)"
Fix semicolons in 1.11.6  (Promisification)
Fix semicolons, remove old note in 1.11.8
Fix typo in 1.11.6 (Promisification)
Fix typo, add note in 1.12.2 (Async iteration)
…section

Change `var` to `let` in 7.16 regexp-sticky
Fix typos in 'Proxy and Reflect'
Fix outdated note in 1.99.04 (Reference Type)
Correct solution explanation in 1.99.04 (Reference Type)
Fix link in 2.1.5 (Node properties...)
It can be more readable with same line of code. There was a lot of nested parenthesis.
Fix a typo in 1.11.3 (Promises chaining)
iliakan and others added 26 commits December 13, 2020 20:08
Fix typo in 9.16 (Sticky flag "y"...)
Update support note in 9.15 (Catastrophic backtracking)
Fix typo, clarify wording in 9.15 (Catastrophic backtracking)
Fix typo in 1.99.1 (Proxy and Reflect)
Correct example in 9.14 (Lookahead and lookbehind)
Fix typos in 9.13 (Alternation (OR) |)
Fix typos in 9.11 (Capturing groups)
Fix typos in 9.10 (Greedy and lazy quantifiers)
Update support note in 9.8 (Sets and ranges [...])
Fix typo in 9.8 task solution (Sets and ranges [...])
Fix typo in 9.7 (Escaping, special characters)
Fix confusing wording in 9.6 (Word boundary: \b)
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Dec 21, 2020
@javascript-translate-bot javascript-translate-bot requested a review from a team December 21, 2020 05:01
@CLAassistant
Copy link

CLAassistant commented Dec 21, 2020

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 7 committers have signed the CLA.

✅ vsemozhetbyt
✅ odsantos
✅ iliakan
✅ joaquinelio
❌ jasonvitagendev
❌ RapTho
❌ heypano
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
review needed Review needed, please approve or request changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.