Skip to content

Sync with upstream @ fb4fc33a #51

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

Merged
merged 230 commits into from
Jun 15, 2021
Merged

Sync with upstream @ fb4fc33a #51

merged 230 commits into from
Jun 15, 2021

Conversation

javascript-translate-bot

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

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.

Zearin and others added 30 commits January 15, 2021 12:14
Minor edits for grammar, phrasing, and markup.
Edited according to feedback
Rewrote phrasing pointed out in feedback
To be coherent with the solution and the picture below.
fix word "when" to "than".
remove unnecessary 'in'
 - 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 Jun 15, 2021
@javascript-translate-bot javascript-translate-bot requested a review from a team June 15, 2021 06:52
@CLAassistant
Copy link

CLAassistant commented Jun 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.
4 out of 5 committers have signed the CLA.

✅ siddiqkaithodu
✅ joaquinelio
✅ leviding
✅ iliakan
❌ ZYinMD
You have signed the CLA already but the status is still pending? Let us recheck it.

@javascript-translate-bot javascript-translate-bot added needs +1 One more review needed and removed review needed Review needed, please approve or request changes labels Jun 15, 2021
@siddiqkaithodu siddiqkaithodu merged commit 0ab37d8 into master Jun 15, 2021
@siddiqkaithodu siddiqkaithodu deleted the sync-fb4fc33a branch June 15, 2021 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs +1 One more review needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.