Skip to content

Sync with upstream @ b258d7d5 #204

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 72 commits into from
Jul 25, 2024
Merged

Sync with upstream @ b258d7d5 #204

merged 72 commits into from
Jul 25, 2024

Conversation

javascript-translate-bot

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

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.

wdscxsj and others added 30 commits October 3, 2022 16:58
Fixing a minor grammatical typo in the selection and range markdown document.
Add WeakRef and FinalizationRegistry article
Fix broken link to compat-table
Fix broken link to compat-table
Replace the assignment operator `=` with the equality comparison `==` in both examples in the 'Truncate the text' task.
Fix the broken link in Chapter 3.6
Replace assignment with equals in Truncate the text task
Improve awkward sentence structure
Updated RFC spec Safe Methods URL in Cookies chapter
iliakan and others added 27 commits March 8, 2024 14:23
Updated result visualization
Fix grammar and add an example
Fix grammar and JavaScript syntax
Small change in the sentence.
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.
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Jul 22, 2024
@javascript-translate-bot javascript-translate-bot requested a review from a team July 22, 2024 05:01
@J-Cake J-Cake merged commit 7f5cfce into master Jul 25, 2024
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.