Skip to content

Sync with upstream @ 18b1314a #128

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 71 commits into from
Oct 4, 2022
Merged

Sync with upstream @ 18b1314a #128

merged 71 commits into from
Oct 4, 2022

Conversation

javascript-translate-bot

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

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.

nikandev and others added 30 commits August 28, 2022 12:52
Adds missing comma on line 24
Minor changes to grammar
Minor grammar changes, clarify that if using a class for `handleEvent` we still are actually using an object as we have to instantiate the class.
Replace the value in the middle by "Classics". changed to Replace the value in the middle with "Classics" as the word 'with' describes the situation better
Fix grammar issues for more clarity
Simplify wording
Update descriptions for Unicode escape sequences.
Add minor fixes for different string methods.
Clarify instructions of `read` method
👾 add mdn links to Map and Set methods
joaquinelio and others added 26 commits September 28, 2022 10:03
Remove description of inconsistency between Chrome and Firefox
Omitting parentheses after `new`
fix small typo in web-components slots chapter.
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Oct 3, 2022
@javascript-translate-bot javascript-translate-bot requested a review from a team October 3, 2022 05:01
@CLAassistant
Copy link

CLAassistant commented Oct 3, 2022

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

✅ iliakan
✅ joaquinelio
❌ 0xEddie
❌ nikandev
❌ davidshq
❌ KilianSorel
❌ gleachkr
❌ mukulkandhari
❌ chilipenko
❌ Rnbsov
❌ tianheg
❌ digital-bw
❌ wdscxsj
❌ romanstetsyk
❌ skromez
❌ MindLaborDev
❌ ann-kilzer
You have signed the CLA already but the status is still pending? Let us recheck it.

@otmon76 otmon76 merged commit ee2a942 into master Oct 4, 2022
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.