Skip to content

Conversation

@javascript-translate-bot

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

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 241 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.

hzjjg and others added 30 commits July 19, 2019 11:03
line:133   word encodeURI should be decodeURI
Simply added the line:-
Moreover, frameworks like react native and ionic let's us develop mobile applications using JavaScript.
Moreover, frameworks like react native and ionic lets us develop mobile applications using JavaScript.
FIxed typo
Changed from
result = (a + b < 4) ? 'Below' : 'Over';
to
let result = (a + b < 4) ? 'Below' : 'Over';
Fix set() calls in WeakMap and WeakSet article
article network-> url: line 133 word “encodeURI” should be “decodeURI”
Correction to "Format the relative date" task
line 46: 
changed "we loose" to "we lose"
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.