Improve localization, add ja translation links

hginit · Aug 3, 2021 · 2a7d7ab · 2a7d7ab
1 parent af01f52
commit 2a7d7ab
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 40 deletions.
diff --git a/00.html b/00.html
@@ -3,6 +3,9 @@
 description: If you’ve been using Subversion, Mercurial is going to be confusing. This tutorial covers the biggest differences in how Mercurial works. If you’ve never used Subversion, just skip ahead.
 layout: default
 next: 01.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/re-education/
+  ja: http://d.hatena.ne.jp/mmitou/20100428/1272459115
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/01.html b/01.html
@@ -4,6 +4,9 @@
 layout: default
 previous: 00.html
 next: 02.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/groundup/
+  ja: http://d.hatena.ne.jp/mmitou/20100429/1272514361
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/02.html b/02.html
@@ -7,6 +7,9 @@
 layout: default
 previous: 01.html
 next: 03.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/setting-up/
+  ja: http://d.hatena.ne.jp/mmitou/20100430/1272596378
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/03.html b/03.html
@@ -8,6 +8,9 @@
 layout: default
 previous: 02.html
 next: 04.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/fixing/
+  ja: http://d.hatena.ne.jp/mmitou/20100501/1272674726
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/04.html b/04.html
@@ -1,10 +1,13 @@
 ---
-title: Fixing Goofs
+title: Merging
 description: >
    Sometimes merges cause conflicts. Usually they’re easy to fix, but you do need to resolve them or you’ll have multiple heads. And who wants multiple heads?
 layout: default
 previous: 03.html
 next: 05.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/merging/
+  ja: http://d.hatena.ne.jp/mmitou/20100502/1272769217
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/05.html b/05.html
@@ -6,6 +6,9 @@
   special-purpose repos around to match your development process.
 layout: default
 previous: 04.html
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/architecture/
+  ja: http://d.hatena.ne.jp/mmitou/20100503/1272903959
 ---
 <div id="topnav">
   <div class="tInterior">

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,37 +1,54 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="X-UA-Compatible" content="chrome=1">
+    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
     <link rel="shortcut icon" href="/public/hginit.png" />
     <link rel="apple-touch-icon" href="/public/hginit.png" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>HgInit: {{page.title}}</title>
-    <meta name="og:description" content="{{page.description}}"/>
+    <meta name="og:description" content="{{page.description}}" />
     <meta name="description" content="{{page.description}}" />
     <link href="public/styles.css" rel="stylesheet" type="text/css" />
-    <meta name="language" content="en">
-    <meta name="author" content="Joel Spolsky">
-    <meta name="copyright" content="Joel Spolsky">
-    <meta name="og:title" content="The Rock"/>
-    <meta name="og:url" content="{{site.url}}/{{page.url}}"/>
-    <meta name="og:image" content="{{site.url}}/public/hginit.png"/>
-    <link rel='start' title='HgInit' href='{{site.url}}/index.html' />
-    {% if page.previous %}<link rel='prev' href='{{site.url}}/{{page.previous}}' />{% endif %}
-    {% if page.next %}<link rel='next'  href='{{site.url}}/{{page.next}}' />{% endif %}
+    <meta name="language" content="en" />
+    <meta name="author" content="Joel Spolsky" />
+    <meta name="copyright" content="Joel Spolsky" />
+    <meta name="og:title" content="The Rock" />
+    <meta name="og:url" content="{{site.url}}/{{page.url}}" />
+    <meta name="og:image" content="{{site.url}}/public/hginit.png" />
+    <link rel="start" title="HgInit" href="{{site.url}}/index.html" />
+    {% if page.previous %}
+    <link rel="prev" href="{{site.url}}/{{page.previous}}" />
+    {% endif %} {% if page.next %}
+    <link rel="next" href="{{site.url}}/{{page.next}}" />
+    {% endif %}
+    <link rel="alternate" href="{{site.url}}/{{page.url}}" hreflang="en" />
+    <link rel="alternate" href="{{page.alternate.zh}}" hreflang="zh" />
+    <link rel="alternate" href="{{page.alternate.ja}}" hreflang="ja" />
   </head>
   <body>
-<div class="toptop" align="left">
-  <ul>
-      <li><a href="https://github.com/hginit/hginit.github.io">Source</a></li>
-      <li><a href="https://zh-hginit.readthedocs.org">中文版</a></li>
-      <li><a href="https://www.joelonsoftware.com/">Joel on Software</a></li>
-      <li><a href="https://www.mercurial-scm.org">Mercurial</a></li>
-      <li><a href="index.html">Home</a></li>
-  </ul>
-</div>
-<div id="dropshadow"></div>
+    <div class="toptop" align="left">
+      <ul>
+        <li><a href="https://github.com/hginit/hginit.github.io">Source</a></li>
+        <li>
+          <a href="https://zh-hginit.readthedocs.org" hreflang="zh">中文版</a>
+        </li>
+        <li>
+          <a
+            href="https://mmitou.hatenadiary.org/entry/20100501/1272680474"
+            hreflang="ja"
+            >日本語</a
+          >
+        </li>
+        <li><a href="https://www.joelonsoftware.com/">Joel on Software</a></li>
+        <li><a href="https://www.mercurial-scm.org">Mercurial</a></li>
+        <li><a href="index.html">Home</a></li>
+      </ul>
+    </div>
+    <div id="dropshadow"></div>
     <div class="main">
-<!-- content starts -->
-{{content}}
-<!-- content ends -->
-    </div>
+      <!-- content starts -->
+      {{content}}
+      <!-- content ends -->
+    </div>
+  </body>
+</html>
diff --git a/index.html b/index.html
@@ -3,28 +3,40 @@
 description: A friendly introduction to the Mercurial DVCS by Joel Spolsky
 layout: default
 topnav: >
-    Mercurial is a modern, open source, distributed version control system, and
-    a compelling upgrade from older systems like Subversion. In this user-friendly, six-part tutorial,
-    [Joel Spolsky](http://www.joelonsoftware.com) teaches you the key concepts.
+  Mercurial is a modern, open source, distributed version control system, and
+  a compelling upgrade from older systems like Subversion. In this user-friendly, six-part tutorial,
+  [Joel Spolsky](http://www.joelonsoftware.com) teaches you the key concepts.
+alternate:
+  zh: https://zh-hginit.readthedocs.io/en/latest/
+  ja: https://mmitou.hatenadiary.org/entry/20100501/1272680474
 ---
+
 <div id="topnav">
   <div class="t">
     <div class="h">
-        <span style="color:rgb(181,129,69)">Hg Init:</span>
-        a Mercurial tutorial
+      <span style="color: rgb(181, 129, 69)">Hg Init:</span>
+      a Mercurial tutorial
     </div>
     Mercurial is a modern, open source, distributed version control system, and
-    a compelling upgrade from older systems like Subversion. In this user-friendly, six-part tutorial,
-    <a href="https://www.joelonsoftware.com">Joel Spolsky</a> teaches you the key concepts.
+    a compelling upgrade from older systems like Subversion. In this
+    user-friendly, six-part tutorial,
+    <a href="https://www.joelonsoftware.com">Joel Spolsky</a> teaches you the
+    key concepts.
   </div>
 </div>
 <div class="mainnav">
   <div class="button">
-  	<a href="00.html" title="Subversion Re-education" target="_self" class="zero">&nbsp;</a>
-  	<a href="01.html" title="Ground up Mercurial" class="one">&nbsp;</a>
-  	<a href="02.html" title="Setting up for a Team" class="two">&nbsp;</a>
-  	<a href="03.html" title="Fixing Goofs" class="three">&nbsp;</a>
-  	<a href="04.html" title="Merging" class="four">&nbsp;</a>
-  	<a href="05.html" title="Repository Architecture" class="five">&nbsp;</a>
+    <a
+      href="00.html"
+      title="Subversion Re-education"
+      target="_self"
+      class="zero"
+      >&nbsp;</a
+    >
+    <a href="01.html" title="Ground up Mercurial" class="one">&nbsp;</a>
+    <a href="02.html" title="Setting up for a Team" class="two">&nbsp;</a>
+    <a href="03.html" title="Fixing Goofs" class="three">&nbsp;</a>
+    <a href="04.html" title="Merging" class="four">&nbsp;</a>
+    <a href="05.html" title="Repository Architecture" class="five">&nbsp;</a>
   </div>
-</div>
+</div>