From 26b12287ea8f22a250c38af6c3c9347744fcd074 Mon Sep 17 00:00:00 2001
From: Simon Holywell <treffynnon@php.net>
Date: Wed, 29 Mar 2017 14:28:50 +1000
Subject: [PATCH] attempt to make translations more friendly

---
 _includes/head.html   |  2 +-
 _layouts/default.html | 13 +++++++------
 index.md              |  1 +
 ja/index.md           |  2 ++
 zh/index.md           |  2 ++
 5 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/_includes/head.html b/_includes/head.html
index 0468751..834111f 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -20,7 +20,7 @@
 </div>
 <header class="top">
     <div class="wrap">
-        <h1 itemprop="name">SQL Style Guide</h1>
+        <h1 itemprop="name">{% if page.lang_title %}{{ page.lang_title }} · {% endif %}SQL Style Guide</h1>
         <p class="author" itemprop="author" itemscope itemtype="http://schema.org/Person">by 
             <a href="https://www.simonholywell.com/?utm_source=sqlstyle.guide-{{ site.domain }}&amp;utm_medium=link&amp;utm_campaign=header" itemprop="url"><span itemprop="name">Simon Holywell</span></a> &middot;
             <a href="https://twitter.com/treffynnon">@Treffynnon</a>
diff --git a/_layouts/default.html b/_layouts/default.html
index 7897ef3..183adc5 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,10 +1,10 @@
 <!doctype html>
-<html lang="en-au">
+<html lang="{{ page.lang }}">
     <head>
         <meta charset="UTF-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-        <title property="og:title">{{ site.name }}</title>
+        <title property="og:title">{% if page.lang_title %}{{ page.lang_title }} · {% endif %}{{ site.name }}</title>
         <link href="http://fonts.googleapis.com/css?family=PT+Sans|Roboto+Slab|Droid+Sans+Mono" rel="stylesheet" type="text/css">
         <link rel="stylesheet" href="{{ site.url }}/style.css">
 
@@ -18,7 +18,7 @@
         <meta content="{{ site.description }}" itemprop="description" name="description" property="og:description">
         <meta content="sql, style guide, code style guide, simon holywell, holywell" itemprop="keywords" name="keywords" property="article:tag">
         <meta content="summary" name="twitter:card">
-        <meta content="{{ site.name }}" name="twitter:title">
+        <meta content="{% if page.lang_title %}{{ page.lang_title }} · {% endif %}{{ site.name }}" name="twitter:title">
         <meta content="{{ site.description }}" name="twitter:description">
         <meta content="@treffynnon" name="twitter:site">
         <meta content="@treffynnon" name="twitter:creator">
@@ -26,8 +26,9 @@
 
         <link href="http://plus.google.com/+SimonHolywell" rel="author">
 
-        <link rel="alternate" hreflang="x-default" href="{{ site.url }}">
-        <link rel="alternate" hreflang="en" href="{{ site.url }}">
+        <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html',''}}">
+        <link rel="alternate" hreflang="x-default" href="{{ site.url }}/">
+        <link rel="alternate" hreflang="en" href="{{ site.url }}/">
         <link rel="alternate" hreflang="ja" href="{{ site.url }}/ja/">
         <link rel="alternate" hreflang="zh" href="{{ site.url }}/zh/">
     </head>
@@ -37,7 +38,7 @@
         <meta itemprop="audience" content="SQL programmers">
         <meta itemprop="license" content="http://creativecommons.org/licenses/by-sa/4.0/">
         <meta itemprop="version" content="1.0.0">
-        <meta itemprop="proficiencyLevel" content="Beginer">
+        <meta itemprop="proficiencyLevel" content="Beginner">
         <meta itemprop="dependencies" content="SQL knowledge">
         <meta itemprop="copyrightHolder" content="Simon Holywell">
         {% include head.html %}
diff --git a/index.md b/index.md
index ac70593..db1aaf6 100644
--- a/index.md
+++ b/index.md
@@ -1,5 +1,6 @@
 ---
 layout: default
+lang: en
 ---
 
 * TOC
diff --git a/ja/index.md b/ja/index.md
index d730e78..ab9b0e2 100644
--- a/ja/index.md
+++ b/ja/index.md
@@ -1,6 +1,8 @@
 ---
 layout: default
 redirect_from: "/jp"
+lang: ja
+lang_title: SQLスタイルガイド
 ---
 
 * TOC
diff --git a/zh/index.md b/zh/index.md
index ca01064..a740490 100644
--- a/zh/index.md
+++ b/zh/index.md
@@ -1,5 +1,7 @@
 ---
 layout: default
+lang: zh
+lang_title: SQL样式指南
 ---
 
 * TOC
