Skip to content

Sync with upstream @ 7bb6066e #81

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 772 commits into from
Jun 13, 2022
Merged

Sync with upstream @ 7bb6066e #81

merged 772 commits into from
Jun 13, 2022

Conversation

javascript-translate-bot

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

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 27 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 January 21, 2022 13:51
Nullish coalescing and logical OR both eqaul to 4 now in MDN table.
…g-tests

fix:Add missing test issue:#2826 & fix related solution
Correction to precedence levels
Removed the double quotes in the explanation for unary operator precedence in the file /1-js/02-first-steps/08-operators/article.md, so that readers do not potentially misinterpret the expression as a string.
fix formatting, change wording for clarity
doc-fix: Modified a misplaced comma
Update unary + (plus) operator precedence explanation
iliakan and others added 22 commits May 12, 2022 16:01
remove extra break lines and add missed
"so it is in memory" reachable or not. For a while at least.
Stated that navigator.clipboard API is not compatible in Firefox but it is: https://caniuse.com/mdn-api_navigator_clipboard
Removed extra 'd' letter
The permalink to bitwise operator was incorrect.The link before took to the correct page but not to bitwise operator docs subheading.
Fix link to MDN bitwise operator docs in (2.18)Javascript specials
Form events navigator.clipboard API Firefox support
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Jun 13, 2022
@javascript-translate-bot javascript-translate-bot requested a review from a team June 13, 2022 05:01
@CLAassistant
Copy link

CLAassistant commented Jun 13, 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 9 committers have signed the CLA.

✅ iliakan
✅ joaquinelio
❌ yellottyellott
❌ rebeccacremona
❌ OmerBaddour
❌ nintendoit
❌ josephharkins
❌ tanishk15sharma
❌ Rnbsov
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 13, 2022
@ockley ockley merged commit 27e1fcb into master Jun 13, 2022
@ockley ockley deleted the sync-7bb6066e branch June 13, 2022 13:09
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.