Skip to content

Sync with upstream @ 4d01fc20 #96

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
wants to merge 2,906 commits into from
Closed

Conversation

javascript-translate-bot

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

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 187 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

Please ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).

This PR will be closed and replaced with a new one in a few days.

Siteproxy
iliakan and others added 30 commits March 26, 2021 09:23

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Few grammatical corrections

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
The sentence should say "Why we need tests" with no question mark, or "Why do we need tests?" I think keeping the question mark makes it more personal.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Potential Grammar Correction

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
it could be more intuitive. function() looks like calling a function but example is about function expression.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fixed a small typo with pluralization.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
store vs keeps stored

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Plunker reminder #1775

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix plural typo line 414

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix comma splice.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
typos

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
pseudo function expression

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Grammar Fix Update in article.md
iliakan and others added 26 commits July 23, 2021 10:10

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
old and new

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
slider not working on movile

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Missing `let` keyword

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update URLs

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix compound interest formula

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Update article.md

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix typo.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix grammar

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Make use of `loadJson` inside `loadGithubUser`
@CLAassistant
Copy link

CLAassistant commented Sep 20, 2021

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

✅ odsantos
✅ mahdyar
✅ iliakan
✅ joaquinelio
❌ Manik2375
❌ riri-yu
❌ WebSavva
❌ msmilkshake
❌ mindv0rtex
❌ RainbowDashy
❌ Gammadon
❌ shvchk
❌ siimpragi
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet