projects / brevno-suite / hugo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4bb5e32)
A small fix and update to the multilingual example
authorAnthony Fok <foka@debian.org>
Wed, 3 Sep 2014 00:10:19 +0000 (18:10 -0600)
committerspf13 <steve.francia@gmail.com>
Mon, 8 Sep 2014 15:38:12 +0000 (11:38 -0400)
Enclose `{{ .Content }}` with a `{{ if .IsPage }}` test to avoid
the "Content is not a field of struct type *hugolib.Node" error.
Thanks to @spf13 for the tip!  Fixes #366.

Also update example to Hugo v0.12 conventions:
- Convert config.yaml to config.toml to follow what
  `hugo new site /path/to/site` generates
- Rename layouts/chrome to layouts/partials
- Convert `template` calls to `partial` calls
- Add .gitignore to ignore the `public` directory
- Add README.md with pointers to discussions in issues
  to help bring newcomers up to speed with this multilingual example

13 files changed:
examples/multilingual/.gitignore [new file with mode: 0644] patch | blob
examples/multilingual/README.md [new file with mode: 0644] patch | blob
examples/multilingual/config.toml [new file with mode: 0644] patch | blob
examples/multilingual/config.yaml [deleted file] patch | blob | history
examples/multilingual/layouts/_default/single.html patch | blob | history
examples/multilingual/layouts/chrome/footer.html [deleted file] patch | blob | history
examples/multilingual/layouts/chrome/head.html [deleted file] patch | blob | history
examples/multilingual/layouts/chrome/header.html [deleted file] patch | blob | history
examples/multilingual/layouts/partials/footer.html [new file with mode: 0644] patch | blob
examples/multilingual/layouts/partials/head.html [new file with mode: 0644] patch | blob
examples/multilingual/layouts/partials/header.html [new file with mode: 0644] patch | blob
examples/multilingual/layouts/story/list.html patch | blob | history
examples/multilingual/layouts/uudis/list.html patch | blob | history

diff --git a/examples/multilingual/.gitignore b/examples/multilingual/.gitignore
new file mode 100644 (file)
index 0000000..a48cf0d
--- /dev/null
+++ b/examples/multilingual/.gitignore
@@ -0,0 +1 @@
+public
diff --git a/examples/multilingual/README.md b/examples/multilingual/README.md
new file mode 100644 (file)
index 0000000..5e4b4ff
--- /dev/null
+++ b/examples/multilingual/README.md
@@ -0,0 +1,13 @@
+# Multilingual website with Hugo
+
+This example was kindly contributed by Egon Elbre in November 2013
+as a wonderful proof-of-concept for internationalization (i18n)
+and multilingualization (m17n) in Hugo-generated websites.
+
+The example works well for the most part, though some minor issues remain.
+Please see relevant discussions below:
+
+* https://github.com/spf13/hugo/issues/129 Multiple languages
+* https://github.com/spf13/hugo/issues/134 Example of a multilingual site
+
+All contributions are welcome!
diff --git a/examples/multilingual/config.toml b/examples/multilingual/config.toml
new file mode 100644 (file)
index 0000000..094b09b
--- /dev/null
+++ b/examples/multilingual/config.toml
@@ -0,0 +1,6 @@
+baseurl = ""
+
+[indexes]
+tag = "tags"
+group = "groups"
+menu = "menu"
diff --git a/examples/multilingual/config.yaml b/examples/multilingual/config.yaml
deleted file mode 100644 (file)
index 017a9b5..0000000
--- a/examples/multilingual/config.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-indexes:\r
-  tag: 'tags'\r
-  group: 'groups'\r
-  menu: 'menu'\r
-baseurl: ''\r
diff --git a/examples/multilingual/layouts/_default/single.html b/examples/multilingual/layouts/_default/single.html
index da3640efe9eea859a5129fceb1f283198e26a472..66e4a38281d486fdce4c455c1fa6f8be0b0ac7fc 100644 (file)
--- a/examples/multilingual/layouts/_default/single.html
+++ b/examples/multilingual/layouts/_default/single.html
@@ -1,4 +1,4 @@
-{{ template "chrome/head.html" . }}\r
-{{ template "chrome/header.html" . }}\r
-{{ .Content }}\r
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ partial "head.html" . }}\r
+{{ partial "header.html" . }}\r
+{{ if .IsPage }}{{ .Content }}{{ end }}\r
+{{ partial "footer.html" . }}\r
diff --git a/examples/multilingual/layouts/chrome/footer.html b/examples/multilingual/layouts/chrome/footer.html
deleted file mode 100644 (file)
index 2630b2e..0000000
--- a/examples/multilingual/layouts/chrome/footer.html
+++ /dev/null
@@ -1,3 +0,0 @@
-       <footer>(Ↄ) 2013 Egon Elbre</footer>\r
-</body>\r
-</html>
\ No newline at end of file
diff --git a/examples/multilingual/layouts/chrome/head.html b/examples/multilingual/layouts/chrome/head.html
deleted file mode 100644 (file)
index 44d1d73..0000000
--- a/examples/multilingual/layouts/chrome/head.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>\r
-<html lang="{{ .Params.lang }}">\r
-<head>\r
-       <meta charset="utf-8">\r
-       {{ if .Title }}\r
-               {{ if (eq .Params.lang "et") }}\r
-               <title>Mitmekeelne - {{ .Title }}</title>\r
-               {{ else }}\r
-               <title>Multilingual - {{ .Title }}</title>\r
-               {{ end }}\r
-       {{ end }}\r
-       <meta name="viewport" content="width=device-width, initial-scale=1">\r
-       <link rel="stylesheet" href="/static/main.css">\r
-</head>\r
-<body>
\ No newline at end of file
diff --git a/examples/multilingual/layouts/chrome/header.html b/examples/multilingual/layouts/chrome/header.html
deleted file mode 100644 (file)
index b99b2fb..0000000
--- a/examples/multilingual/layouts/chrome/header.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<header>\r
-       <nav class="menu language-menu">\r
-               <ul>\r
-                       <li><a href="/">English</a></li>\r
-                       <li><a href="/kodu">Eesti</a></li>\r
-               </ul>\r
-               <div class="clear"></div>\r
-       </nav>\r
-\r
-       {{ if (eq .Params.lang "et") }}\r
-       <h1 class="title">Minu mitmekeelne leht</h1>\r
-       {{ else }}\r
-       <h1 class="title">My multilingual site</h1>\r
-       {{ end }}\r
-       \r
-       <nav class="menu main-menu">\r
-               <ul>\r
-                       {{ range (index .Site.Indexes.menu .Params.lang).Pages }}\r
-                       <li><a href="{{ .Permalink  }}">{{ .LinkTitle }}</a></li>\r
-                       {{ end }}\r
-               </ul>\r
-       </nav>\r
-</header>\r
-\r
-<h2 class="subtitle">{{ .Title }}</h2>
\ No newline at end of file
diff --git a/examples/multilingual/layouts/partials/footer.html b/examples/multilingual/layouts/partials/footer.html
new file mode 100644 (file)
index 0000000..2630b2e
--- /dev/null
+++ b/examples/multilingual/layouts/partials/footer.html
@@ -0,0 +1,3 @@
+       <footer>(Ↄ) 2013 Egon Elbre</footer>\r
+</body>\r
+</html>
\ No newline at end of file
diff --git a/examples/multilingual/layouts/partials/head.html b/examples/multilingual/layouts/partials/head.html
new file mode 100644 (file)
index 0000000..f89e3ff
--- /dev/null
+++ b/examples/multilingual/layouts/partials/head.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>\r
+<html lang="{{ .Params.lang }}">\r
+<head>\r
+       <meta charset="utf-8">\r
+       {{ if .Title }}\r
+               {{ if (eq .Params.lang "et") }}\r
+               <title>Mitmekeelne - {{ .Title }}</title>\r
+               {{ else }}\r
+               <title>Multilingual - {{ .Title }}</title>\r
+               {{ end }}\r
+       {{ end }}\r
+       <meta name="viewport" content="width=device-width, initial-scale=1">\r
+       <link rel="stylesheet" href="/static/main.css">\r
+</head>\r
+<body>
\ No newline at end of file
diff --git a/examples/multilingual/layouts/partials/header.html b/examples/multilingual/layouts/partials/header.html
new file mode 100644 (file)
index 0000000..a244b8b
--- /dev/null
+++ b/examples/multilingual/layouts/partials/header.html
@@ -0,0 +1,25 @@
+<header>\r
+       <nav class="menu language-menu">\r
+               <ul>\r
+                       <li><a href="/">English</a></li>\r
+                       <li><a href="/kodu">Eesti</a></li>\r
+               </ul>\r
+               <div class="clear"></div>\r
+       </nav>\r
+\r
+       {{ if (eq .Params.lang "et") }}\r
+       <h1 class="title">Minu mitmekeelne leht</h1>\r
+       {{ else }}\r
+       <h1 class="title">My multilingual site</h1>\r
+       {{ end }}\r
+\r
+       <nav class="menu main-menu">\r
+               <ul>\r
+                       {{ range (index .Site.Indexes.menu .Params.lang).Pages }}\r
+                       <li><a href="{{ .Permalink  }}">{{ .LinkTitle }}</a></li>\r
+                       {{ end }}\r
+               </ul>\r
+       </nav>\r
+</header>\r
+\r
+<h2 class="subtitle">{{ .Title }}</h2>\r
diff --git a/examples/multilingual/layouts/story/list.html b/examples/multilingual/layouts/story/list.html
index 0173244f7d29ce48dbfa2e70f32f34c73c251fee..a753577d58db9a5267db78d2fcf9a0b8d695300b 100644 (file)
--- a/examples/multilingual/layouts/story/list.html
+++ b/examples/multilingual/layouts/story/list.html
@@ -1,5 +1,5 @@
-{{ template "chrome/head.html" . }}\r
-{{ template "chrome/header.html" . }}\r
+{{ partial "head.html" . }}\r
+{{ partial "header.html" . }}\r
 {{ range .Site.Indexes.groups.news.Pages }}\r
 <article class="post">\r
        <header>\r
@@ -12,4 +12,4 @@
        </footer>\r
 </article>\r
 {{ end }}\r
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ partial "footer.html" . }}\r
diff --git a/examples/multilingual/layouts/uudis/list.html b/examples/multilingual/layouts/uudis/list.html
index 970a48bfbadb6af21298a2e56b09d7e475d43ac7..23c0daec8eb5ca4a731a331f718bc6b234540c6f 100644 (file)
--- a/examples/multilingual/layouts/uudis/list.html
+++ b/examples/multilingual/layouts/uudis/list.html
@@ -1,5 +1,5 @@
-{{ template "chrome/head.html" . }}\r
-{{ template "chrome/header.html" . }}\r
+{{ partial "head.html" . }}\r
+{{ partial "header.html" . }}\r
 {{ range .Site.Indexes.groups.uudised.Pages }}\r
 <article class="post">\r
        <header>\r
@@ -12,4 +12,4 @@
        </footer>\r
 </article>\r
 {{ end }}\r
-{{ template "chrome/footer.html" . }}
\ No newline at end of file
+{{ partial "footer.html" . }}\r
Unnamed repository; edit this file 'description' to name the repository.