Skip to content

Sync with upstream @ 468e3552#150

Closed
javascript-translate-bot wants to merge 2454 commits into
masterfrom
sync-468e3552
Closed

Sync with upstream @ 468e3552#150
javascript-translate-bot wants to merge 2454 commits into
masterfrom
sync-468e3552

Conversation

@javascript-translate-bot

Copy link
Copy Markdown

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

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:

Click to open a list of 360 files

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.

leviding and others added 30 commits November 15, 2020 22:12
I think Promise.any() must be in this article.
Fixed couple of grammar mistakes.
In the `accept` method, 
`fileServer.serve(req, res)` was called however, noticed that it has not been initialized hence the change
Co-authored-by: Vse Mozhe Buty <vsemozhetbyt@gmail.com>
Fis typo in 2.5.2 (Scripts: async, defer)
Various minor punctuation and phrasing changes.
RapTho and others added 26 commits January 2, 2021 18:54
Add information about virtual/mobile keyboards and an additional keyboard event inspection tool.
All operators should return a value because of the definition of the term 'operator'. 
I could not find an operator as an exception which doesn't return a value.
Do you?
In the section describing the usage of `"super"`, example output says `// White Rabbit stands still. White rabbit hides!`

The `name` member in this example is set to `White Rabbit`, so the second sentence above should say `White Rabbit hides!` (capital R)
One redundant 'here' here
I think this change will help us to dodge concatenating new arguments with lexical ones and make the currying function much simpler.
all operators must return a value
Update currying function to use bind instead of wrapper pass
We can declare local variables and give them initial values in parameter list of function definition. So we have another way to create local variables.
parameters are also local variables
@CLAassistant

CLAassistant commented Jan 11, 2021

Copy link
Copy Markdown

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.
2 out of 14 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
❌ tokou
❌ RapTho
❌ imaverage
❌ wolfter12
❌ lumosmind
❌ LLyaudet
❌ Georgy-Losenkov
❌ raycon
❌ TaylorClay
❌ Danziger
❌ lapstjup
❌ martynov-94
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.