Merge branch 'release/1.5.0'

getgrav · Jul 14, 2016 · cd010aa · cd010aa
2 parents 726f70b + db79bdb
commit cd010aa
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.5.0
+## 07/14/2015
+
+1. [](#improved)
+    * Translate some blueprint configuration options
+    * Allow translating the error message
+    * Added french, russian, romanian, danish, italian
+
 # v1.4.1
 ## 12/11/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Error
-version: 1.4.1
+version: 1.5.0
 description: Displays the error page.
 icon: warning
 author:
@@ -16,12 +16,12 @@ form:
   fields:
     enabled:
       type: toggle
-      label: Plugin status
+      label: PLUGIN_ADMIN.PLUGIN_STATUS
       highlight: 1
       default: 0
       options:
-        1: Enabled
-        0: Disabled
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
       validate:
         type: bool
 

diff --git a/languages.yaml b/languages.yaml
@@ -0,0 +1,25 @@
+en:
+  PLUGIN_ERROR:
+    ERROR: "Error"
+    ERROR_MESSAGE: "Woops. Looks like this page doesn't exist."
+ro:
+  PLUGIN_ERROR:
+    ERROR: "Eroare"
+    ERROR_MESSAGE: "Ooops. Se pare că pagina nu există."    
+
+fr:
+  PLUGIN_ERROR:
+    ERROR: "Erreur"
+    ERROR_MESSAGE: "Oups. Il semble que cette page n’existe pas."
+it:
+  PLUGIN_ERROR:
+    ERROR: "Errore"
+    ERROR_MESSAGE: "Ooops. A quanto pare, questa pagina non esiste."
+ru:
+  PLUGIN_ERROR:
+    ERROR: "Ошибка"
+    ERROR_MESSAGE: "Упс. Похоже, эта страница не существует."
+da:
+  PLUGIN_ERROR:
+    ERROR: "Fejl"
+    ERROR_MESSAGE: "Ups. Det ser ud til at siden ikke eksisterer."
diff --git a/pages/error.md b/pages/error.md
@@ -4,5 +4,9 @@ robots: noindex,nofollow
 template: error
 routable: false
 http_response_code: 404
+process:
+	twig: true
 ---
-Woops. Looks like this page doesn't exist.
+
+{{ 'PLUGIN_ERROR.ERROR_MESSAGE'|t }}
+
diff --git a/templates/error.html.twig b/templates/error.html.twig
@@ -1,3 +1,3 @@
-<h1>Error {{ header.http_response_code }}</h1>
+<h1>{{ 'PLUGIN_ERROR.ERROR'|t }} {{ header.http_response_code }}</h1>
 
 <p>{{ page.content }}</p>