Merge branch 'release/1.5.1'

getgrav · Jul 18, 2016 · 3233fba · 3233fba
2 parents cd010aa + 064f24d
commit 3233fba
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.5.1
+## 07/18/2016
+
+1. [](#improved)
+    * Added chinese and german translations
+1. [](#bugfix)
+    * Fixed issue with the Smartypants plugin running before Twig was processed
+
 # v1.5.0
 ## 07/14/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Error
-version: 1.5.0
+version: 1.5.1
 description: Displays the error page.
 icon: warning
 author:

diff --git a/languages.yaml b/languages.yaml
@@ -2,11 +2,14 @@ en:
   PLUGIN_ERROR:
     ERROR: "Error"
     ERROR_MESSAGE: "Woops. Looks like this page doesn't exist."
+de:
+  PLUGIN_ERROR:
+    ERROR: "Fehler"
+    ERROR_MESSAGE: "Uuups. Sieht aus als ob diese Seite nicht existiert."    
 ro:
   PLUGIN_ERROR:
     ERROR: "Eroare"
     ERROR_MESSAGE: "Ooops. Se pare că pagina nu există."    
-
 fr:
   PLUGIN_ERROR:
     ERROR: "Erreur"
@@ -23,3 +26,7 @@ da:
   PLUGIN_ERROR:
     ERROR: "Fejl"
     ERROR_MESSAGE: "Ups. Det ser ud til at siden ikke eksisterer."
+zh:
+  PLUGIN_ERROR:
+    ERROR: "错误"
+    ERROR_MESSAGE: "呃，似乎这个页面不存在。"
diff --git a/pages/error.md b/pages/error.md
@@ -4,6 +4,7 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+twig_first: true
 process:
 	twig: true
 ---