Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Sync with upstream @ c89ddc5d #22

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

Closed
javascript-translate-bot wants to merge 402 commits into master from sync-c89ddc5d
Closed

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Apr 6, 2020

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):

  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.

jchue and others added 30 commits January 2, 2020 13:45
It was not mentioned earlier in the article that "A property can be either an accessor (has get/set methods) or a data property (has a value), not both"
So,we should not say "once again".
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).
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.
iliakan and others added 26 commits March 29, 2020 10:00
"sum(1)" doesn't return a wrapper, "curriedSum(1)" does.
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
Fixing "sum(1)" instead of "curriedSum(1)" (l. 42)
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
Either quotation marks or italicization
Copy link

CLAassistant commented Apr 6, 2020
edited
Loading

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

✅ leviding
✅ KennethKinLum
✅ Aakodal
✅ iliakan
✅ SambaLim
❌ wonderingabout
❌ paroche
❌ baooab
❌ lex111
❌ Ahmed-Magdy-S
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

AltStyle によって変換されたページ (->オリジナル) /