Skip to content

Sync with upstream @ 28ed5a3f#45

Closed
javascript-translate-bot wants to merge 827 commits intomasterfrom
sync-28ed5a3f
Closed

Sync with upstream @ 28ed5a3f#45
javascript-translate-bot wants to merge 827 commits intomasterfrom
sync-28ed5a3f

Conversation

@javascript-translate-bot

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

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 187 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

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

iliakan and others added 30 commits October 29, 2019 23:43
Missed function expression semicolon
add parameter definition to arr.find()
Updated based on comments
Grammar suggestions
Grammar suggestions
example code involves arrow function, not just function
in clarification drawing(setinterval-interval.svg) func is calling with different argument values like func(1), func(2) ...
But we can't see why variable i changing. Maybe we need func(i++) to explain this situation.
same problem with merge request  #1554 which I have sent freshly.
Grammar suggestions, one rephrase
Grammar suggestions
Rephrase
fix mini typo
code non-compatible with clarification drawing
code non-compatible with clarification drawing
arrow function instead of function
"helper function" term reminds "utility libraries" but "wrapper" term refers "function decorators" and in this context wrapper can be more self-descriptive and meaningful.
iliakan and others added 26 commits December 26, 2019 15:32
Update 1-js/03-code-quality/05-testing-mocha/pow-2.view/test.js
Add "bigint" to primitive types
…onentsjs

Renew link for polyfill about webcomponentsjs
Make minor grammar corrections/updates to async/promise-error-handling
Make minor grammar corrections/updates to async/promise-api
Make minor grammar corrections/updates to async/promisify
@claassistantio
Copy link

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

✅ leviding
✅ iliakan
✅ KennethKinLum
❌ jchue
❌ siddtheone
❌ LaievskyiSasha
❌ paroche
❌ Aissaoui-Ahmed
❌ nylki
❌ sajadhsm
❌ lex111
❌ karniol
❌ ogaclejapan
❌ jianlin
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.