up

Author: iliakan

langs/hi.json

@@ -0,0 +1,6 @@
+{
+  "name": "Hindi",
+  "code": "hi",
+  "maintainers": ["siradityaverma"],
+  "published": false
+}

lib/init/createRepo.js

@@ -125,6 +125,8 @@ async function setupRepo(langInfo) {
     name: newRepoName,
     has_projects: false,
     has_wiki: false,
+    homepage: typeof langInfo.published === 'string' ? langInfo.published :
+                langInfo.published ? `https://${langInfo}.javascript.info` : `https://javascript.info`,
     allow_merge_commit: true,
     allow_squash_merge: false,
     allow_rebase_merge: false

lib/sync.js

@@ -47,13 +47,13 @@ module.exports = async (langInfo) => {
 
   let conflictFiles = await run(`git diff --name-only --diff-filter=U`, {cwd: translatedPath });
   conflictFiles = conflictFiles.split('\n');
-  //
+
   // if (conflictFiles[0] === 'Readme.md' && conflictFiles.length === 1) {
   //   await run(`git checkout --ours Readme.md`, {cwd: translatedPath });
   //   await run(`git commit -m 'readme only' Readme.md`, {cwd: translatedPath });
   // }
 
-  if (conflictFiles[0] === '') conflictFiles.shift(); // if no conflicts, becomes ['']
+  if (conflictFiles[0] === '') conflictFiles.shift(); // if no conflicts,  conflictFiles becomes ['']
 
   if (conflictFiles.length) {
     await run(`git commit -am "merging all conflicts"`, {cwd: translatedPath});
@@ -82,6 +82,8 @@ module.exports = async (langInfo) => {
     conflictList = `<details><summary>Click to open a list of ${conflictFiles.length} files</summary>\n\n${conflictList}\n</details>`;
   }
 
+  const readmeTip = conflictFiles.map(f => f.toLowerCase()).includes('readme.md') ? '\nPlease ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).\n' : '';
+
   if (conflictList) {
     conflictList = `
 The following files have conflicts and may need new translations:
@@ -97,21 +99,23 @@ Please fix the conflicts by pushing new commits to this pull request, either by
   let tips = '';
   if (conflictList) {
     tips = `
-We recommend to merge conflicting changes manually and close this PR.
+We recommend to close this PR and merge conflicting changes manually.
 
 The steps are: 
-1. Setup upstream (if haven't yet)
+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 and \`git checkout master\`
+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 them. Otherwise, if there are many changes, you can see them like this:  
-    - Checkout your version, \`git checkout --ours README.md\`
-    - See what changed in the original file: 
-        - \`git diff --word-diff master...upstream/master README.md\` (please note: three dots in the command)
-    - Re-translate or otherwise sync the translated version and commit it:
-        - \`git commit -m synced README.md\`
-5. When conflicts resolved, \`git push origin master\`
+4. Deal with the conflicts. If a conflict touches a few lines, then just fix them. Otherwise, following commands can help:
+    - Checkout translated version of a file/folder at the given path:
+        - \`git checkout --ours <path>\`
+    - Checkout upstream version of a file/folder at the given path:
+        - \`git checkout --theirs <path>\`
+    - See what changed in the upstream file since branches diverged: 
+        - \`git diff --word-diff master...upstream/master <path>\` (please note: three dots in the command)
+5. When conflicts resolved, commit them and \`git push origin master\`
+${readmeTip}
 `;
   }
 
@@ -128,7 +132,7 @@ ${tips}
 
 
     let existingPrs = await octokitBot.search.issuesAndPullRequests({
-      q: `type:pr Sync with upstream in:title is:open author:${config.botUser} repo:${config.org} /${langInfo.code}.${config.repoSuffix}`
+      q: `type:pr Sync with upstream in:title is:open author:${config.botUser} repo:${config.org}/${langInfo.code}.${config.repoSuffix}`
     });
 
     for(let existingPr of existingPrs.data.items) {