Skip to content

Sync with upstream @ e4e6a50b#987

Closed
javascript-translate-bot wants to merge 986 commits into
masterfrom
sync-e4e6a50b
Closed

Sync with upstream @ e4e6a50b#987
javascript-translate-bot wants to merge 986 commits into
masterfrom
sync-e4e6a50b

Conversation

@javascript-translate-bot

Copy link
Copy Markdown
Contributor

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

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 259 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 March 21, 2020 09:15
fix: removed , from solution.md and task.md  for date data types
fix: 2 stray lines of russian and a typo
Fix error in 1-js/11-async/05-promise-api/article.md
Update solution of 1-js/02-first-steps/01-hello-world/1-hello-alert
iliakan and others added 26 commits June 8, 2020 11:07
Match the solution with the question on "Type conversions" task
Grammar and typo fix in pointer events
…ct/5-sum-many-brackets

I used the solution and examples already in the article.
I chose to make the test cases use Array.reduce() to compute the sum,
instead of hard-coding the answer myself.
Not sure how good of practice that is.
The `createMessageUnder()` function below needs the `bottom` coordinate, but it doesn't in the result of `getCoords()`.
Fixed Wikipedia link and list markdown
`openRequest.result.version` in `onupgradeneeded` is not the current DB version. It is the requested version, equal to `event.newVersion`. `event.oldVersion` contains the current version.
Fixed onupgradeneeded handling
Calling throttle before setting the fake timers will break any implementations that save a timestamp outside the wrapper function.
Set fake timers before calling throttle
Add bottom and right properties for getCoords()
followed -> followed by
Correct misspelling retarteted -> retargeted
Was tempted to suggest something a bit wordier: "where it finds it and, in this case, changes it", but I thought this would do.
@javascript-translate-bot javascript-translate-bot added the review needed Review needed, please approve or request changes label Jun 22, 2020
@javascript-translate-bot javascript-translate-bot requested a review from a team June 22, 2020 05:06
@CLAassistant

CLAassistant commented Jun 22, 2020

Copy link
Copy Markdown

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 14 committers have signed the CLA.

✅ iliakan
❌ syncopika
❌ damage92
❌ michaelborn
❌ Logan-Schelly
❌ chanjsq
❌ LuiGee3471
❌ xehpuk
❌ diegotc86
❌ dharohar-rathore
❌ joachimklug
❌ paroche
❌ rizkyzhang
❌ aadijoshi
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.