Skip to content

Sync with upstream @ 99e59ba6 #43

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 57 commits into from
Closed

Conversation

javascript-translate-bot

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

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

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

Siteproxy
leviding and others added 30 commits October 15, 2020 13:16

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Commit 10d1b1f added a hint about which word would be found by
a certain regexp:

"A call to str.match(/\w+/) will find only the first word in the line
(var). That’s not it."

Unfortunately the result is incorrect: the regexp would find `let`, not
`var`.

Updating the hint should resolve any confusion. The example has been
tested in the console to ensure that the regexp does indeed return
`let`.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Strictly speaking, there is no error here,
as `typeof` does not produce errors with undefined variables.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Now this chapter is at the end of the general section.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: delete extra space

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix semicolons in 1.11.1 (Introduction: callbacks)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
promisiefy -> promisify

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix a typo in 1.11.3 (Promises chaining)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Revert "Fix a typo in 1.11.3 (Promises chaining)"
iliakan and others added 26 commits November 10, 2020 12:05

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix semicolons, remove old note in 1.11.8

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo in 1.11.6 (Promisification)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix Optional chaining doc

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo, add note in 1.12.2 (Async iteration)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
…section

Change `var` to `let` in 7.16 regexp-sticky

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Correct comment in 1.13.1

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typos in 'Proxy and Reflect'

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix outdated note in 1.99.04 (Reference Type)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Correct solution explanation in 1.99.04 (Reference Type)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix link in 2.1.5 (Node properties...)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
It can be more readable with same line of code. There was a lot of nested parenthesis.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix a typo in 1.11.3 (Promises chaining)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo in 2.1.6 (Attributes and properties)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
look like ninja code

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix typo in 06-promisify article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typos in 2.1.4 (Searching elements)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: delete extra space

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix a typo in 1.6.1 task solution

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix a possible typo in 1.6.1

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
OPT: change "false" to "falsy"

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
FIX: change ; to ,

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@CLAassistant
Copy link

CLAassistant commented Nov 16, 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 9 committers have signed the CLA.

✅ leviding
✅ odsantos
✅ vsemozhetbyt
✅ iliakan
❌ johnjacobkenny
❌ satyambnsal
❌ ZhaoMuwei
❌ lumosmind
❌ wam
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet