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 @ b52aa942 #26

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 561 commits into master from sync-b52aa942
Closed

Conversation

@javascript-translate-bot
Copy link

@javascript-translate-bot javascript-translate-bot commented Jun 15, 2020

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

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.

zhang1pr and others added 30 commits March 10, 2020 20:31
- fix erratas
- fix wrong error message
- add 'run' on runnable example
- add explanation about window.onload property corresponding load event
- add comment about window.onstorage property corresponding storage event
Add commas after non-terminal properties
func.apply(context, args); // is same as using apply => Is a type error?
Comments section: Remove useless spaces
fix: removed , from solution.md and task.md for date data types
iliakan and others added 26 commits June 1, 2020 09:55
The english websocket article was missing an "in". I fixed it for you. :)
Just a simple check to see if the code works on the example given in the task.
remove a stray 's' that caused an error in ball drag example
On task.md, " -9 " has 2 white spaces before "-9".
The phrase `zero becames 100.` make me think that there is a variable `zero` defined when there is not.
Update phrasing on "Comparison with ||"
Grammar fix: Missing "is" in websocket EN article
Add test cases for 1-js/06-advanced-functions/03-closure/9-sort-by-field
Match the solution with the question on "Type conversions" task
Copy link

CLAassistant commented Jun 15, 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.
2 out of 14 committers have signed the CLA.

✅ iliakan
✅ tmollov
❌ GabrieleC
❌ ekira
❌ ironsoul0
❌ kumarvaibhav45
❌ lex111
❌ damage92
❌ tiagocastro070
❌ michaelborn
❌ dharohar-rathore
❌ syncopika
❌ diegotc86
❌ Logan-Schelly
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 によって変換されたページ (->オリジナル) /