Skip to content

Comments

Sync with upstream @ f6ae0b5a#23

Closed
javascript-translate-bot wants to merge 345 commits intomasterfrom
sync-f6ae0b5a
Closed

Sync with upstream @ f6ae0b5a#23
javascript-translate-bot wants to merge 345 commits intomasterfrom
sync-f6ae0b5a

Conversation

@javascript-translate-bot

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

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.

vsemozhetbyt and others added 30 commits November 28, 2020 19:56
Co-authored-by: Muhammed Zakir <8190126+MuhammedZakir@users.noreply.github.com>
Replace deprecated property in 5.9 (Resumable file upload)
Expand a note in 5.8 (XMLHttpRequest)
Fix typos in 5.8 (XMLHttpRequest)
Add missing parenthesis in 5.6 (Fetch API)
In the section "String concatenation with binary +", the example of 2 + 2 + "1" was given, but there was no example for when the first operand is a string.
seamissu and others added 24 commits January 30, 2021 04:26
 - comments are in pairs. The first of the pair talks about what
   happened "caching" and the second pair talks about what was
   alerted "the same". This is confusing.
 - changed comment so both lines tell the reader what happened
   and what result was returned.
A minor addition. (...where such thing doesn't happen. --> where such a thing doesn't happen.)
I think argN represents count of arbitrary parameters. But this syntax looks like "rest syntax". It could be more understandable to change it like this.
…rer-comments

Clearer CachingDecorator comments
Add missing semicolon in Arrow Functions (1-6-12)
Improve modyfying document task one sentence grammar
there are four logical operators in JS
fix typo: missing semicolon after let ladder = { }
Fix typo in "liseners" on line 21
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Mar 1, 2021
@javascript-translate-bot javascript-translate-bot requested a review from a team March 1, 2021 05:01
@CLAassistant
Copy link

CLAassistant commented Mar 1, 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.
3 out of 19 committers have signed the CLA.

✅ msisaifu
✅ iliakan
✅ joaquinelio
❌ emek
❌ redrambles
❌ lijunkang12
❌ martynov-94
❌ aliaghdam
❌ AmosChenYQ
❌ bierlingm
❌ lumosmind
❌ seamissu
❌ fibretothepremises
❌ helloimjordan
❌ pawel-123
❌ asamant
❌ f6p
❌ notapatch
❌ MuhammedZakir
You have signed the CLA already but the status is still pending? Let us recheck it.

otmon76 added a commit that referenced this pull request Jul 25, 2022
Merge pull request #104 from otmon76/master
otmon76 added a commit that referenced this pull request Jul 25, 2022
Merge pull request #23 from javascript-tutorial/master
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.