Skip to content
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

Sync with upstream @ 6236eb8c #68

Open
wants to merge 1,709 commits into
base: master
Choose a base branch
from
Open

Conversation

javascript-translate-bot

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

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

iliakan and others added 30 commits September 20, 2022 13:45
Clarify instructions of `read` method
👾 add mdn links to Map and Set methods
Missing '()' invoking a constructor.
I don't see anyone using vice verse with "-" in between, so decided to remove it as well.
contextually 'true' can be confusing after 'false' in sentence: "... false, technically that's true ..."
Parentheses can be omitted even if the constructor function has arguments:
```js
new function(test) {
    return { test }
}

// Works the same as
new (function(test) {
    return { test }
})();
```
smith558 and others added 29 commits May 17, 2024 15:10
When teaching this subject I found that an example where you can see for which array the first and the second value in the [] after matrix stand, helps understanding better.
docs: remove eval polyfill.io
* Remove BigInt IE incompatibility part

As Internet Explorer was retired years ago, this paragraph is not needed anymore, so I deleted that line.

* Delete link to MDN BigInt compatibility table

Unimportant link: almost total compatibility since the appearance of zhe `BigInt` type.
detail `Math.round` behavior on negative numbers in middle case.
change example element of multidimensional array
Fixing a minor grammatical typo in the document.
The code uses the function named 'askPassword' but the text above it explaining the error reason says 'ask' instead of 'askPassword'
minor fix to function name written in explanation
Suggested edit - to make the phrase clearer.
the comment number is missing when the we mention line 2
@CLAassistant
Copy link

CLAassistant commented Feb 10, 2025

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

✅ 0xtoorich
✅ iliakan
✅ kricsleo
✅ Alexandre887
❌ smith558
❌ nakhodkin
❌ Filin3
❌ pvepamb1
❌ ellie-heidari
❌ sneeed
❌ FloffyGarlic
❌ shallow-beach
❌ tonybishnoi
❌ nikoandpiko
❌ zakingslayerv22
❌ AdityaGirdhar
❌ mhi1627
❌ pj-szdm
You have signed the CLA already but the status is still pending? Let us recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.