Sync with upstream @ c89ddc5d #54
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed typo in article.md
Function return example update
Typo fix.
Make minor grammar corrections/updates to async/microtask-queue
Update 'Selection and Range' article.md
A small grammar change and fixing a typo (I think) (no -> not).
Update article.md
Actually taking out a comma.
Make minor grammar corrections/updates to async/promise-basics
Change panel names according to official documentation
Translated tasks to English Language.
I think this is the way it is typically used here and elsewhere. reserving "brackets" without a qualifier for indicating square brackets., so probably no explanation is necessary.
But, for those who want to know more:
It does seem to be the case that in British English "brackets" typically means "round brackets", which are parentheses, but in American English "brackets" typically means square brackets ("[]").
Admittedly, "brackets" is easier to spell. And to pronounce. Even to type, once you get used to it.
Again, in American English, and programming, "brackets" usually means "square brackets". "Parentheses" is unambiguous.
Object.assign() is referring to wrong article, which is Sympol. so I fix it to the right article "objects" with the right section #Cloning and merging, Object.assign
Fix minor type error
fix an anchor link error
Fix minor type error
Fixing "sum(1)" instead of "curriedSum(1)" (l. 42)
fix missing js formatting
Add bigint to 1-js/02-first-steps/17-javascript-specials/article.md
"synctax" to "syntax"
Change switch Grouping of "case" example
Change switch Grouping of "case" example
fix minor typo
Either quotation marks or italicization
|
|
raikusy
approved these changes
May 9, 2020
There was a problem hiding this comment.
This PR was automatically generated to merge changes from en.javascript.info at c89ddc5
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:
- 1-js/01-getting-started/1-intro/article.md
- 1-js/02-first-steps/01-hello-world/article.md
- 1-js/02-first-steps/02-structure/article.md
- 1-js/02-first-steps/06-type-conversions/article.md
- 1-js/02-first-steps/08-comparison/1-comparison-questions/solution.md
- 1-js/02-first-steps/11-logical-operators/2-alert-or/solution.md
- 1-js/04-object-basics/01-object/article.md
- 1-js/06-advanced-functions/04-var/article.md
- 1-js/13-modules/03-modules-dynamic-imports/article.md
To merge changes manually (instead of merging this PR):
- 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
- Commit all current work locally and
git checkout master - Pull the recent changes from the English version:
git pull upstream master
- 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
- Checkout your (translated) version of a file/folder at the given path (removes all upstream changes):
- 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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at c89ddc5
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):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterThis PR will be closed and replaced with a new one in a few days.