Skip to content

Sync with upstream @ e01998ba#1040

Closed
javascript-translate-bot wants to merge 761 commits intomasterfrom
sync-e01998ba
Closed

Sync with upstream @ e01998ba#1040
javascript-translate-bot wants to merge 761 commits intomasterfrom
sync-e01998ba

Conversation

@javascript-translate-bot

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

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 122 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.

PGlivicky and others added 30 commits December 4, 2020 21:13
Fix bug in the 'colored clock with setInterval' task's solution
Fix typo in 1.99.1 (Proxy and Reflect)
Fix typo, add info in 1.11.5 (Promise API)
Fix typos in 7.3 (JavaScript animations)
Fix typos in 1.5.8 (WeakMap and WeakSet)
Fix typo and ambiguity in 5.12 (Server Sent Events)
Fix possible typos in 6.1 (Cookies, document.cookie)
Fix typo in 6.2 (LocalStorage, sessionStorage)
fix typo in 1.5 (08-weakmap-weakset)
Fix possible typos in 6.3 (IndexedDB)
knoxj1 and others added 25 commits February 4, 2021 18:24
I do not think it's likely but I do not want anyone to mistake those lines for legitimate JS expressions. I modified those two lines to match the format of pretty much every other comment in the article.
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Fix little formatting typo in 1.2.13 (loops)
spread operator vs spread syntax
Considering Promise.any there are 6 static methods
Unify content with cosmetic changes
@CLAassistant
Copy link

CLAassistant commented Mar 15, 2021

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 13 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
❌ notapatch
❌ lumosmind
❌ MuhammedZakir
❌ seamissu
❌ asamant
❌ mikitachyzhyk
❌ knoxj1
❌ Zearin
❌ f6p
❌ T1mL3arn
❌ eucalyptus-viminalis
You have signed the CLA already but the status is still pending? Let us recheck it.

@Violet-Bora-Lee Violet-Bora-Lee deleted the sync-e01998ba branch April 14, 2021 13:58
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.