Merge branch 'release/1.6.0'

getgrav · Jul 14, 2016 · a615cf5 · a615cf5
2 parents da5aeb8 + 3976971
commit a615cf5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v1.6.0
+## 07/14/2016
+
+1. [](#new)
+    * Added the spanish language
+1. [](#improved)
+    * Remove unneeded streams from Theme YAML
+    * Set the page language from Grav's Language configuration. Default to english.
+1. [](#bugfix)
+    * Fix an issue on iOS 9+ Safari scaling
+
 # v1.5.0
 ## 01/06/2016
 
@@ -8,7 +19,6 @@
 1. [](#bugfix)
     * Fixed a typo in CSS
 
-
 # v1.4.2
 ## 12/18/2015
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Learn2
-version: 1.5.0
+version: 1.6.0
 description: "Learn2 is a new modern documentation theme for Grav"
 icon: book
 author:

diff --git a/languages.yaml b/languages.yaml
@@ -4,6 +4,12 @@ en:
     THEME_LEARN2_CLEAR_HISTORY: Clear History
     THEME_LEARN2_BUILT_WITH_GRAV: Built with <a href="http://getgrav.org">Grav</a> - The Modern Flat File CMS
     THEME_LEARN2_SEARCH_DOCUMENTATION: Search Documentation
+es:
+    THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: editar esta página
+    THEME_LEARN2_GITHUB_NOTE: ¿Encontraste errores? ¿Crees que puedes mejorar esta documentación?
+    THEME_LEARN2_CLEAR_HISTORY: Limpiar historial
+    THEME_LEARN2_BUILT_WITH_GRAV: Hecho con <a href="http://getgrav.org">Grav</a> - El CMS moderno de archivos planos
+    THEME_LEARN2_SEARCH_DOCUMENTATION: Buscar en la documentación
 de:
     THEME_LEARN2_GITHUB_EDIT_THIS_PAGE: diese Seite bearbeiten
     THEME_LEARN2_GITHUB_NOTE: Fehler gefunden? Möchten Sie diese Seite verbessern?

diff --git a/learn2.yaml b/learn2.yaml
@@ -7,10 +7,3 @@ github:
     position: top                                   # top | bottom | off
     tree: https://github.com/getgrav/grav-skeleton-rtfm-site/blob/develop/
     commits: https://github.com/getgrav/grav-skeleton-rtfm-site/commits/develop/
-
-streams:
-  schemes:
-    theme:
-      type: ReadOnlyStream
-      paths:
-        - user/themes/learn2
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,12 +1,12 @@
 {% set theme_config = attribute(config.themes, config.system.pages.theme) %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{{ grav.language.getLanguage ?: 'en' }}">
 <head>
     {% block head %}
     <meta charset="utf-8" />
     <title>{% if header.title %}{{ header.title }} | {% endif %}{{ site.title }}</title>
     {% include 'partials/metadata.html.twig' %}
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" />
     <link rel="alternate" type="application/atom+xml" href="{{ base_url_absolute}}/feed:atom" title="Atom Feed" />
     <link rel="alternate" type="application/rss+xml" href="{{ base_url_absolute}}/feed:rss" title="RSS Feed" />
     <link rel="icon" type="image/png" href="{{ url('theme://images/favicon.png') }}">