Merge remote-tracking branch 'upstream/master' into #200

exampleSite/content/categories/Test/_index.md

@@ -1,9 +1,9 @@
 ---
 title: "Test"
-description: "This is a example category"
+description: "This is an example category"
 slug: "test"
 image: "hutomo-abrianto-l2jk-uxb1BY-unsplash.jpg"
 style:
     background: "#2a9d8f"
     color: "#fff"
----
+---

i18n/ja.yaml

@@ -28,7 +28,7 @@ widget:
 
 search:
     title:
-        other: サーチ
+        other: 検索
     placeholder:
         other: 入力...
     resultTitle:

layouts/partials/head/head.html

@@ -21,5 +21,5 @@
     <link rel="shortcut icon" href="{{ . }}" />
 {{ end }}
 
-{{- template "_internal/google_analytics_async.html" . -}}
+{{- template "_internal/google_analytics.html" . -}}
 {{- partial "head/custom.html" . -}}

layouts/partials/helper/image.html

@@ -8,7 +8,7 @@
     {{ $url := urls.Parse $imageValue }}
 
     {{ if or (eq $url.Scheme "http") (eq $url.Scheme "https") }}
-        <!-- Is a external image -->
+        <!-- Is an external image -->
         {{ $result = merge $result (dict "permalink" $imageValue) }}
     {{ else }}
         {{ $pageResourceImage := .Context.Resources.GetMatch (printf "%s" ($imageValue | safeURL)) }}
@@ -58,4 +58,4 @@
 
 {{ end }}
 
-{{ return $result }}
+{{ return $result }}