Skip to content

Comments

Sync with upstream @ f830bc5d#1059

Closed
javascript-translate-bot wants to merge 1143 commits intomasterfrom
sync-f830bc5d
Closed

Sync with upstream @ f830bc5d#1059
javascript-translate-bot wants to merge 1143 commits intomasterfrom
sync-f830bc5d

Conversation

@javascript-translate-bot
Copy link
Contributor

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

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 267 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 May 11, 2020 10:31
minor grammar mistake "it's original" should be "its original"
Updated to show Edge now supports BigInt
Fix Typo in logical operators
Add additional error type-checking examples and use `instanceof` in examples
The task has a test with a missing comma.  That same comma is missing in the comment, so I'm putting it here as well.
The empty users array was undeclared in the second test, and the object in the first test was missing a comma in its declaration.
correct minor error: "имя" is used in place of "name"
Remove duplicate word "soon"
Fixed typos on last Array Methods task.
Cross-origin requests initiated by embedded images and forms actually bring cookies by default. Though it is incorrect to say that all cross-origin requests do not bring credentials by default.
AasthaSinha2305 and others added 27 commits August 23, 2020 18:06
add semicolon 13,20 line
Explained how to create a date object.
`globalThis` is now supported in all major browsers, see link https://caniuse.com/#search=globalThis
"kb" means "kilobit", some may confused about it.
so It'll be better to changed as "KB", as intended.
updated size unit from "kb" to "KB" - [#2085]
BigInt header grammar fix
Removed the parts about browser compatibility
Fixed "compatibility" spelling error
5.4 - change 7 basic types to eight basic types
The solution here had no break, an infinite loop. Modified to match plunker example code
Update article.md with link to Brython
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Aug 31, 2020
@CLAassistant
Copy link

CLAassistant commented Aug 31, 2020

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.
1 out of 13 committers have signed the CLA.

✅ iliakan
❌ peachesontour
❌ yasath
❌ arcticmatt
❌ josephrocca
❌ bookchiq
❌ maksumi
❌ Violet-Bora-Lee
❌ C17AN
❌ moisheschwartz
❌ joaquinelio
❌ sanghyo95
❌ AasthaSinha2305
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

review needed Review needed, please approve or request changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.