Set default release to testing during RC

Discussed with @mahagr.

Saved YAML configs gave undesired extra parameter (!!float 1 for example) because floats were not being cast back to integers upon save. This was even true when the filterNumber function was giving back a correct parameter. filter_var from validateFloat was actually perserving the float variable type which the YAML engine perserved upon Yaml::dump.

This is a unconventional fix, but it is the simplest way to handle this edge case.

.dependencies

@@ -2,15 +2,19 @@ git:
     problems:
         url: https://github.com/getgrav/grav-plugin-problems
         path: user/plugins/problems
-        branch: develop
+        branch: master
     error:
         url: https://github.com/getgrav/grav-plugin-error
         path: user/plugins/error
-        branch: develop
+        branch: master
+    markdown-notices:
+        url: https://github.com/getgrav/grav-plugin-markdown-notices
+        path: user/plugins/markdown-notices
+        branch: master
     antimatter:
         url: https://github.com/getgrav/grav-theme-antimatter
         path: user/themes/antimatter
-        branch: develop
+        branch: master
 links:
     problems:
         src: grav-plugin-problems
@@ -20,6 +24,10 @@ links:
         src: grav-plugin-error
         path: user/plugins/error
         scm: github
+    markdown-notices:
+        src: grav-plugin-markdown-notices
+        path: user/plugins/markdown-notices
+        scm: github
     antimatter:
         src: grav-theme-antimatter
         path: user/themes/antimatter

.gitignore

@@ -1,7 +1,7 @@
 # Composer
-composer.lock
 .composer
-vendor/
+vendor/*
+!*/vendor/*
 
 # Sass
 .sass-cache
@@ -17,12 +17,16 @@ logs/*
 !logs/.*
 images/*
 !images/.*
+user/accounts/*
+!user/accounts/.*
 user/data/*
 !user/data/.*
 user/plugins/*
 !user/plugins/.*
 user/themes/*
 !user/themes/.*
+user/localhost/config/security.yaml
+user/config/security.yaml
 
 # OS Generated
 .DS_Store*
@@ -33,3 +37,9 @@ Thumbs.db
 
 # phpstorm
 .idea/*
+user/config/security.yaml
+
+tests/_output/*
+tests/_support/_generated/*
+tests/cache/*
+tests/error.log

.htaccess

@@ -3,7 +3,7 @@
 RewriteEngine On
 
 ## Begin RewriteBase
-# If you are getting 404 errors on subpages, you may have to uncomment the RewriteBase entry
+# If you are getting 500 or 404 errors on subpages, you may have to uncomment the RewriteBase entry
 # You should change the '/' to your appropriate subfolder. For example if you have
 # your Grav install at the root of your site '/' should work, else it might be something
 # along the lines of: RewriteBase /<your_sub_folder>
@@ -13,6 +13,16 @@ RewriteEngine On
 
 ## End - RewriteBase
 
+## Begin - X-Forwarded-Proto
+# In some hosted or load balanced environments, SSL negotiation happens upstream.
+# In order for Grav to recognize the connection as secure, you need to uncomment
+# the following lines.
+#
+# RewriteCond %{HTTP:X-Forwarded-Proto} https
+# RewriteRule .* - [E=HTTPS:on]
+#
+## End - X-Forwarded-Proto
+
 ## Begin - Exploits
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav
@@ -44,13 +54,22 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(cache|bin|logs|backup)/(.*) error [L]
-# Block access to specific file types for these folders
-RewriteRule ^(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$ error [L]
+RewriteRule ^(.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
+# Block access to specific file types for these system folders
+RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+# Block access to specific file types for these user folders
+RewriteRule ^(user)/(.*)\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+# Block all direct access to .md files:
+RewriteRule \.md$ error [F]
+# Block all direct access to files and folders beginning with a dot
+RewriteRule (^|/)\.(?!well-known) - [F]
+# Block access to specific files in the root folder
+RewriteRule ^(LICENSE.txt|composer.lock|composer.json|\.htaccess)$ error [F]
 ## End - Security
 
 </IfModule>
 
-# Begin - Prevent Browsing
+# Begin - Prevent Browsing and Set Default Resources
 Options -Indexes
-# End - Prevent Browsing
+DirectoryIndex index.php index.html index.htm
+# End - Prevent Browsing and Set Default Resources

.travis.yml

@@ -1,7 +1,12 @@
 language: php
-php: 5.6
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
 branches:
   only:
+    - develop
     - master
     - build_test
 notifications:
@@ -13,8 +18,10 @@ notifications:
     rooms:
       - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
     template:
-      - '%{repository}#%{build_number} (%{branch}): Grav Core and Skeletons packages have been uploaded. (<a href="%{build_url}">Details</a>)'
+      - '%{repository}#%{build_number} (%{branch}): Travis Job Finished [%{duration}] (<a href="%{build_url}">Details</a>)'
     format: html
+  slack:
+    secure: dowksPsxxCxGKT6nis5hUgkp6+ZDAhoqzQHF9rJnx4hx0iEygPhVBs7pKl9yL2jubYJoLs+EXwE7z1dYgDAEJh4BnfrCokCMLpFGcxVxQC/HeAUdSQ2/RtdBYR5PRT75ScaFpqM/SfXXZVtnwVXAw9Z+JC6BjQ9vmn23m51Jw4k=
 env:
   global:
     # Colors!
@@ -35,32 +42,50 @@ env:
     # BB_TOKEN value => "user:pass@"
     - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k="
     # GH_API_USER [for curl]
-    - secure: "Xbk/V9aIys0NxccJGR3Zrm2GRxDnA0RuazBs1puIboTYDhbi0Z7JTL+mOx3xp5Kfoniad/xAuijQESTM9MMrKqq/qCzhAMaC1+vcL4pCHZH4NSG6DBxB9BPkKVFq+1llu5FTEf8bkxHzwGR0l1ARW6TVRcgTHr5B58bCEIwEOrI="
-    # Latest Release version
-    - TRAVIS_TAG=$(curl --fail --user ${GH_API_USER} -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4)
+    - secure: "AQGcX1B2NrI8ajflY4AimZDNcK2kBA3F6mbtEFQ78NkDoWhMipsQHayWXiSTzRc0YJKvQl2Y16MTwQF4VHzjTAiiZFATgA8J88vQUjIPabi/kKjqSmcLFoaAOAxStQbW6e0z2GiQ6KBMcNF1y5iUuI63xVrBvtKrYX/w5y+ako8="
 
 before_install:
+  - export TZ=Pacific/Honolulu
+  - echo $TRAVIS_PHP_VERSION
+  - echo $TRAVIS_BRANCH
+  - echo $TRAVIS_PULL_REQUEST
   - composer self-update
-  - go get github.com/aktau/github-release
-  - git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
-  - if [ ! -z "$TRAVIS_TAG" ]; then
-      cd "${RT_DEVTOOLS}";
-      ./build-grav.sh skeletons.txt;
+  - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
+        composer install --dev --prefer-dist;
     fi
+  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        export TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
+        go get github.com/aktau/github-release;
+        git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
+        if [ ! -z "$TRAVIS_TAG" ]; then
+            cd ${RT_DEVTOOLS};
+            ./build-grav.sh skeletons.txt;
+        fi;
+    fi
+before_script:
+    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
 script:
-  - if [ ! -z "$TRAVIS_TAG" ]; then
+  - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
+        vendor/bin/codecept run;
+    fi
+  - echo "Latest Release Tag - ${TRAVIS_TAG}"
+  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do
         NAME=${file##*/};
-        REPO="$(echo ${NAME} | rev | cut -f 2- -d "-" | rev)";
-        if [[ $REPO == 'grav' || $REPO == 'grav-update' ]]; then
+        if [[ "$NAME" == *"-rc"* ]]; then
+            REPO="$(echo ${NAME} | rev | cut -f 3- -d "-" | rev)";
+        else
+            REPO="$(echo ${NAME} | rev | cut -f 2- -d "-" | rev)";
+        fi;
+        if [[ $REPO == 'grav' || $REPO == 'grav-admin' || $REPO == 'grav-update' ]]; then
           REPO="grav";
         fi;
         API="$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/${GH_USER}/${REPO}/releases/latest)";
         ASSETS="$(echo "${API}" | node gh-assets.js)";
         TAG="$(echo "${API}" | grep tag_name | head -n 1 | cut -d '"' -f 4)";
         if [ $REPO == "grav" ]; then
-          TAG=$TRAVIS_TAG;
+          TAG="$TRAVIS_TAG";
         fi;
         if [ ! -z "$ASSETS" ]; then
           for asset in ${ASSETS[@]}; do
@@ -73,6 +98,6 @@ script:
           done;
         fi;
         echo "Uploading package ${BOLD}${BLUE}${NAME}${TEXTRESET} to ${YELLOW}${REPO}${TEXTRESET}@${YELLOW}${TAG}${TEXTRESET}";
-        github-release upload --security-token $GH_TOKEN --user ${GH_USER} --repo $REPO --tag $TAG --name "$NAME" --file "$file";
+        github-release upload --security-token $GH_TOKEN --user ${GH_USER} --repo $REPO --tag "$TAG" --name "$NAME" --file "$file";
       done;
     fi

CONTRIBUTING.md

@@ -0,0 +1,124 @@
+# Contributing to Grav
+
+:+1::tada: First, thanks for getting involved with Grav! :tada::+1:
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+## Grav, Plugins, Themes and Skeletons
+
+Grav is a large open source project—it's made up of over 100 repositories. When you initially consider contributing to Grav, you might be unsure about which of those 200 repositories implements the functionality you want to change or report a bug for.
+
+[https://github.com/getgrav/grav](https://github.com/getgrav/grav) is the main Grav repository. The core of Grav is provided by this repo.
+
+[https://github.com/getgrav/grav-plugin-admin](https://github.com/getgrav/grav-plugin-admin) is the Admin Plugin repository.
+
+Every Plugin and Theme has its own repository. If you have a problem you think is specific to a Theme or Plugin, please report it in its corresponding repository. Please read the Plugin or Theme documentation to ensure the problem is not addressed there already.
+
+Every Skeleton also has its own repository, so if an issue is not specific to a theme or plugin but rather to its usage in the skeleton, report it in the skeleton repository.
+
+## Using the issue tracker
+
+The issue tracker is the preferred channel for [bug reports](#bugs),
+[features requests](#features) and [submitting pull
+requests](#pull-requests), but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for support requests. Use
+  [the Forum](http://getgrav.org/forum) or [the Gitter chat](https://gitter.im/getgrav/grav).
+
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Check you satisfy the Grav requirements** &mdash; [http://learn.getgrav.org/basics/requirements](http://learn.getgrav.org/basics/requirements)
+
+2. **Check this happens on a clean Grav install** &mdash; check if the issue happens on any Grav site, or just with a specific configuration of plugins / theme
+
+3. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+4. **Check if the issue is already being solved in a PR** &mdash; check the open Pull Requests to see if one already solves the problem you're having
+
+5. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `develop` branch in the repository.
+
+6. **Isolate the problem** &mdash; create a [reduced test
+   case](http://css-tricks.com/reduced-test-cases/) and provide a step-by-step instruction set on how to recreate the problem. Include code samples, page snippets or yaml configurations if needed.
+
+7. **Check the problem on Grav 1.1** &mdash; if you're using Grav 1.0, latest stable release, please also check if you can replicate the issue on Grav 1.1 RC as many bugs are already solved in the next Grav release.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report.
+
+What is your environment? Is it localhost, OSX, Linux, on a remote server? Same happening locally and or the server, or just locally or just on Linux?
+
+What steps will reproduce the issue? What browser(s) and OS experience the problem?
+
+What would you expect to be the outcome?
+
+Did the problem start happening recently (e.g. after updating to a new version of Grav) or was this always a problem?
+
+If the problem started happening recently, can you reproduce the problem in an older version of Grav? What's the most recent version in which the problem doesn't happen? You can download older versions of Grav from the releases page on Github.
+
+Can you reliably reproduce the issue? If not, provide details about how often the problem happens and under which conditions it normally happens.
+
+
+All these details will help people to fix any potential bugs.
+
+Important: [include Code Samples in triple backticks](https://help.github.com/articles/github-flavored-markdown/#fenced-code-blocks) so that Github will provide a proper indentation. [Add the language name after the backticks](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting) to add syntax highlighting to the code snippets.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** in Gitter or in the Forum before embarking on any significant pull request (e.g.
+implementing features, refactoring code..),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout the project (indentation,
+accurate comments, etc.) and any other requirements.
+
+See [Using Pull Request](https://help.github.com/articles/using-pull-requests/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) if you're not familiar with Pull Requests.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
+license your work under the same license as that used by the project.

README.md

@@ -1,28 +1,41 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Slack](https://grav-chat.now.sh/badge.svg)](https://chat.getgrav.org) [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
-The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies, to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
+The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
 
 * [Twig Templating](http://twig.sensiolabs.org/): for powerful control of the user interface
 * [Markdown](http://en.wikipedia.org/wiki/Markdown): for easy content creation
 * [YAML](http://yaml.org): for simple configuration
-* [Parsedown](http://parsedown.org/): for fast Markdown and Mardown Extra support
-* [Doctrine Cache](http://docs.doctrine-project.org/en/2.0.x/reference/caching.html): layer for performance
+* [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
+* [Doctrine Cache](http://doctrine-orm.readthedocs.io/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
 * [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
-* [Symfony Event Dispacher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
 * [Symfony Console](http://symfony.com/doc/current/components/console/introduction.html): for CLI interface
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
+# Requirements
+
+- PHP 5.5.9 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
+- Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
+
 # QuickStart
 
-You have two options to get Grav:
+These are the options to get Grav:
 
 ### Downloading a Grav Package
 
-You can download a **ready-built** package from the [Downloads page on http://getgrav.org](http://getgrav.org/downloads)
+You can download a **ready-built** package from the [Downloads page on https://getgrav.org](https://getgrav.org/downloads)
+
+### With Composer
+
+You can create a new project with the latest **stable** Grav release with the following command:
+
+```
+$ composer create-project getgrav/grav ~/webroot/grav
+```
 
 ### From GitHub
 
@@ -32,23 +45,23 @@ You can download a **ready-built** package from the [Downloads page on http://ge
    $ git clone https://github.com/getgrav/grav.git
    ```
 
-2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](http://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
+2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](https://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
    ```
    $ cd ~/webroot/grav
    $ bin/grav install
    ```
 
-Check out the [install procedures](http://learn.getgrav.org/basics/installation) for more information.
+Check out the [install procedures](https://learn.getgrav.org/basics/installation) for more information.
 
 # Adding Functionality
 
-You can download manually from the [Downloads page on http://getgrav.org](http://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+You can download [plugins](https://getgrav.org/downloads/plugins) or [themes](https://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on https://getgrav.org](https://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm index
 ```
 
-This will display all the available plugins and then you can install one ore more with:
+This will display all the available plugins and then you can install one or more with:
 
 ```
 $ bin/gpm install <plugin/theme>
@@ -56,7 +69,7 @@ $ bin/gpm install <plugin/theme>
 
 # Updating
 
-To update Grav you should use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+To update Grav you should use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm selfupgrade
@@ -71,7 +84,7 @@ $ bin/gpm update
 
 # Contributing
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement.
-However, we ask that any contribution follow our simple guidelines in order to be properly received.
+However, we ask that any contributions follow our simple guidelines in order to be properly received.
 
 All our projects follow the [GitFlow branching model][gitflow-model], from development to release. If you are not familiar with it, there are several guides and tutorials to make you understand what it is about.
 
@@ -84,22 +97,98 @@ What you mainly want to know is that:
 
 # Getting Started
 
-* [What is Grav?](http://learn.getgrav.org/basics/what-is-grav)
-* [Install](http://learn.getgrav.org/basics/installation) Grav in few seconds
-* Understand the [Configuration](http://learn.getgrav.org/basics/grav-configuration)
-* Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons#extras)
-* If you have questions, check out `#grav` on irc.freenode.net
+* [What is Grav?](https://learn.getgrav.org/basics/what-is-grav)
+* [Install](https://learn.getgrav.org/basics/installation) Grav in few seconds
+* Understand the [Configuration](https://learn.getgrav.org/basics/grav-configuration)
+* Take a peek at our available free [Skeletons](https://getgrav.org/downloads/skeletons)
+* If you have questions, jump on our [Slack Room](https://getgrav.org/slack)!
 * Have fun!
 
-# Exploring more
+# Exploring More
 
-* Have a look at our [Basic Tutorial](http://learn.getgrav.org/basics/basic-tutorial)
-* Dive into more [advanced](http://learn.getgrav.org/advanced) functions
+* Have a look at our [Basic Tutorial](https://learn.getgrav.org/basics/basic-tutorial)
+* Dive into more [advanced](https://learn.getgrav.org/advanced) functions
+
+# Backers
+Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/grav#backer)]
+
+<a href="https://opencollective.com/grav/backer/0/website" target="_blank"><img src="https://opencollective.com/grav/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/1/website" target="_blank"><img src="https://opencollective.com/grav/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/2/website" target="_blank"><img src="https://opencollective.com/grav/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/3/website" target="_blank"><img src="https://opencollective.com/grav/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/4/website" target="_blank"><img src="https://opencollective.com/grav/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/5/website" target="_blank"><img src="https://opencollective.com/grav/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/6/website" target="_blank"><img src="https://opencollective.com/grav/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/7/website" target="_blank"><img src="https://opencollective.com/grav/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/8/website" target="_blank"><img src="https://opencollective.com/grav/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/9/website" target="_blank"><img src="https://opencollective.com/grav/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/10/website" target="_blank"><img src="https://opencollective.com/grav/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/11/website" target="_blank"><img src="https://opencollective.com/grav/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/12/website" target="_blank"><img src="https://opencollective.com/grav/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/13/website" target="_blank"><img src="https://opencollective.com/grav/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/14/website" target="_blank"><img src="https://opencollective.com/grav/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/15/website" target="_blank"><img src="https://opencollective.com/grav/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/16/website" target="_blank"><img src="https://opencollective.com/grav/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/17/website" target="_blank"><img src="https://opencollective.com/grav/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/18/website" target="_blank"><img src="https://opencollective.com/grav/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/19/website" target="_blank"><img src="https://opencollective.com/grav/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/20/website" target="_blank"><img src="https://opencollective.com/grav/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/21/website" target="_blank"><img src="https://opencollective.com/grav/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/22/website" target="_blank"><img src="https://opencollective.com/grav/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/23/website" target="_blank"><img src="https://opencollective.com/grav/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/24/website" target="_blank"><img src="https://opencollective.com/grav/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/25/website" target="_blank"><img src="https://opencollective.com/grav/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/26/website" target="_blank"><img src="https://opencollective.com/grav/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/27/website" target="_blank"><img src="https://opencollective.com/grav/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/28/website" target="_blank"><img src="https://opencollective.com/grav/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/grav/backer/29/website" target="_blank"><img src="https://opencollective.com/grav/backer/29/avatar.svg"></a>
+
+
+# Sponsors
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/grav#sponsor)]
+
+<a href="https://opencollective.com/grav/sponsor/0/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/1/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/2/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/3/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/4/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/5/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/6/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/7/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/8/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/9/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/10/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/11/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/12/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/13/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/14/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/15/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/16/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/17/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/18/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/19/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/20/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/21/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/22/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/23/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/24/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/25/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/26/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/27/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/28/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/grav/sponsor/29/website" target="_blank"><img src="https://opencollective.com/grav/sponsor/29/avatar.svg"></a>
 
 # License
 
-See [LICENSE](LICENSE)
+See [LICENSE](LICENSE.txt)
 
 
 [gitflow-model]: http://nvie.com/posts/a-successful-git-branching-model/
 [gitflow-extensions]: https://github.com/nvie/gitflow
+
+# Running Tests
+
+First install the dev dependencies by running `composer update` from the Grav root.
+Then `composer test` will run the Unit Tests, which should be always executed successfully on any site.
+
+You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`

bin/gpm

@@ -2,15 +2,12 @@
 <?php
 define('GRAV_CLI', true);
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
 if (!file_exists(__DIR__ . '/../vendor')){
     require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
 }
 
 use Grav\Common\Composer;
+use Grav\Common\Config\Setup;
 
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
@@ -25,6 +22,10 @@ use Grav\Common\Grav;
 
 $autoload = require_once(__DIR__ . '/../vendor/autoload.php');
 
+if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
+    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
+}
+
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -37,11 +38,25 @@ if (!function_exists('curl_version')) {
     exit('FATAL: GPM requires PHP Curl module to be installed');
 }
 
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+$environment = $climate->arguments->get('environment');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
 $grav = Grav::instance(array('loader' => $autoload));
+$grav['uri']->init();
 $grav['config']->init();
 $grav['streams'];
-$grav['plugins']->init();
-$grav['themes']->init();
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
 $app->addCommands(array(
@@ -52,5 +67,7 @@ $app->addCommands(array(
     new \Grav\Console\Gpm\UninstallCommand(),
     new \Grav\Console\Gpm\UpdateCommand(),
     new \Grav\Console\Gpm\SelfupgradeCommand(),
+    new \Grav\Console\Gpm\DirectInstallCommand(),
 ));
+
 $app->run();

bin/grav

@@ -2,10 +2,6 @@
 <?php
 define('GRAV_CLI', true);
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
-}
-
 if (!file_exists(__DIR__ . '/../vendor')){
     require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
 }
@@ -24,6 +20,10 @@ use Symfony\Component\Console\Application;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
+if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
+    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
+}
+
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
@@ -32,14 +32,14 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
-$app = new Application('Grav CLI Application', '0.1.0');
+$app = new Application('Grav CLI Application', GRAV_VERSION);
 $app->addCommands(array(
-    new Grav\Console\Cli\InstallCommand(),
-    new Grav\Console\Cli\ComposerCommand(),
-    new Grav\Console\Cli\SandboxCommand(),
-    new Grav\Console\Cli\CleanCommand(),
-    new Grav\Console\Cli\ClearCacheCommand(),
-    new Grav\Console\Cli\BackupCommand(),
-    new Grav\Console\Cli\NewProjectCommand(),
+    new \Grav\Console\Cli\InstallCommand(),
+    new \Grav\Console\Cli\ComposerCommand(),
+    new \Grav\Console\Cli\SandboxCommand(),
+    new \Grav\Console\Cli\CleanCommand(),
+    new \Grav\Console\Cli\ClearCacheCommand(),
+    new \Grav\Console\Cli\BackupCommand(),
+    new \Grav\Console\Cli\NewProjectCommand(),
 ));
 $app->run();

bin/plugin

@@ -0,0 +1,137 @@
+#!/usr/bin/env php
+<?php
+define('GRAV_CLI', true);
+
+if (!file_exists(__DIR__ . '/../vendor')) {
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+}
+
+use Grav\Common\Composer;
+
+if (!file_exists(__DIR__ . '/../vendor')) {
+    // Before we can even start, we need to run composer first
+    $composer = Composer::getComposerExecutor();
+    echo "Preparing to install vendor dependencies...\n\n";
+    echo system($composer . ' --working-dir="' . __DIR__ . '/../" --no-interaction --no-dev --prefer-dist -o install');
+    echo "\n\n";
+}
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Grav\Common\Grav;
+use Grav\Common\Config\Setup;
+use Grav\Common\Filesystem\Folder;
+
+$autoload = require_once(__DIR__ . '/../vendor/autoload.php');
+
+if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
+    exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
+}
+
+if (!ini_get('date.timezone')) {
+    date_default_timezone_set('UTC');
+}
+
+if (!file_exists(ROOT_DIR . 'index.php')) {
+    exit('FATAL: Must be run from ROOT directory of Grav!');
+}
+
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+$environment = $climate->arguments->get('environment');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
+$grav = Grav::instance(array('loader' => $autoload));
+$grav['uri']->init();
+$grav['config']->init();
+$grav['streams'];
+$grav['plugins']->init();
+$grav['themes']->init();
+
+
+$app     = new Application('Grav Plugins Commands', GRAV_VERSION);
+$pattern = '([A-Z]\w+Command\.php)';
+
+// get arguments and  strip the application name
+if (null === $argv) {
+    $argv = $_SERVER['argv'];
+}
+
+$bin  = array_shift($argv);
+$name = array_shift($argv);
+$argv = array_merge([$bin], $argv);
+
+$input = new ArgvInput($argv);
+
+$plugin = $grav['plugins']->get($name);
+
+$output = new ConsoleOutput();
+$output->getFormatter()->setStyle('red', new OutputFormatterStyle('red', null, array('bold')));
+$output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', null, array('bold')));
+
+if (!$name) {
+    $output->writeln('');
+    $output->writeln("<red>Usage:</red>");
+    $output->writeln("  {$bin} [slug] [command] [arguments]");
+    $output->writeln('');
+    $output->writeln("<red>Example:</red>");
+    $output->writeln("  {$bin} error log -l 1 --trace");
+    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
+
+    if (count($list)) {
+        $available = [];
+        $output->writeln('');
+        $output->writeln('<red>Plugins with CLI available:</red>');
+        foreach ($list as $index => $entry) {
+            $split = explode('/', $entry);
+            $entry = array_shift($split);
+            $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
+
+            if (in_array($entry, $available)) {
+                continue;
+            }
+
+            $available[] = $entry;
+            $output->writeln('  ' . $index . ". <red>" . str_pad($entry, 15) . "</red> <white>${bin} ${entry} list</white>");
+        }
+    }
+
+    exit;
+}
+
+if ($plugin === null) {
+    $output->writeln("<red>Grav Plugin <white>'{$name}'</white> is not installed</red>");
+    exit;
+}
+
+$path = 'plugins://' . $name . '/cli';
+
+try {
+    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
+} catch (\RuntimeException $e) {
+    $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
+    exit;
+}
+
+foreach ($commands as $command_path) {
+    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
+    require_once $full_path;
+
+    $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
+    $command = new $command_class();
+    $app->add($command);
+}
+
+$app->run($input);

codeception.yml

@@ -0,0 +1,16 @@
+actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    support: tests/_support
+    envs: tests/_envs
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+extensions:
+    enabled:
+        - Codeception\Extension\RunFailed
+modules:
+    config:

composer.json

@@ -1,27 +1,40 @@
 {
     "name": "getgrav/grav",
-    "type": "library",
+    "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
     "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
     "homepage": "http://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "twig/twig": "~1.16",
+        "php": ">=5.5.9",
+        "twig/twig": "~1.24",
+        "erusev/parsedown": "dev-master as 1.6.0",
         "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "2.7.3",
-        "symfony/console": "2.7.3",
-        "symfony/event-dispatcher": "2.7.3",
-        "doctrine/cache": "~1.4",
-        "maximebf/debugbar": "dev-master",
-        "filp/whoops": "1.2.*@dev",
+        "symfony/yaml": "~2.8",
+        "symfony/console": "~2.8",
+        "symfony/event-dispatcher": "~2.8",
+        "symfony/var-dumper": "~2.8",
+        "symfony/polyfill-iconv": "~1.0",
+        "doctrine/cache": "~1.5",
+        "filp/whoops": "~2.0",
+        "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
-        "ircmaxell/password-compat": "1.0.*",
-        "mrclay/minify": "~2.2",
+        "gregwar/image": "dev-master#72568cfbeb77515278f2ccb386fc344e874b7ae8",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "1.0.*"
+        "rockettheme/toolbox": "~1.0",
+        "maximebf/debugbar": "~1.10",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-curl": "*",
+        "ext-zip": "*",
+        "league/climate": "^3.2",
+        "antoligy/dom-string-iterators": "^1.0"
+    },
+    "require-dev": {
+        "codeception/codeception": "^2.1",
+        "phpunit/php-code-coverage": "~2.0",
+        "fzaninotto/faker": "^1.5"
     },
     "autoload": {
         "psr-4": {
@@ -31,5 +44,15 @@
     },
     "archive": {
         "exclude": ["VERSION"]
+    },
+    "scripts": {
+        "post-create-project-cmd": "bin/grav install",
+        "test": "vendor/bin/codecept run unit",
+        "test-windows": "vendor\\bin\\codecept run unit"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "1.x-dev"
+        }
     }
 }

index.php

@@ -1,17 +1,32 @@
 <?php
-namespace Grav;
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
-if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
-    throw new \RuntimeException(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
-}
+namespace Grav;
+define('GRAV_PHP_MIN', '5.5.9');
 
 // Ensure vendor libraries exist
 $autoload = __DIR__ . '/vendor/autoload.php';
 if (!is_file($autoload)) {
-    throw new \RuntimeException("Please run: <i>bin/grav install</i>");
+    die("Please run: <i>bin/grav install</i>");
+}
+
+if (PHP_SAPI == 'cli-server') {
+    if (!isset($_SERVER['PHP_CLI_ROUTER'])) {
+        die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER["SERVER_NAME"]}:{$_SERVER["SERVER_PORT"]} system/router.php</pre>");
+    }
 }
 
 use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
+if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
+    die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
+}
 
 // Register the auto-loader.
 $loader = require_once $autoload;
@@ -19,6 +34,12 @@ $loader = require_once $autoload;
 // Set timezone to default, falls back to system if php.ini not set
 date_default_timezone_set(@date_default_timezone_get());
 
+// Set internal encoding if mbstring loaded
+if (!extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+mb_internal_encoding('UTF-8');
+
 // Get the Grav instance
 $grav = Grav::instance(
     array(
@@ -30,7 +51,6 @@ $grav = Grav::instance(
 try {
     $grav->process();
 } catch (\Exception $e) {
-    $grav->fireEvent('onFatalException');
+    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
     throw $e;
 }
-

nginx.conf

@@ -1,88 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-
-	location / {
-	     	root   html;
-             	index  index.php;
-		if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
-	}
-
-	# if you want grav in a sub-directory of your main site 
-	# (for example, example.com/mygrav) then you need this rewrite:
-        location /mygrav {
-            index  index.php;
-            if (!-e $request_filename){ rewrite ^(.*)$ /mygrav/$2 last; }
-            try_files $uri $uri/ /index.php?$args;
-        }
-
-	# if using grav in a sub-directory of your site,
-	# prepend the actual path to each location
-	# for example: /mygrav/images
-	# and: /mygrav/user
-	# and: /mygrav/cache
-	# and so on
- 
-	location /images/ {
-		# Serve images as static
-	}
-
-	location /user {
-	        rewrite ^/user/accounts/(.*)$ /error redirect;
-	        rewrite ^/user/config/(.*)$ /error redirect;
-	        rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
-
-    	location /cache {
-		rewrite ^/cache/(.*) /error redirect;
-    	}
-
-    	location /bin {
-        	rewrite ^/bin/(.*)$ /error redirect;
-    	}
-
-        location /backup {
-        rewrite ^/backup/(.*) /error redirect;
-        }
-
-    	location /system {
-        	rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
-
-    	location /vendor {
-        	rewrite ^/vendor/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
-
-	# Remember to change 127.0.0.1:9000 to the Ip/port
-	# you configured php-cgi.exe to run from
-
-        location ~ \.php$ {
-	    try_files $uri =404;
-            fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass   127.0.0.1:9000;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        fastcgi_params;
-        }
-
-   }
-
-}

robots.txt

@@ -1,2 +1,11 @@
 User-agent: *
-Disallow:
+Disallow: /backup/
+Disallow: /bin/
+Disallow: /cache/
+Disallow: /grav/
+Disallow: /logs/
+Disallow: /system/
+Disallow: /vendor/
+Disallow: /user/
+Allow: /user/pages/
+Allow: /user/themes/

system/assets/whoops.css

@@ -1,110 +1,19 @@
-body {
-    background-color: #eee;
-}
-
 body header {
-    background: #349886;
-    border-left: 8px solid #29796B;
+    background: #8552A2;
 }
 
-body .clipboard {
-    width: 28px;
-    height: 28px;
-    background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcAQMAAABIw03XAAAAA3NCSVQICAjb4U/gAAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzbovLKMAAAAFnRFWHRDcmVhdGlvbiBUaW1lADEwLzE1LzE0xr/LJAAAADhJREFUCJlj+P///wcGBPGDQR5E8OMi2IEEczOIaAQRHSCioQBGHAAR/7AT/z+DiA8MMALVXhABAJf9Sr5aY+UFAAAAAElFTkSuQmCC);
+body .left-panel {
+    background: inherit;
 }
 
 body .exc-title-primary {
-    color: #1C3631;
-    text-shadow: none;
+    color: #fff;
 }
 
 body .exc-title {
-    color: #2F5B52;
-    text-shadow: none;
-}
-
-body .data-table-container label {
-    color: #0082BA;
-}
-
-body .frame {
-    border: 0;
-}
-
-body .frames-container {
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-
-body .active .frame-class {
-    color: #E3D8E9;
-}
-
-body .frame-class {
-    color: #9055AF;
-}
-
-body .frame.active {
-    border: 0;
-    box-shadow: none;
-    background-color: #9055AF;
+    color: #ddd;
 }
 
 body .frame:not(.active):hover {
-    background: #e9e9e9;
-}
-
-body .frame-file, body .data-table tbody {
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 13px;
-}
-
-body .frame-code {
-    background: #305669;
-    border-left: 8px solid #253A47;
-    padding: 1rem;
-}
-
-body .frame-code .frame-file {
-    background: #253A47;
-    color: #eee;
-    text-shadow: none;
-    box-shadow: none;
-    font-family: inherit;
-}
-
-body .frame-code .frame-file strong {
-    color: #fff;
-    font-weight: normal;
-}
-
-body .frame-comments {
-    background: #283E4D;
-
-    box-shadow: none;
-}
-
-body .frame-comments.empty:before {
-    color: #789AAB;
-}
-
-body .details-container {
-    border: 0;
-}
-
-body .details {
-    background-color: #eee;
-    border-left: 8px solid #ddd;
-    padding: 1rem;
-}
-
-body .code-block {
-    background: #2C4454;
-    box-shadow: none;
-    font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
-    font-size: 13px;
-}
-
-body .handler.active {
-    background: #666;
+    background: #e6e6e6;
 }

system/blueprints/config/media.yaml

@@ -1,4 +1,4 @@
-title: Media
+title: PLUGIN_ADMIN.MEDIA
 
 form:
   validation: loose

system/blueprints/config/site.yaml

@@ -1,113 +1,124 @@
-title: Site
+title: PLUGIN_ADMIN.SITE
 form:
     validation: loose
     fields:
 
         content:
             type: section
-            title: Defaults
+            title: PLUGIN_ADMIN.DEFAULTS
+            underline: true
 
             fields:
                 title:
                     type: text
-                    label: Site Title
+                    label: PLUGIN_ADMIN.SITE_TITLE
                     size: large
-                    placeholder: "Site wide title"
-                    help: "Default title for your site, often used in themes"
+                    placeholder: PLUGIN_ADMIN.SITE_TITLE_PLACEHOLDER
+                    help: PLUGIN_ADMIN.SITE_TITLE_HELP
+
+                default_lang:
+                    type: text
+                    label: PLUGIN_ADMIN.SITE_DEFAULT_LANG
+                    size: vsmall
+                    placeholder: PLUGIN_ADMIN.SITE_DEFAULT_LANG_PLACEHOLDER
+                    help: PLUGIN_ADMIN.SITE_DEFAULT_LANG_HELP
 
                 author.name:
                     type: text
                     size: large
-                    label: Default Author
-                    help: "A default author name, often used in themes or page content"
+                    label: PLUGIN_ADMIN.DEFAULT_AUTHOR
+                    help: PLUGIN_ADMIN.DEFAULT_AUTHOR_HELP
 
                 author.email:
                     type: text
                     size: large
-                    label: Default Email
-                    help: "A default email to reference in themes or pages"
+                    label: PLUGIN_ADMIN.DEFAULT_EMAIL
+                    help: PLUGIN_ADMIN.DEFAULT_EMAIL_HELP
                     validate:
                         type: email
 
                 taxonomies:
                     type: selectize
                     size: large
-                    label: Taxonomy Types
+                    label: PLUGIN_ADMIN.TAXONOMY_TYPES
                     classes: fancy
-                    help: "Taxonomy types must be defined here if you wish to use them in pages"
+                    help: PLUGIN_ADMIN.TAXONOMY_TYPES_HELP
                     validate:
                         type: commalist
 
         summary:
             type: section
-            title: Page Summary
+            title: PLUGIN_ADMIN.PAGE_SUMMARY
+            underline: true
 
             fields:
                 summary.enabled:
                     type: toggle
-                    label: Enabled
+                    label: PLUGIN_ADMIN.ENABLED
                     highlight: 1
-                    help: "Enable page summary (the summary returns the same as the page content)"
+                    help: PLUGIN_ADMIN.ENABLED_HELP
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 summary.size:
                     type: text
                     size: x-small
-                    label: Summary Size
-                    help: "The amount of characters of a page to use as a content summary"
+                    append: PLUGIN_ADMIN.CHARACTERS
+                    label: PLUGIN_ADMIN.SUMMARY_SIZE
+                    help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP
                     validate:
-                    type: int
-                    min: 0
-                    max: 65536
+                        type: int
+                        min: 0
+                        max: 65536
 
                 summary.format:
                     type: toggle
-                    label: Format
+                    label: PLUGIN_ADMIN.FORMAT
                     classes: fancy
-                    help: "short = use the first occurrence of delimiter or size; long = summary delimiter will be ignored"
+                    help: PLUGIN_ADMIN.FORMAT_HELP
                     highlight: short
                     options:
-                        'short': 'Short'
-                        'long': 'Long'
+                        'short': PLUGIN_ADMIN.SHORT
+                        'long': PLUGIN_ADMIN.LONG
 
                 summary.delimiter:
                     type: text
                     size: x-small
-                    label: Delimiter
-                    help: "The summary delimiter (default '===')"
+                    label: PLUGIN_ADMIN.DELIMITER
+                    help: PLUGIN_ADMIN.DELIMITER_HELP
 
         metadata:
             type: section
-            title: Metadata
+            title: PLUGIN_ADMIN.METADATA
+            underline: true
 
             fields:
                 metadata:
                    type: array
-                   label: Metadata
-                   help: "Default metadata values that will be displayed on every page unless overridden by the page"
-                   placeholder_key: Name
-                   placeholder_value: Content
-
+                   label: PLUGIN_ADMIN.METADATA
+                   help: PLUGIN_ADMIN.METADATA_HELP
+                   placeholder_key: PLUGIN_ADMIN.METADATA_KEY
+                   placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
 
         routes:
             type: section
-            title: Redirects & Routes
+            title: PLUGIN_ADMIN.REDIRECTS_AND_ROUTES
+            underline: true
 
             fields:
                 redirects:
                     type: array
-                    label: Custom Redirects
-                    help: "routes to redirect to other pages. Standard Regex replacement is valid"
-                    placeholder_key: /your/alias
-                    placeholder_value: /your/redirect
+                    label: PLUGIN_ADMIN.CUSTOM_REDIRECTS
+                    help: PLUGIN_ADMIN.CUSTOM_REDIRECTS_HELP
+                    placeholder_key: PLUGIN_ADMIN.CUSTOM_REDIRECTS_PLACEHOLDER_KEY
+                    placeholder_value: PLUGIN_ADMIN.CUSTOM_REDIRECTS_PLACEHOLDER_VALUE
 
                 routes:
                     type: array
-                    label: Custom Routes
-                    help: "routes to alias to other pages. Standard Regex replacement is valid"
-                    placeholder_key: /your/alias
-                    placeholder_value: /your/route
+                    label: PLUGIN_ADMIN.CUSTOM_ROUTES
+                    help: PLUGIN_ADMIN.CUSTOM_ROUTES_HELP
+                    placeholder_key: PLUGIN_ADMIN.CUSTOM_ROUTES_PLACEHOLDER_KEY
+                    placeholder_value: PLUGIN_ADMIN.CUSTOM_ROUTES_PLACEHOLDER_VALUE

system/blueprints/config/streams.yaml

@@ -1,7 +1,8 @@
-title: File Streams
+title: PLUGIN_ADMIN.FILE_STREAMS
 
 form:
   validation: loose
+  hidden: true
   fields:
     schemes.xxx:
       type: array

system/blueprints/pages/default.yaml

@@ -1,10 +1,10 @@
-title: Default
+title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -18,122 +18,91 @@ form:
       fields:
         content:
           type: tab
-          title: Content
+          title: PLUGIN_ADMIN.CONTENT
 
           fields:
             header.title:
               type: text
+              autofocus: true
               style: vertical
-              label: Title
+              label: PLUGIN_ADMIN.TITLE
 
             content:
                 type: markdown
-                label: Content
                 validate:
                   type: textarea
 
             uploads:
-              type: uploads
-              label: Page Media
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
 
         options:
           type: tab
-          title: Options
+          title: PLUGIN_ADMIN.OPTIONS
 
           fields:
 
             publishing:
               type: section
-              title: Publishing
+              title: PLUGIN_ADMIN.PUBLISHING
               underline: true
 
               fields:
                 header.published:
                   type: toggle
-                  label: Published
-                  help: "By default, a page is published unless you explicitly set published: false or via a publish_date being in the future, or unpublish_date in the past"
+                  toggleable: true
+                  label: PLUGIN_ADMIN.PUBLISHED
+                  help: PLUGIN_ADMIN.PUBLISHED_HELP
                   highlight: 1
                   size: medium
                   options:
-                    '': Global
-                    1: Yes
-                    0: No
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
                   validate:
                     type: bool
 
                 header.date:
                   type: datetime
-                  label: Date
+                  label: PLUGIN_ADMIN.DATE
                   toggleable: true
-                  help: "The date variable allows you to specifically set a date associated with this page."
+                  help: PLUGIN_ADMIN.DATE_HELP
 
-
-
-                header.published_date:
+                header.publish_date:
                   type: datetime
-                  label: Published Date
+                  label: PLUGIN_ADMIN.PUBLISHED_DATE
                   toggleable: true
-                  help: "Can provide a date to automatically trigger publication."
+                  help: PLUGIN_ADMIN.PUBLISHED_DATE_HELP
 
-                header.unpublished_date:
+                header.unpublish_date:
                   type: datetime
-                  label: Unublished Date
+                  label: PLUGIN_ADMIN.UNPUBLISHED_DATE
                   toggleable: true
-                  help: "can provide a date to automatically trigger un-publication."
+                  help: PLUGIN_ADMIN.UNPUBLISHED_DATE_HELP
 
-
-
-            meta:
-              type: section
-              title: Metadata
-              underline: true
-
-              fields:
-                header.metadata.description:
-                  type: textarea
+                header.metadata:
                   toggleable: true
-                  label: Description
-                  default:
-                  validate:
-                    max: 155
-
-                header.metadata.keywords:
-                  type: text
-                  toggleable: true
-                  label: Keywords
-                  validate:
-                    max: 120
-
-                header.metadata.author:
-                  type: text
-                  toggleable: true
-                  label: Author
-                  validate:
-                    max: 120
-
-                header.metadata.robots:
-                  type: text
-                  toggleable: true
-                  label: Robots
-                  validate:
-                    max: 120
+                  type: array
+                  label: PLUGIN_ADMIN.METADATA
+                  help: PLUGIN_ADMIN.METADATA_HELP
+                  placeholder_key: PLUGIN_ADMIN.METADATA_KEY
+                  placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
 
             taxonomies:
               type: section
-              title: Taxonomies
+              title: PLUGIN_ADMIN.TAXONOMIES
               underline: true
 
               fields:
                 header.taxonomy:
                   type: taxonomy
-                  label: Taxonomy
+                  label: PLUGIN_ADMIN.TAXONOMY
                   multiple: true
                   validate:
                     type: array
 
         advanced:
           type: tab
-          title: Advanced
+          title: PLUGIN_ADMIN.ADVANCED
 
           fields:
             columns:
@@ -145,75 +114,108 @@ form:
 
                     settings:
                       type: section
-                      title: Settings
+                      title: PLUGIN_ADMIN.SETTINGS
                       underline: true
 
-                    header.body_classes:
-                      type: text
-                      label: Body Classes
-
+                    ordering:
+                      type: toggle
+                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
+                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
+                      highlight: 1
+                      options:
+                        1: PLUGIN_ADMIN.ENABLED
+                        0: PLUGIN_ADMIN.DISABLED
+                      validate:
+                        type: bool
 
                     folder:
                       type: text
-                      label: Folder Name
+                      label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
-                        type: slug
+                        rule: slug
 
                     route:
                       type: select
-                      label: Parent
+                      label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
-                        '/': '- Root -'
+                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
-                    type:
-                      type: templates
+                    name:
+                      type: select
                       classes: fancy
-                      label: Display Template
+                      label: PLUGIN_ADMIN.PAGE_FILE
+                      help: PLUGIN_ADMIN.PAGE_FILE_HELP
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::types'
+                      data-options@: '\Grav\Common\Page\Pages::pageTypes'
+
+                    header.body_classes:
+                      type: text
+                      label: PLUGIN_ADMIN.BODY_CLASSES
 
 
                 column2:
                   type: column
 
                   fields:
+                    order_title:
+                      type: section
+                      title: PLUGIN_ADMIN.ORDERING
+                      underline: true
+
                     order:
                       type: order
-                      label: Ordering
+                      label: PLUGIN_ADMIN.PAGE_ORDER
                       sitemap:
 
             overrides:
               type: section
-              title: Overrides
+              title: PLUGIN_ADMIN.OVERRIDES
               underline: true
 
               fields:
 
+                header.dateformat:
+                  toggleable: true
+                  type: select
+                  size: medium
+                  selectize:
+                    create: true
+                  label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+                  help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+                  placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+                  data-options@: '\Grav\Common\Utils::dateFormats'
+                  validate:
+                    type: string
+
                 header.menu:
                   type: text
-                  label: Menu
+                  label: PLUGIN_ADMIN.MENU
                   toggleable: true
-                  help: "The string to be used in a menu.  If not set, <b>Title</b> will be used."
+                  help: PLUGIN_ADMIN.MENU_HELP
 
                 header.slug:
                   type: text
-                  label: Slug
+                  label: PLUGIN_ADMIN.SLUG
                   toggleable: true
-                  help: "The slug variable allows you to specifically set the page's portion of the URL"
+                  help: PLUGIN_ADMIN.SLUG_HELP
                   validate:
-                    message: A slug must contain only lowercase alphanumeric characters and dashes
+                    message: PLUGIN_ADMIN.SLUG_VALIDATE_MESSAGE
                     rule: slug
 
-
+                header.redirect:
+                  type: text
+                  label: PLUGIN_ADMIN.REDIRECT
+                  toggleable: true
+                  help: PLUGIN_ADMIN.REDIRECT_HELP
 
                 header.process:
                   type: checkboxes
-                  label: Process
+                  label: PLUGIN_ADMIN.PROCESS
                   toggleable: true
-                  @config-default: system.pages.process
+                  config-default@: system.pages.process
                   default:
                     markdown: true
                     twig: false
@@ -222,53 +224,83 @@ form:
                     twig: Twig
                   use: keys
 
-                header.child_type:
-                  type: select
-                  toggleable: true
-                  label: Default Child Type
-                  default: default
-                  placeholder: Use Global
-                  @data-options: '\Grav\Common\Page\Pages::types'
-
-                header.visible:
+                header.twig_first:
                   type: toggle
-                  label: Visible
-                  help: "Determines if a page is visible in the navigation."
-                  highlight: 1
+                  toggleable: true
+                  label: PLUGIN_ADMIN.TWIG_FIRST
+                  help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+                  highlight: 0
                   options:
-                    '': Global
-                    1: Enabled
-                    0: Disabled
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
                   validate:
                     type: bool
 
+                header.never_cache_twig:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+                  help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+                  highlight: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
+                header.child_type:
+                  type: select
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE
+                  default: default
+                  placeholder: PLUGIN_ADMIN.USE_GLOBAL
+                  data-options@: '\Grav\Common\Page\Pages::types'
+
                 header.routable:
                   type: toggle
-                  label: Routable
-                  help: If this page is reachable by a URL
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTABLE
+                  help: PLUGIN_ADMIN.ROUTABLE_HELP
                   highlight: 1
-                  default: ''
                   options:
-                    '': Global
-                    1: Enabled
-                    0: Disabled
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
                   validate:
                     type: bool
 
                 header.cache_enable:
                   type: toggle
-                  label: Caching
+                  toggleable: true
+                  label: PLUGIN_ADMIN.CACHING
                   highlight: 1
                   options:
-                    '': Global
-                    1: Enabled
-                    0: Disabled
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
                   validate:
                     type: bool
 
+                header.visible:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.VISIBLE
+                  help: PLUGIN_ADMIN.VISIBLE_HELP
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
 
+                header.template:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
 
-
+                header.append_url_extension:
+                  type: text
+                  label: PLUGIN_ADMIN.APPEND_URL_EXT
+                  toggleable: true
+                  help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
 
                 header.order_by:
                   type: hidden

system/blueprints/pages/external.yaml

@@ -0,0 +1,52 @@
+title: PLUGIN_ADMIN:EXTERNAL
+@extends:
+    type: default
+    context: blueprints://pages
+
+form:
+  validation: loose
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1
+
+      fields:
+
+        content:
+          fields:
+
+            header.title:
+              type: text
+              autofocus: true
+              style: horizontal
+              label: PLUGIN_ADMIN.TITLE
+
+            content:
+              unset@: true
+
+            uploads:
+              unset@: true
+
+            header.external_url:
+                type: text
+                label: PLUGIN_ADMIN.EXTERNAL_URL
+                placeholder: https://getgrav.org
+                validate:
+                    required: true
+        options:
+          fields:
+
+            publishing:
+
+              fields:
+
+                header.date:
+                  unset@: true
+
+                header.metadata:
+                  unset@: true
+
+            taxonomies:
+              unset@: true
+

system/blueprints/pages/modular.yaml

@@ -1,4 +1,4 @@
-title: Modular
+title: PLUGIN_ADMIN.MODULAR
 @extends:
     type: default
     context: blueprints://pages
@@ -15,28 +15,28 @@ form:
 
             header.content.items:
               type: select
-              label: Items
-              default: @self.modular
+              label: PLUGIN_ADMIN.ITEMS
+              default: '@self.modular'
               options:
-                @self.modular: Children
+                '@self.modular': Modular Children
 
             header.content.order.by:
               type: select
-              label: Order By
+              label: PLUGIN_ADMIN.ORDER_BY
               default: date
               options:
-                folder: Folder
-                title: Title
-                date: Date
-                default: Default
+                folder: PLUGIN_ADMIN.FOLDER
+                title: PLUGIN_ADMIN.TITLE
+                date: PLUGIN_ADMIN.DATE
+                default: PLUGIN_ADMIN.DEFAULT
 
             header.content.order.dir:
               type: select
-              label: Order
+              label: PLUGIN_ADMIN.ORDER
               default: desc
               options:
-                asc: Ascending
-                desc: Descending
+                asc: PLUGIN_ADMIN.ASCENDING
+                desc: PLUGIN_ADMIN.DESCENDING
 
             header.process:
               type: ignore

system/blueprints/pages/modular_new.yaml

@@ -1,8 +1,8 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -10,40 +10,37 @@ form:
 
     section:
         type: section
-        title: Add Modular Content
+        title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT
 
     title:
       type: text
-      label: Page Title
+      label: PLUGIN_ADMIN.PAGE_TITLE
       validate:
         required: true
 
     folder:
       type: text
-      label: Folder Name
+      label: PLUGIN_ADMIN.FOLDER_NAME
       validate:
-        type: slug
+        rule: slug
         required: true
 
-
-
     route:
       type: select
-      label: Page
+      label: PLUGIN_ADMIN.PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
-      options:
-        '': '- Select -'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       validate:
         required: true
 
-    type:
+    name:
       type: select
       classes: fancy
-      label: Modular Template
+      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
+      help: PLUGIN_ADMIN.PAGE_FILE_HELP
       default: default
-      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+      data-options@: '\Grav\Common\Page\Pages::modularTypes'
       validate:
         required: true
 
@@ -53,6 +50,5 @@ form:
       validate:
         type: bool
 
-
     blueprint:
       type: blueprint

system/blueprints/pages/modular_raw.yaml

@@ -1,8 +1,8 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -15,26 +15,35 @@ form:
       fields:
         content:
           type: tab
-          title: Content
+          title: PLUGIN_ADMIN.CONTENT
 
           fields:
             frontmatter:
-              type: frontmatter
-              label: Frontmatter
-
+              classes: frontmatter
+              type: editor
+              label: PLUGIN_ADMIN.FRONTMATTER
+              autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              label: Content
 
             uploads:
-              type: uploads
-              label: Page Media
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
 
 
         options:
           type: tab
-          title: Options
+          title: PLUGIN_ADMIN.OPTIONS
 
           fields:
 
@@ -47,30 +56,41 @@ form:
 
                   fields:
 
+                    ordering:
+                      type: toggle
+                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
+                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
+                      highlight: 1
+                      options:
+                        1: PLUGIN_ADMIN.ENABLED
+                        0: PLUGIN_ADMIN.DISABLED
+                      validate:
+                        type: bool
+
                     folder:
                       type: text
-                      label: Filename
+                      label: PLUGIN_ADMIN.FILENAME
                       validate:
-                        type: slug
+                        rule: slug
                         required: true
 
                     route:
                       type: select
-                      label: Parent
+                      label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
-                        '': '- Select -'
+                        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
                         required: true
 
-                    type:
+                    name:
                       type: select
                       classes: fancy
-                      label: Modular Template
+                      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+                      data-options@: '\Grav\Common\Page\Pages::modularTypes'
                       validate:
                         required: true
 
@@ -80,7 +100,7 @@ form:
                     fields:
                       order:
                         type: order
-                        label: Ordering
+                        label: PLUGIN_ADMIN.ORDERING
 
             blueprint:
               type: blueprint

system/blueprints/pages/move.yaml

@@ -1,17 +1,11 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
 form:
   validation: loose
   fields:
     route:
       type: select
-      label: Parent
+      label: PLUGIN_ADMIN.PARENT
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       options:
-        '/': '- Root -'
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT

system/blueprints/pages/new.yaml

@@ -1,8 +1,8 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -10,58 +10,57 @@ form:
 
     section:
         type: section
-        title: Add Page
+        title: PLUGIN_ADMIN.ADD_PAGE
 
     title:
       type: text
-      label: Page Title
-      help: "The title of the page"
+      label: PLUGIN_ADMIN.PAGE_TITLE
+      help: PLUGIN_ADMIN.PAGE_TITLE_HELP
       validate:
         required: true
 
     folder:
       type: text
-      label: Folder Name
-      help: "The folder name that will be stored in the filesystem for this page"
+      label: PLUGIN_ADMIN.FOLDER_NAME
+      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
       validate:
-        type: slug
+        rule: slug
         required: true
 
     route:
       type: select
-      label: Parent Page
+      label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
-        '/': '- Root -'
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
         required: true
 
-    type:
+    name:
       type: select
-      help: "The page type that translates into which twig template renders the page"
       classes: fancy
-      label: Display Template
-      default: default
-      @data-options: '\Grav\Common\Page\Pages::types'
+      label: PLUGIN_ADMIN.PAGE_FILE
+      help: PLUGIN_ADMIN.PAGE_FILE_HELP
+      data-options@: '\Grav\Common\Page\Pages::types'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageName'
       validate:
         required: true
 
     visible:
       type: toggle
-      label: Visible
-      help: "Determines if a page is visible in the navigation."
+      label: PLUGIN_ADMIN.VISIBLE
+      help: PLUGIN_ADMIN.VISIBLE_HELP
       highlight: ''
       default: ''
       options:
         '': Auto
-        1: Yes
-        0: No
+        1: PLUGIN_ADMIN.YES
+        0: PLUGIN_ADMIN.NO
       validate:
         type: bool
         required: true
 
-
     blueprint:
       type: blueprint

system/blueprints/pages/new_folder.yaml

@@ -0,0 +1,35 @@
+rules:
+  slug:
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
+
+form:
+  validation: loose
+  fields:
+
+    section:
+        type: section
+        title: PLUGIN_ADMIN.ADD_FOLDER
+
+    folder:
+      type: text
+      label: PLUGIN_ADMIN.FOLDER_NAME
+      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
+      validate:
+        rule: slug
+        required: true
+
+    route:
+      type: select
+      label: PLUGIN_ADMIN.PARENT_PAGE
+      classes: fancy
+      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
+      options:
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
+      validate:
+        required: true
+
+    blueprint:
+      type: blueprint

system/blueprints/pages/raw.yaml

@@ -1,8 +1,8 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -15,26 +15,34 @@ form:
       fields:
         content:
           type: tab
-          title: Content
+          title: PLUGIN_ADMIN.CONTENT
 
           fields:
             frontmatter:
-              type: frontmatter
-              label: Frontmatter
-
+              classes: frontmatter
+              type: editor
+              label: PLUGIN_ADMIN.FRONTMATTER
+              autofocus: true
+              codemirror:
+                mode: 'yaml'
+                indentUnit: 4
+                autofocus: true
+                indentWithTabs: false
+                lineNumbers: true
+                styleActiveLine: true
+                gutters: ['CodeMirror-lint-markers']
+                lint: true
 
             content:
               type: markdown
-              label: Content
 
             uploads:
-              type: uploads
-              label: Page Media
-
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
 
         options:
           type: tab
-          title: Options
+          title: PLUGIN_ADMIN.OPTIONS
 
           fields:
 
@@ -47,30 +55,41 @@ form:
 
                   fields:
 
+                    ordering:
+                      type: toggle
+                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
+                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
+                      highlight: 1
+                      options:
+                        1: PLUGIN_ADMIN.ENABLED
+                        0: PLUGIN_ADMIN.DISABLED
+                      validate:
+                        type: bool
+
                     folder:
                       type: text
-                      label: Folder Name
+                      label: PLUGIN_ADMIN.FOLDER_NAME
+                      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
                       validate:
-                        type: slug
+                        rule: slug
                         required: true
 
                     route:
                       type: select
-                      label: Parent
+                      label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
-                        '/': '- Root -'
-                      validate:
-                        required: true
+                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
-                    type:
+                    name:
                       type: select
                       classes: fancy
-                      label: Display Template
+                      label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
+                      help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::types'
+                      data-options@: '\Grav\Common\Page\Pages::types'
                       validate:
                         required: true
 
@@ -80,7 +99,7 @@ form:
                     fields:
                       order:
                         type: order
-                        label: Ordering
+                        label: PLUGIN_ADMIN.ORDERING
 
             blueprint:
               type: blueprint

system/blueprints/user/account.yaml

@@ -1,46 +1,85 @@
-title: Site
+title: Account
 form:
     validation: loose
+
     fields:
 
-        content:
-            type: section
-            title: Account
+            info:
+                type: userinfo
+                size: large
 
-            fields:
-                username:
-                    type: text
-                    size: large
-                    label: Username
-                    disabled: true
-                    readonly: true
+            content:
+                type: section
+                title: PLUGIN_ADMIN.ACCOUNT
+                underline: true
 
-                email:
-                    type: email
-                    size: large
-                    label: Email
-                    validate:
-                      type: email
-                      message: Must be a valid email address
-                      required: true
 
-                password:
-                    type: password
-                    size: large
-                    label: Password
-                    validate:
-                      required: true
-                      message: Password must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters
-                      pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+            username:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.USERNAME
+                disabled: true
+                readonly: true
 
-                fullname:
-                    type: text
-                    size: large
-                    label: Full name
-                    validate:
-                      required: true
+            email:
+                type: email
+                size: large
+                label: PLUGIN_ADMIN.EMAIL
+                validate:
+                  type: email
+                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+                  required: true
 
-                title:
-                    type: text
-                    size: large
-                    label: Title
+            password:
+                type: password
+                size: large
+                label: PLUGIN_ADMIN.PASSWORD
+                validate:
+                  required: false
+                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+                  pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+
+            fullname:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.FULL_NAME
+                validate:
+                  required: true
+
+            title:
+                type: text
+                size: large
+                label: PLUGIN_ADMIN.TITLE
+
+            language:
+                type: select
+                label: PLUGIN_ADMIN.LANGUAGE
+                size: medium
+                classes: fancy
+                data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
+                default: 'en'
+                help: PLUGIN_ADMIN.LANGUAGE_HELP
+
+            security:
+                title: PLUGIN_ADMIN.ACCESS_LEVELS
+                type: section
+                security: admin.super
+                underline: true
+
+                fields:
+                    groups:
+                        type: selectize
+                        size: large
+                        label: PLUGIN_ADMIN.GROUPS
+                        data-options@: '\Grav\User\Groups::groups'
+                        classes: fancy
+                        help: PLUGIN_ADMIN.GROUPS_HELP
+                        validate:
+                            type: commalist
+
+                    access:
+                        type: permissions
+                        label: PLUGIN_ADMIN.PERMISSIONS
+                        ignore_empty: true
+                        validate:
+                            type: array

system/blueprints/user/account_new.yaml

@@ -1,4 +1,4 @@
-title: Add Account
+title: PLUGIN_ADMIN.ADD_ACCOUNT
 
 form:
   validation: loose
@@ -6,10 +6,11 @@ form:
 
     content:
       type: section
-      title: Add Account
+      title: PLUGIN_ADMIN.ADD_ACCOUNT
 
     username:
       type: text
-      label: Username
+      label: PLUGIN_ADMIN.USERNAME
+      help: PLUGIN_ADMIN.USERNAME_HELP
       validate:
         required: true

system/blueprints/user/group.yaml

@@ -0,0 +1,37 @@
+title: Group
+form:
+    validation: loose
+
+    fields:
+        spacer:
+            type: spacer
+            text: '<br>'
+
+        groupname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.NAME
+            disabled: true
+            readonly: true
+
+        readableName:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN_PRO.READABLE_NAME
+
+        description:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.DESCRIPTION
+
+        icon:
+            type: text
+            size: small
+            label: PLUGIN_ADMIN_PRO.ICON
+
+        access:
+            type: permissions
+            label: PLUGIN_ADMIN.PERMISSIONS
+            ignore_empty: true
+            validate:
+                type: array

system/blueprints/user/group_new.yaml

@@ -0,0 +1,16 @@
+title: PLUGIN_ADMIN_PRO.ADD_GROUP
+
+form:
+  validation: loose
+  fields:
+
+    content:
+      type: section
+      title: PLUGIN_ADMIN_PRO.ADD_GROUP
+
+    groupname:
+      type: text
+      label: PLUGIN_ADMIN_PRO.GROUP_NAME
+      help: PLUGIN_ADMIN_PRO.GROUP_NAME_HELP
+      validate:
+        required: true

system/config/media.yaml

@@ -1,114 +1,206 @@
-defaults:
-  type: file
-  thumb: media/thumb.png
-  mime: application/octet-stream
-  image:
-    filters:
-      default:
-        - enableProgressive
+types:
+  defaults:
+    type: file
+    thumb: media/thumb.png
+    mime: application/octet-stream
+    image:
+      filters:
+        default:
+          - enableProgressive
 
-jpg:
-  type: image
-  thumb: media/thumb-jpg.png
-  mime: image/jpeg
-jpeg:
-  type: image
-  thumb: media/thumb-jpeg.png
-  mime: image/jpeg
-png:
-  type: image
-  thumb: media/thumb-png.png
-  mime: image/png
-gif:
-  type: animated
-  thumb: media/thumb-gif.png
-  mime: image/gif
+  jpg:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpe:
+    type: image
+    thumb: media/thumb-jpg.png
+    mime: image/jpeg
+  jpeg:
+    type: image
+    thumb: media/thumb-jpeg.png
+    mime: image/jpeg
+  png:
+    type: image
+    thumb: media/thumb-png.png
+    mime: image/png
+  gif:
+    type: animated
+    thumb: media/thumb-gif.png
+    mime: image/gif
 
-svg:
-  type: vector
-  thumb: media/thumb-gif.png
-  mime: image/svg+xml
+  svg:
+    type: vector
+    thumb: media/thumb.png
+    mime: image/svg+xml
 
-mp4:
-  type: video
-  thumb: media/thumb-mp4.png
-  mime: video/mp4
-mov:
-  type: video
-  thumb: media/thumb-mov.png
-  mime: video/quicktime
-m4v:
-  type: video
-  thumb: media/thumb-m4v.png
-  mime: video/x-m4v
-swf:
-  type: video
-  thumb: media/thumb-swf.png
-  mime: video/x-flv
-flv:
-  type: video
-  thumb: media/thumb-flv.png
-  mime: video/x-flv
+  mp4:
+    type: video
+    thumb: media/thumb-mp4.png
+    mime: video/mp4
+  mov:
+    type: video
+    thumb: media/thumb-mov.png
+    mime: video/quicktime
+  m4v:
+    type: video
+    thumb: media/thumb-m4v.png
+    mime: video/x-m4v
+  swf:
+    type: video
+    thumb: media/thumb-swf.png
+    mime: video/x-flv
+  flv:
+    type: video
+    thumb: media/thumb-flv.png
+    mime: video/x-flv
+  webm:
+    type: video
+    thumb: media/thumb.png
+    mime: video/webm
+  ogv:
+    type: video
+    thumb: media/thumb-ogg.png
+    mime: video/ogg
 
-mp3:
-  type: audio
-  thumb: media/thumb-mp3.png
-  mime: audio/mp3
-ogg:
-  type: audio
-  thumb: media/thumb-ogg.png
-  mime: audio/ogg
-wma:
-  type: audio
-  thumb: media/thumb-wma.png
-  mime: audio/wma
-m4a:
-  type: audio
-  thumb: media/thumb-m4a.png
-  mime: audio/m4a
-wav:
-  type: audio
-  thumb: media/thumb-wav.png
-  mime: audio/wav
+  mp3:
+    type: audio
+    thumb: media/thumb-mp3.png
+    mime: audio/mp3
+  ogg:
+    type: audio
+    thumb: media/thumb-ogg.png
+    mime: audio/ogg
+  wma:
+    type: audio
+    thumb: media/thumb-wma.png
+    mime: audio/wma
+  m4a:
+    type: audio
+    thumb: media/thumb-m4a.png
+    mime: audio/m4a
+  wav:
+    type: audio
+    thumb: media/thumb-wav.png
+    mime: audio/wav
+  aiff:
+    type: audio
+    mime: audio/aiff
+  aif:
+    type: audio
+    mime: audio/aif
 
-txt:
-  type: file
-  thumb: media/thumb-txt.png
-  mime: text/plain
-xml:
-  type: file
-  thumb: media/thumb-xml.png
-  mime: application/xml
-doc:
-  type: file
-  thumb: media/thumb-doc.png
-  mime: application/msword
-html:
-  type: file
-  thumb: media/thumb-html.png
-  mime: text/html
-pdf:
-  type: file
-  thumb: media/thumb-pdf.png
-  mime: application/pdf
-zip:
-  type: file
-  thumb: media/thumb-zip.png
-  mime: application/zip
-gz:
-  type: file
-  thumb: media/thumb-gz.png
-  mime: application/gzip
-css:
-  type: file
-  thumb: media/thumb-css.png
-  mime: text/css
-js:
-  type: file
-  thumb: media/thumb-js.png
-  mime: application/javascript
-json:
-  type: file
-  thumb: media/thumb-json.png
-  mime: application/json
+  txt:
+    type: file
+    thumb: media/thumb-txt.png
+    mime: text/plain
+  xml:
+    type: file
+    thumb: media/thumb-xml.png
+    mime: application/xml
+  doc:
+    type: file
+    thumb: media/thumb-doc.png
+    mime: application/msword
+  docx:
+    type: file
+    mime: application/msword
+  xls:
+    type: file
+    mime: application/vnd.ms-excel
+  xlt:
+    type: file
+    mime: application/vnd.ms-excel
+  xlm:
+    type: file
+    mime: application/vnd.ms-excel
+  xlsm:
+    type: file
+    mime: application/vnd.ms-excel
+  xld:
+    type: file
+    mime: application/vnd.ms-excel
+  xla:
+    type: file
+    mime: application/vnd.ms-excel
+  xlc:
+    type: file
+    mime: application/vnd.ms-excel
+  xlw:
+    type: file
+    mime: application/vnd.ms-excel
+  xll:
+    type: file
+    mime: application/vnd.ms-excel
+  ppt:
+    type: file
+    mime: application/vnd.ms-powerpoint
+  pps:
+    type: file
+    mime: application/vnd.ms-powerpoint
+  rtf:
+    type: file
+    mime: application/rtf
+
+  bmp:
+    type: file
+    mime: image/bmp
+  tiff:
+    type: file
+    mime: image/tiff
+  mpeg:
+    type: file
+    mime: video/mpeg
+  mpg:
+    type: file
+    mime: video/mpeg
+  mpe:
+    type: file
+    mime: video/mpeg
+  avi:
+    type: file
+    mime: video/msvideo
+  wmv:
+    type: file
+    mime: video/x-ms-wmv
+
+  html:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  htm:
+    type: file
+    thumb: media/thumb-html.png
+    mime: text/html
+  pdf:
+    type: file
+    thumb: media/thumb-pdf.png
+    mime: application/pdf
+  zip:
+    type: file
+    thumb: media/thumb-zip.png
+    mime: application/zip
+  7z:
+    type: file
+    thumb: media/thumb-7zip.png
+    mime: application/x-7z-compressed
+  gz:
+    type: file
+    thumb: media/thumb-gz.png
+    mime: application/gzip
+  tar:
+    type: file
+    mime: application/x-tar
+  css:
+    type: file
+    thumb: media/thumb-css.png
+    mime: text/css
+  js:
+    type: file
+    thumb: media/thumb-js.png
+    mime: application/javascript
+  json:
+    type: file
+    thumb: media/thumb-json.png
+    mime: application/json
 

system/config/site.yaml

@@ -1,4 +1,5 @@
 title: Grav                                 # Name of the site
+default_lang: en                            # Default language for site (potentially used by theme)
 
 author:
   name: John Appleseed                      # Default author name
@@ -16,12 +17,12 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-  /redirect-test: /                         # Redirect test goes to home page
-  /old/(.*): /new/$1                        # Would redirect /old/my-page to /new/my-page
+#  '/redirect-test': '/'                         # Redirect test goes to home page
+#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
 
 routes:
-  /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
-  /new/(.*): '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
+#  '/new/(.*)': '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
 
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)

system/config/streams.yaml

@@ -1,9 +1,4 @@
 schemes:
-  asset:
-    type: ReadOnlyStream
-    paths:
-      - assets
-
   image:
     type: ReadOnlyStream
     paths:

system/config/system.yaml

@@ -1,104 +1,141 @@
-absolute_urls: false                   # Absolute or relative URLs for `base_url`
-timezone: ''                           # Valid values: http://php.net/manual/en/timezones.php
-param_sep: ':'                         # Parameter separator, use ';' for Apache on windows
+absolute_urls: false                        # Absolute or relative URLs for `base_url`
+timezone: ''                                # Valid values: http://php.net/manual/en/timezones.php
+default_locale:                             # Default locale (defaults to system)
+param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
+wrapped_site: false                         # For themes/plugins to know if Grav is wrapped by another platform
+reverse_proxy_setup: false                  # Running in a reverse proxy scenario with different webserver ports than proxy
+force_ssl: false                            # If enabled, Grav forces to be accessed via HTTPS (NOTE: Not an ideal solution)
+custom_base_url: ''                         # Set the base_url manually, e.g. http://yoursite.com/yourpath
 
 languages:
-  supported: []                        # List of languages supported. eg: [en, fr, de]
-  translations: true                   # Enable translations by default
-  translations_fallback: true          # Fallback through supported translations if active lang doesn't exist
-  session_store_active: false          # Store active language in session
-  home_redirect:
-    include_lang: true                 # Include language in home redirect (/en)
-    include_route: false               # Include route in home redirect (/blog)
-
+  supported: []                             # List of languages supported. eg: [en, fr, de]
+  include_default_lang: true                # Include the default lang prefix in all URLs
+  translations: true                        # Enable translations by default
+  translations_fallback: true               # Fallback through supported translations if active lang doesn't exist
+  session_store_active: false               # Store active language in session
+  http_accept_language: false               # Attempt to set the language based on http_accept_language header in the browser
+  override_locale: false                    # Override the default or system locale with language specific one
 
 home:
-  alias: '/home'                       # Default path for home, ie /
+  alias: '/home'                            # Default path for home, ie /
+  hide_in_urls: false                       # Hide the home route in URLs
 
 pages:
-  theme: antimatter                    # Default theme (defaults to "antimatter" theme)
+  theme: antimatter                         # Default theme (defaults to "antimatter" theme)
   order:
-    by: default                        # Order pages by "default", "alpha" or "date"
-    dir: asc                           # Default ordering direction, "asc" or "desc"
+    by: default                             # Order pages by "default", "alpha" or "date"
+    dir: asc                                # Default ordering direction, "asc" or "desc"
   list:
-    count: 20                          # Default item count per page
+    count: 20                               # Default item count per page
   dateformat:
-    short: 'jS M Y'                    # Short date format
-    long: 'F jS \a\t g:ia'             # Long date format
-  publish_dates: true                  # automatically publish/unpublish based on dates
+    default:                                # The default date format Grav expects in the `date: ` field
+    short: 'jS M Y'                         # Short date format
+    long: 'F jS \a\t g:ia'                  # Long date format
+  publish_dates: true                       # automatically publish/unpublish based on dates
   process:
-    markdown: true                     # Process Markdown
-    twig: false                        # Process Twig
+    markdown: true                          # Process Markdown
+    twig: false                             # Process Twig
+  twig_first: false                         # Process Twig before markdown when processing both on a page
+  never_cache_twig: false                   # Only cache content, never cache twig processed in content (incompatible with `twig_first: true`)
   events:
-    page: true                         # Enable page level events
-    twig: true                         # Enable twig level events
+    page: true                              # Enable page level events
+    twig: true                              # Enable Twig level events
   markdown:
-    extra: false                       # Enable support for Markdown Extra support (GFM by default)
-    auto_line_breaks: false            # Enable automatic line breaks
-    auto_url_links: false              # Enable automatic HTML links
-    escape_markup: false               # Escape markup tags into entities
-    special_chars:                     # List of special characters to automatically convert to entities
+    extra: false                            # Enable support for Markdown Extra support (GFM by default)
+    auto_line_breaks: false                 # Enable automatic line breaks
+    auto_url_links: false                   # Enable automatic HTML links
+    escape_markup: false                    # Escape markup tags into entities
+    special_chars:                          # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [txt,xml,html,json,rss,atom]  # list of valid page types
-  expires: 604800                      # Page expires time in seconds (604800 seconds = 7 days)
-  last_modified: false                 # Set the last modified date header based on file modifcation timestamp
-  etag: false                          # Set the etag header tag
-  vary_accept_encoding: false          # Add `Vary: Accept-Encoding` header
-  redirect_default_route: false        # Automatically redirect to a page's default route
+  types: [txt,xml,html,htm,json,rss,atom]   # list of valid page types
+  append_url_extension: ''                  # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
+  expires: 604800                           # Page expires time in seconds (604800 seconds = 7 days)
+  last_modified: false                      # Set the last modified date header based on file modification timestamp
+  etag: false                               # Set the etag header tag
+  vary_accept_encoding: false               # Add `Vary: Accept-Encoding` header
+  redirect_default_route: false             # Automatically redirect to a page's default route
+  redirect_default_code: 301                # Default code to use for redirects
+  redirect_trailing_slash: true             # Handle automatically or 301 redirect a trailing / URL
+  ignore_files: [.DS_Store]                 # Files to ignore in Pages
+  ignore_folders: [.git, .idea]             # Folders to ignore in Pages
+  ignore_hidden: true                       # Ignore all Hidden files and folders
+  url_taxonomy_filters: true                # Enable auto-magic URL-based taxonomy filters for page collections
+  frontmatter:
+    process_twig: false                     # Should the frontmatter be processed to replace Twig variables?
+    ignore_fields: ['form','forms']         # Fields that might contain Twig variables and should not be processed
 
 cache:
-  enabled: true                        # Set to true to enable caching
+  enabled: true                             # Set to true to enable caching
   check:
-    method: file                       # Method to check for updates in pages: file|folder|none
-  driver: auto                         # One of: auto|file|apc|xcache|memcache|wincache
-  prefix: 'g'                          # Cache prefix string (prevents cache conflicts)
-  lifetime: 604800                     # Lifetime of cached data in seconds (0 = infinite)
-  gzip: false                          # GZip compress the page output
+    method: file                            # Method to check for updates in pages: file|folder|hash|none
+  driver: auto                              # One of: auto|file|apc|xcache|memcache|wincache
+  prefix: 'g'                               # Cache prefix string (prevents cache conflicts)
+  cli_compatibility: false                  # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
+  lifetime: 604800                          # Lifetime of cached data in seconds (0 = infinite)
+  gzip: false                               # GZip compress the page output
+  allow_webserver_gzip: false               # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
+  redis:
+    socket: false                           # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
 
 twig:
-  cache: true                          # Set to true to enable twig caching
-  debug: false                         # Enable Twig debug
-  auto_reload: true                    # Refresh cache on changes
-  autoescape: false                    # Autoescape Twig vars
-  undefined_functions: true            # Allow undefined functions
-  undefined_filters: true              # Allow undefined filters
+  cache: true                               # Set to true to enable Twig caching
+  debug: true                               # Enable Twig debug
+  auto_reload: true                         # Refresh cache on changes
+  autoescape: false                         # Autoescape Twig vars
+  undefined_functions: true                 # Allow undefined functions
+  undefined_filters: true                   # Allow undefined filters
+  umask_fix: false                          # By default Twig creates cached files as 755, fix switches this to 775
 
-assets:                                # Configuration for Assets Manager (JS, CSS)
-  css_pipeline: false                  # The CSS pipeline is the unification of multiple CSS resources into one file
-  css_minify: true                     # Minify the CSS during pipelining
-  css_minify_windows: false            # Minify Override for Windows platforms. False by default due to ThreadStackSize
-  css_rewrite: true                    # Rewrite any CSS relative URLs during pipelining
-  js_pipeline: false                   # The JS pipeline is the unification of multiple JS resources into one file
-  js_minify: true                      # Minify the JS during pipelining
-  enable_asset_timestamp: false        # Enable asset timestamps
+assets:                                     # Configuration for Assets Manager (JS, CSS)
+  css_pipeline: false                       # The CSS pipeline is the unification of multiple CSS resources into one file
+  css_pipeline_include_externals: true      # Include external URLs in the pipeline by default
+  css_pipeline_before_excludes: true        # Render the pipeline before any excluded files
+  css_minify: true                          # Minify the CSS during pipelining
+  css_minify_windows: false                 # Minify Override for Windows platforms. False by default due to ThreadStackSize
+  css_rewrite: true                         # Rewrite any CSS relative URLs during pipelining
+  js_pipeline: false                        # The JS pipeline is the unification of multiple JS resources into one file
+  js_pipeline_include_externals: true       # Include external URLs in the pipeline by default
+  js_pipeline_before_excludes: true         # Render the pipeline before any excluded files
+  js_minify: true                           # Minify the JS during pipelining
+  enable_asset_timestamp: false             # Enable asset timestamps
   collections:
-    jquery: system://assets/jquery/jquery-2.1.4.min.js
+    jquery: system://assets/jquery/jquery-2.x.min.js
 
 errors:
-  display: true                        # Display full backtrace-style error page
-  log: true                            # Log errors to /logs folder
+  display: 0                                # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
+  log: true                                 # Log errors to /logs folder
 
 debugger:
-  enabled: false                       # Enable Grav debugger and following settings
-  twig: true                           # Enable debugging of Twig templates
+  enabled: false                            # Enable Grav debugger and following settings
   shutdown:
-    close_connection: true             # Close the connection before calling onShutdown(). false for debugging
+    close_connection: true                  # Close the connection before calling onShutdown(). false for debugging
 
 images:
-  default_image_quality: 85            # Default image quality to use when resampling images (85%)
-  cache_all: false                     # Cache all image by default
-  debug: false                         # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  default_image_quality: 85                 # Default image quality to use when resampling images (85%)
+  cache_all: false                          # Cache all image by default
+  cache_perms: '0755'                       # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
+  debug: false                              # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  auto_fix_orientation: false               # Automatically fix the image orientation based on the Exif data
 
 media:
-  enable_media_timestamp: false        # Enable media timetsamps
-  upload_limit: 0                      # Set maximum upload size in bytes (0 is unlimited)
-  unsupported_inline_types: []         # Array of unsupported media file types to try to display inline
+  enable_media_timestamp: false             # Enable media timetsamps
+  upload_limit: 0                           # Set maximum upload size in bytes (0 is unlimited)
+  unsupported_inline_types: []              # Array of supported media types to try to display inline
+  allowed_fallback_types: []                # Array of allowed media types of files found if accessed via Page route
 
 session:
-  enabled: true                        # Enable Session support
-  timeout: 1800                        # Timeout in seconds
-  name: grav-site                      # Name prefix of the session cookie
+  enabled: true                             # Enable Session support
+  timeout: 1800                             # Timeout in seconds
+  name: grav-site                           # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
+  secure: false                             # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
+  httponly: true                            # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  split: true                               # Sessions should be independent between site and plugins (such as admin)
+  path:
 
-security:
-  default_hash: $2y$10$kwsyMVwM8/7j0K/6LHT.g.Fs49xOCTp2b8hh/S5.dPJuJcJB6T.UK
+gpm:
+  releases: testing                          # Set to either 'stable' or 'testing'
+  proxy_url:                                 # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  method: 'auto'                             # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
+  verify_peer: true                          # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.
+  official_gpm_only: true                    # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security

system/defines.php

@@ -1,10 +1,21 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.35');
+define('GRAV_VERSION', '1.2.0-rc.1');
+define('GRAV_TESTING', true);
 define('DS', '/');
 
+if (!defined('GRAV_PHP_MIN')) {
+    define('GRAV_PHP_MIN', '5.5.9');
+}
+
 // Directories and Paths
 if (!defined('GRAV_ROOT')) {
     define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, DS, getcwd()));
@@ -12,20 +23,20 @@ if (!defined('GRAV_ROOT')) {
 define('ROOT_DIR', GRAV_ROOT . '/');
 define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
-define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
 define('CACHE_DIR', ROOT_DIR . 'cache/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
-define('LOG_DIR', ROOT_DIR .'logs/');
-define('ACCOUNTS_DIR', USER_DIR .'accounts/');
-define('PAGES_DIR', USER_DIR .'pages/');
 
 // DEPRECATED: Do not use!
+define('ASSETS_DIR', ROOT_DIR . 'assets/');
+define('IMAGES_DIR', ROOT_DIR . 'images/');
+define('ACCOUNTS_DIR', USER_DIR .'accounts/');
+define('PAGES_DIR', USER_DIR .'pages/');
 define('DATA_DIR', USER_DIR .'data/');
+define('SYSTEM_DIR', ROOT_DIR .'system/');
 define('LIB_DIR', SYSTEM_DIR .'src/');
 define('PLUGINS_DIR', USER_DIR .'plugins/');
 define('THEMES_DIR', USER_DIR .'themes/');
 define('VENDOR_DIR', ROOT_DIR .'vendor/');
+define('LOG_DIR', ROOT_DIR .'logs/');
 // END DEPRECATED
 
 // Some extensions

system/languages/ar.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  العنوان: %1$s
+  ---
+  # خطأ: مادة أمامية غير صحيحة
+  
+  مسار: '%2$s'
+  
+  **%3$s**
+  
+  , , ,
+  
+  %4$s
+  , , ,
+NICETIME:
+  NO_DATE_PROVIDED: لم يتم تقديم التاريخ
+  BAD_DATE: تاريخ خاطئ
+  AGO: من قبل
+  FROM_NOW: من الآن
+  SECOND: ثانية
+  MINUTE: دقيقة
+  HOUR: ساعة
+  DAY: يوم
+  WEEK: أسبوع
+  MONTH: شهر
+  YEAR: سنة
+  DECADE: عقد
+  SEC: ثانية
+  MIN: دقيقة
+  HR: ساعة
+  WK: أسبوع
+  MO: شهر
+  YR: سنة
+  DEC: عقد
+  SECOND_PLURAL: ثواني
+  MINUTE_PLURAL: ‮دقائق
+  HOUR_PLURAL: ساعات
+  DAY_PLURAL: أيام
+  WEEK_PLURAL: أسابيع
+  MONTH_PLURAL: أشهر
+  YEAR_PLURAL: سنوات
+  DECADE_PLURAL: عقود
+  SEC_PLURAL: ثواني
+  MIN_PLURAL: دقائق
+  HR_PLURAL: ساعات
+  WK_PLURAL: أسابيع
+  MO_PLURAL: أشهر
+  YR_PLURAL: سنوات
+  DEC_PLURAL: عقود
+FORM:
+  VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+  INVALID_INPUT: إدخال غير صحيح في
+  MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
+MONTHS_OF_THE_YEAR:
+  - كانون الثاني
+  - شباط
+  - آذار/ مارس
+  - نيسان
+  - أيار
+  - حزيران
+  - تموز
+  - آب
+  - أيلول
+  - تشرين الأول
+  - تشرين الثاني
+  - كانون الأول
+DAYS_OF_THE_WEEK:
+  - الاثنين
+  - الثلاثاء
+  - الأربعاء
+  - الخميس
+  - الجمعة
+  - السبت
+  - الأحد

system/languages/ca.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # S'ha produït un error: Frontmatter invàlid
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: "No s'ha proporcionat data"
+  BAD_DATE: Data invàlida
+  AGO: abans
+  FROM_NOW: "des d'ara"
+  SECOND: segon
+  MINUTE: minut
+  HOUR: hora
+  DAY: dia
+  WEEK: setmana
+  MONTH: mes
+  YEAR: any
+  DECADE: dècada
+  SEC: s
+  MIN: min
+  HR: h
+  WK: setm.
+  MO: m.
+  YR: a.
+  DEC: dèc.
+  SECOND_PLURAL: segons
+  MINUTE_PLURAL: minuts
+  HOUR_PLURAL: hores
+  DAY_PLURAL: dies
+  WEEK_PLURAL: setmanes
+  MONTH_PLURAL: mesos
+  YEAR_PLURAL: anys
+  DECADE_PLURAL: dècades
+  SEC_PLURAL: s
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: setm.
+  MO_PLURAL: mesos
+  YR_PLURAL: anys
+  DEC_PLURAL: dèc.
+FORM:
+  VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+  INVALID_INPUT: Entrada no vàlida a
+  MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
+MONTHS_OF_THE_YEAR:
+  - Gener
+  - Febrer
+  - Març
+  - Abril
+  - Maig
+  - Juny
+  - Juliol
+  - Agost
+  - Setembre
+  - Octubre
+  - Novembre
+  - Desembre
+DAYS_OF_THE_WEEK:
+  - Dilluns
+  - Dimarts
+  - Dimecres
+  - Dijous
+  - Divendres
+  - Dissabte
+  - Diumenge

system/languages/cs.yaml

@@ -0,0 +1,81 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  - vybavení
+  - informace
+  - rýže
+  - peníze
+  - druhy
+  - série
+  - ryba
+  - ovce
+INFLECTOR_IRREGULAR:
+  person: lidé
+  man: muži
+  child: děti
+  sex: pohlaví
+  move: pohyby
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
+NICETIME:
+  NO_DATE_PROVIDED: Datum nebylo vloženo
+  BAD_DATE: Chybné datum
+  AGO: zpět
+  FROM_NOW: od teď
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: hodina
+  DAY: den
+  WEEK: týden
+  MONTH: měsíc
+  YEAR: rok
+  DECADE: dekáda
+  SEC: sek
+  MIN: min
+  HR: hod
+  WK: t
+  MO: m
+  YR: r
+  DEC: dek
+  SECOND_PLURAL: sekundy
+  MINUTE_PLURAL: minuty
+  HOUR_PLURAL: hodiny
+  DAY_PLURAL: dny
+  WEEK_PLURAL: týdny
+  MONTH_PLURAL: měsíce
+  YEAR_PLURAL: roky
+  DECADE_PLURAL: dekády
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: hod
+  WK_PLURAL: t
+  MO_PLURAL: m
+  YR_PLURAL: r
+  DEC_PLURAL: dek
+FORM:
+  VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
+MONTHS_OF_THE_YEAR:
+  - ledna
+  - února
+  - března
+  - dubna
+  - května
+  - června
+  - července
+  - srpna
+  - září
+  - října
+  - listopadu
+  - prosince
+DAYS_OF_THE_WEEK:
+  - Pondělí
+  - Úterý
+  - Středa
+  - Čtvrtek
+  - Pátek
+  - Sobota
+  - Neděle

system/languages/da.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titel: %1$s
+  ---
+  
+  # Fejl: Ugyldigt frontmatter
+  
+  Sti: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato angivet
+  BAD_DATE: Ugyldig dato
+  AGO: siden
+  FROM_NOW: fra nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: time
+  DAY: dag
+  WEEK: uge
+  MONTH: måned
+  YEAR: år
+  DECADE: årti
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: u
+  MO: md
+  YR: år
+  DEC: årti
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dage
+  WEEK_PLURAL: uger
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtier
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uger
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+  INVALID_INPUT: Ugyldigt input i
+  MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - Marts
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Mandag
+  - Tirsdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lørdag
+  - Søndag

system/languages/de.yaml

@@ -0,0 +1,89 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  # Fehler: Frontmatter enthält Fehler
+  
+  Pfad: `%2$s`
+  
+  **%3$s ** 
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  1: Informationen
+  2: Reis
+  3: Geld
+INFLECTOR_IRREGULAR:
+  person: Personen
+  man: Menschen
+  child: Kinder
+  sex: Geschlecht
+  move: Züge
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
+NICETIME:
+  NO_DATE_PROVIDED: Kein Datum angegeben
+  BAD_DATE: Falsches Datum
+  AGO: her
+  FROM_NOW: ab jetzt
+  SECOND: Sekunde
+  MINUTE: Minute
+  HOUR: Stunde
+  DAY: Tag
+  WEEK: Woche
+  MONTH: Monat
+  YEAR: Jahr
+  DECADE: Jahrzehnt
+  SEC: Sek.
+  MIN: Min.
+  HR: Std.
+  WK: Wo.
+  MO: Mo.
+  YR: J.
+  DEC: Dek.
+  SECOND_PLURAL: Sekunden
+  MINUTE_PLURAL: Minuten
+  HOUR_PLURAL: Stunden
+  DAY_PLURAL: Tage
+  WEEK_PLURAL: Wochen
+  MONTH_PLURAL: Monate
+  YEAR_PLURAL: Jahre
+  DECADE_PLURAL: Jahrzehnte
+  SEC_PLURAL: Sekunden
+  MIN_PLURAL: Minuten
+  HR_PLURAL: Stunden
+  WK_PLURAL: Wochen
+  MO_PLURAL: Monate
+  YR_PLURAL: Jahre
+  DEC_PLURAL: Jahrzehnten
+FORM:
+  VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
+  INVALID_INPUT: Ungültige Eingabe in
+  MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - März
+  - April
+  - Mai
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - Dezember
+DAYS_OF_THE_WEEK:
+  - Montag
+  - Dienstag
+  - Mittwoch
+  - Donnerstag
+  - Freitag
+  - Samstag
+  - Sonntag

system/languages/el.yaml

@@ -0,0 +1,22 @@
+---
+MONTHS_OF_THE_YEAR:
+  - Ιανουάριος
+  - Φεβρουάριος
+  - Μάρτιος
+  - Απρίλιος
+  - Μάιος
+  - Ιούνιος
+  - Ιούλιος
+  - Αύγουστος
+  - Σεπτέμβριος
+  - Οκτώβριος
+  - Νοέμβριος
+  - Δεκέμβριος
+DAYS_OF_THE_WEEK:
+  - Δευτέρα
+  - Τρίτη
+  - Τετάρτη
+  - Πέμπτη
+  - Παρασκευή
+  - Σάββατο
+  - Κυριακή

system/languages/en.yaml

@@ -1,3 +1,4 @@
+FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Invalid Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
 INFLECTOR_PLURALS:
     '/(quiz)$/i': '\1zes'
     '/^(ox)$/i': '\1en'
@@ -54,5 +55,46 @@ INFLECTOR_ORDINALS:
     'first': 'st'
     'second': 'nd'
     'third': 'rd'
-
-
+NICETIME:
+    NO_DATE_PROVIDED: No date provided
+    BAD_DATE: Bad date
+    AGO: ago
+    FROM_NOW: from now
+    SECOND: second
+    MINUTE: minute
+    HOUR: hour
+    DAY: day
+    WEEK: week
+    MONTH: month
+    YEAR: year
+    DECADE: decade
+    SEC: sec
+    MIN: min
+    HR: hr
+    DAY: day
+    WK: wk
+    MO: mo
+    YR: yr
+    DEC: dec
+    SECOND_PLURAL: seconds
+    MINUTE_PLURAL: minutes
+    HOUR_PLURAL: hours
+    DAY_PLURAL: days
+    WEEK_PLURAL: weeks
+    MONTH_PLURAL: months
+    YEAR_PLURAL: years
+    DECADE_PLURAL: decades
+    SEC_PLURAL: secs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    DAY_PLURAL: days
+    WK_PLURAL: wks
+    MO_PLURAL: mos
+    YR_PLURAL: yrs
+    DEC_PLURAL: decs
+FORM:
+    VALIDATION_FAIL: <b>Validation failed:</b>
+    INVALID_INPUT: Invalid input in
+    MISSING_REQUIRED_FIELD: Missing required field:
+MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']

system/languages/es.yaml

@@ -0,0 +1,90 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Frontmatter Inválido
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  0: equipo
+  1: información
+  3: dinero
+  5: series
+  6: pescado
+  7: oveja
+INFLECTOR_IRREGULAR:
+  man: hombres
+  child: niños
+  sex: sexos
+INFLECTOR_ORDINALS:
+  first: ro
+  second: do
+  third: ro
+NICETIME:
+  NO_DATE_PROVIDED: No se proporcionó fecha
+  BAD_DATE: Fecha erronea
+  AGO: antes
+  FROM_NOW: desde ahora
+  SECOND: segundo
+  MINUTE: minuto
+  HOUR: hora
+  DAY: día
+  WEEK: semana
+  MONTH: mes
+  YEAR: año
+  DECADE: década
+  SEC: seg
+  MIN: min
+  HR: h
+  WK: sem
+  MO: mes
+  YR: año
+  DEC: dec
+  SECOND_PLURAL: segundos
+  MINUTE_PLURAL: minutos
+  HOUR_PLURAL: horas
+  DAY_PLURAL: días
+  WEEK_PLURAL: semanas
+  MONTH_PLURAL: meses
+  YEAR_PLURAL: años
+  DECADE_PLURAL: décadas
+  SEC_PLURAL: segs
+  MIN_PLURAL: mins
+  HR_PLURAL: hs
+  WK_PLURAL: sem
+  MO_PLURAL: mes
+  YR_PLURAL: años
+  DEC_PLURAL: décadas
+FORM:
+  VALIDATION_FAIL: '<b>Falló la validación. </b>'
+  INVALID_INPUT: 'Dato inválido en: '
+  MISSING_REQUIRED_FIELD: 'Falta el campo requerido: '
+MONTHS_OF_THE_YEAR:
+  - Enero
+  - Febrero
+  - Marzo
+  - Abril
+  - Mayo
+  - Junio
+  - Julio
+  - Agosto
+  - Septiembre
+  - Octubre
+  - Noviembre
+  - Diciembre
+DAYS_OF_THE_WEEK:
+  - Lunes
+  - Martes
+  - Miércoles
+  - Jueves
+  - Viernes
+  - Sábado
+  - Domingo

system/languages/fi.yaml

@@ -0,0 +1,60 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Päivämäärää ei annettu
+  BAD_DATE: Virheellinen päivämäärä
+  AGO: sitten
+  FROM_NOW: tästä lähtien
+  SECOND: sekunti
+  MINUTE: minuutti
+  HOUR: tunti
+  DAY: päivä
+  WEEK: viikko
+  MONTH: kuukausi
+  YEAR: vuosi
+  DECADE: vuosikymmen
+  SEC: sek
+  MIN: min
+  HR: h
+  WK: vk
+  MO: kk
+  YR: v
+  DEC: vuosikymmen
+  SECOND_PLURAL: sekuntia
+  MINUTE_PLURAL: minuuttia
+  HOUR_PLURAL: tuntia
+  DAY_PLURAL: päivää
+  WEEK_PLURAL: viikkoa
+  MONTH_PLURAL: kuukautta
+  YEAR_PLURAL: vuotta
+  DECADE_PLURAL: vuosikymmentä
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: v
+  MO_PLURAL: kk
+  YR_PLURAL: v
+  DEC_PLURAL: vuosikymmentä
+FORM:
+  VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+  MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
+MONTHS_OF_THE_YEAR:
+  - Tammikuu
+  - Helmikuu
+  - Maaliskuu
+  - Huhtikuu
+  - Toukokuu
+  - Kesäkuuta
+  - Heinäkuu
+  - Elokuu
+  - Syyskuu
+  - Lokakuu
+  - Marraskuu
+  - Joulukuu
+DAYS_OF_THE_WEEK:
+  - Maanantai
+  - Tiistai
+  - Keskiviikko
+  - Torstai
+  - Perjantai
+  - Lauantai
+  - Sunnuntai

system/languages/fr.yaml

@@ -0,0 +1,138 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Erreur : Frontmatter invalide
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+  /(bu)s$/i: '\1ses'
+  /(alias|status)/i: '\1es'
+  /(octop|vir)us$/i: '\1i'
+  /(ax|test)is$/i: '\1es'
+  /s$/i: s
+  /$/: s
+INFLECTOR_SINGULAR:
+  /(quiz)zes$/i: '\1'
+  /(matr)ices$/i: '\1ix'
+  /(vert|ind)ices$/i: '\1ex'
+  /^(ox)en/i: '\1'
+  /(alias|status)es$/i: '\1'
+  "/([octop|vir])i$/i": '\1us'
+  /(cris|ax|test)es$/i: '\1is'
+  /(shoe)s$/i: '\1'
+  /(o)es$/i: '\1'
+  /(bus)es$/i: '\1'
+  "/([m|l])ice$/i": '\1ouse'
+  /(x|ch|ss|sh)es$/i: '\1'
+  /(m)ovies$/i: '\1ovie'
+  /(s)eries$/i: '\1eries'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([lr])ves$/i": '\1f'
+  /(tive)s$/i: '\1'
+  /(hive)s$/i: '\1'
+  "/([^f])ves$/i": '\1fe'
+  /(^analy)ses$/i: '\1sis'
+  /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i: '\1\2sis'
+  "/([ti])a$/i": '\1um'
+  /(n)ews$/i: '\1ews'
+INFLECTOR_UNCOUNTABLE:
+  - équipement
+  - informations
+  - riz
+  - argent
+  - espèces
+  - séries
+  - poisson
+  - mouton
+INFLECTOR_IRREGULAR:
+  person: personnes
+  man: hommes
+  child: enfants
+  sex: sexes
+  move: déplacements
+INFLECTOR_ORDINALS:
+  default: ème
+  first: er
+  second: ème
+  third: ème
+NICETIME:
+  NO_DATE_PROVIDED: Aucune date fournie
+  BAD_DATE: Date erronée
+  AGO: plus tôt
+  FROM_NOW: à partir de maintenant
+  SECOND: seconde
+  MINUTE: minute
+  HOUR: heure
+  DAY: jour
+  WEEK: semaine
+  MONTH: mois
+  YEAR: année
+  DECADE: décennie
+  SEC: s
+  MIN: m
+  HR: h
+  WK: sem
+  MO: m
+  YR: an
+  DEC: déc
+  SECOND_PLURAL: secondes
+  MINUTE_PLURAL: minutes
+  HOUR_PLURAL: heures
+  DAY_PLURAL: jours
+  WEEK_PLURAL: semaines
+  MONTH_PLURAL: mois
+  YEAR_PLURAL: années
+  DECADE_PLURAL: décennies
+  SEC_PLURAL: s
+  MIN_PLURAL: m
+  HR_PLURAL: h
+  WK_PLURAL: sem
+  MO_PLURAL: mois
+  YR_PLURAL: a
+  DEC_PLURAL: décs
+FORM:
+  VALIDATION_FAIL: '<b>La validation a échoué :</b>'
+  INVALID_INPUT: Saisie non valide
+  MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :'
+MONTHS_OF_THE_YEAR:
+  - Janvier
+  - Février
+  - Mars
+  - Avril
+  - Mai
+  - Juin
+  - Juillet
+  - Août
+  - Septembre
+  - Octobre
+  - Novembre
+  - Décembre
+DAYS_OF_THE_WEEK:
+  - Lundi
+  - Mardi
+  - Mercredi
+  - Jeudi
+  - Vendredi
+  - Samedi
+  - Dimanche

system/languages/hr.yaml

@@ -0,0 +1,75 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  - oprema
+  - informacije
+  - riža
+  - novac
+  - vrsta
+  - serija
+  - riba
+  - ovca
+INFLECTOR_IRREGULAR:
+  person: osobe
+  man: ljudi
+  child: djeca
+  sex: spolovi
+  move: Pomakni
+NICETIME:
+  NO_DATE_PROVIDED: Datum nije upisan
+  BAD_DATE: Pogrešan datum
+  AGO: prije
+  FROM_NOW: od sada
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: sat
+  DAY: dan
+  WEEK: tjedan
+  MONTH: mjesec
+  YEAR: godina
+  DECADE: desetljeće
+  SEC: sek
+  HR: sat
+  WK: t
+  MO: m
+  YR: g
+  DEC: des
+  SECOND_PLURAL: sekundi
+  MINUTE_PLURAL: minuta
+  HOUR_PLURAL: sati
+  DAY_PLURAL: dan
+  WEEK_PLURAL: tjedana
+  MONTH_PLURAL: mjeseci
+  YEAR_PLURAL: godina
+  DECADE_PLURAL: desetljeća
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: sat
+  WK_PLURAL: t
+  MO_PLURAL: m
+  YR_PLURAL: g
+  DEC_PLURAL: des
+FORM:
+  VALIDATION_FAIL: '<b>Validacija nije uspjela:</b>'
+  INVALID_INPUT: Pogrešan unos u
+  MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:'
+MONTHS_OF_THE_YEAR:
+  - Siječanj
+  - Veljača
+  - Ožujak
+  - Travanj
+  - Svibanj
+  - Lipanj
+  - Srpanj
+  - Kolovoz
+  - Rujan
+  - Listopad
+  - Studeni
+  - Prosinac
+DAYS_OF_THE_WEEK:
+  - Ponedjeljak
+  - Utorak
+  - Srijeda
+  - Četvrtak
+  - Petak
+  - Subota
+  - Nedjelja

system/languages/hu.yaml

@@ -0,0 +1,138 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  cím: %1$s
+  ---
+  
+  # Hiba: Érvénytelen Frontmatter
+  
+  Elérési út: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+  /(bu)s$/i: '\1ses'
+  /(alias|status)/i: '\1es'
+  /(octop|vir)us$/i: '\1i'
+  /(ax|test)is$/i: '\1es'
+  /s$/i: s
+  /$/: s
+INFLECTOR_SINGULAR:
+  /(quiz)zes$/i: '\1'
+  /(matr)ices$/i: '\1ix'
+  /(vert|ind)ices$/i: '\1ex'
+  /^(ox)en/i: '\1'
+  /(alias|status)es$/i: '\1'
+  "/([octop|vir])i$/i": '\1us'
+  /(cris|ax|test)es$/i: '\1is'
+  /(shoe)s$/i: '\1'
+  /(o)es$/i: '\1'
+  /(bus)es$/i: '\1'
+  "/([m|l])ice$/i": '\1ouse'
+  /(x|ch|ss|sh)es$/i: '\1'
+  /(m)ovies$/i: '\1ovie'
+  /(s)eries$/i: '\1eries'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([lr])ves$/i": '\1f'
+  /(tive)s$/i: '\1'
+  /(hive)s$/i: '\1'
+  "/([^f])ves$/i": '\1fe'
+  /(^analy)ses$/i: '\1sis'
+  /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i: '\1\2sis'
+  "/([ti])a$/i": '\1um'
+  /(n)ews$/i: '\1ews'
+INFLECTOR_UNCOUNTABLE:
+  - felszerelés
+  - információ
+  - rizs
+  - pénz
+  - fajok
+  - sorozat
+  - hal
+  - juh
+INFLECTOR_IRREGULAR:
+  person: személyek
+  man: férfiak
+  child: gyerekek
+  sex: nemek
+  move: lépések
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
+NICETIME:
+  NO_DATE_PROVIDED: Nincs dátum megadva
+  BAD_DATE: Hibás dátum
+  AGO: elteltével
+  FROM_NOW: mostantól
+  SECOND: másodperc
+  MINUTE: perc
+  HOUR: óra
+  DAY: nap
+  WEEK: hét
+  MONTH: hónap
+  YEAR: év
+  DECADE: évtized
+  SEC: mp
+  MIN: p
+  HR: ó
+  WK: hét
+  MO: hó
+  YR: év
+  DEC: évt
+  SECOND_PLURAL: másodperc
+  MINUTE_PLURAL: perc
+  HOUR_PLURAL: óra
+  DAY_PLURAL: nap
+  WEEK_PLURAL: hét
+  MONTH_PLURAL: hónap
+  YEAR_PLURAL: év
+  DECADE_PLURAL: évtized
+  SEC_PLURAL: mp
+  MIN_PLURAL: perc
+  HR_PLURAL: ó
+  WK_PLURAL: hét
+  MO_PLURAL: hó
+  YR_PLURAL: év
+  DEC_PLURAL: évt
+FORM:
+  VALIDATION_FAIL: '<b>A validáció hibát talált:</b>'
+  INVALID_INPUT: 'Az itt megadott érték érvénytelen:'
+  MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
+MONTHS_OF_THE_YEAR:
+  - január
+  - február
+  - március
+  - április
+  - május
+  - június
+  - július
+  - augusztus
+  - szeptember
+  - október
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - hétfő
+  - kedd
+  - szerda
+  - csütörtök
+  - péntek
+  - szombat
+  - vasárnap

system/languages/it.yaml

@@ -0,0 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+NICETIME:
+  NO_DATE_PROVIDED: Nessuna data fornita
+  BAD_DATE: Data non valida
+  AGO: fa
+  FROM_NOW: da adesso
+  SECOND: secondo
+  MINUTE: minuto
+  HOUR: ora
+  DAY: giorno
+  WEEK: settimana
+  MONTH: mese
+  YEAR: anno
+  DECADE: decennio
+  SEC: sec
+  MIN: min
+  HR: ora
+  WK: settimana
+  MO: mese
+  YR: anno
+  DEC: decennio
+  SECOND_PLURAL: secondi
+  MINUTE_PLURAL: minuti
+  HOUR_PLURAL: ore
+  DAY_PLURAL: giorni
+  WEEK_PLURAL: settimane
+  MONTH_PLURAL: mesi
+  YEAR_PLURAL: anni
+  DECADE_PLURAL: decadi
+  SEC_PLURAL: secondi
+  MIN_PLURAL: minuti
+  HR_PLURAL: ore
+  WK_PLURAL: settimane
+  MO_PLURAL: mesi
+  YR_PLURAL: anni
+  DEC_PLURAL: decenni
+FORM:
+  VALIDATION_FAIL: '<b>Validazione fallita:</b>'
+  INVALID_INPUT: Input non valido in
+  MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
+MONTHS_OF_THE_YEAR:
+  - Gennaio
+  - Febbraio
+  - Marzo
+  - Aprile
+  - Maggio
+  - Giugno
+  - Luglio
+  - Agosto
+  - Settembre
+  - Ottobre
+  - Novembre
+  - Dicembre
+DAYS_OF_THE_WEEK:
+  - Lunedì
+  - Martedì
+  - Mercoledì
+  - Giovedì
+  - Venerdì
+  - Sabato
+  - Domenica

system/languages/ja.yaml

@@ -0,0 +1,59 @@
+FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Invalid Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+INFLECTOR_PLURALS: []
+
+INFLECTOR_SINGULAR: []
+
+INFLECTOR_UNCOUNTABLE: []
+
+INFLECTOR_IRREGULAR:
+    'person': 'みんな'
+    'man': '人'
+    'child': '子供'
+    'sex': '性別'
+    'move': '移動'
+    
+INFLECTOR_ORDINALS: []
+
+NICETIME:
+    NO_DATE_PROVIDED: 日付が設定されていません
+    BAD_DATE: 不正な日付
+    AGO: 前
+    FROM_NOW: from now
+    SECOND: 秒
+    MINUTE: 分
+    HOUR: 時
+    DAY: 日
+    WEEK: 週
+    MONTH: 月
+    YEAR: 年
+    DECADE: 10年
+    SEC: 秒
+    MIN: 分
+    HR: 時
+    DAY: 日
+    WK: 週
+    MO: 月
+    YR: 年
+    DEC: dec
+    SECOND_PLURAL: 秒
+    MINUTE_PLURAL: 分
+    HOUR_PLURAL: 時
+    DAY_PLURAL: 日
+    WEEK_PLURAL: 週
+    MONTH_PLURAL: 月
+    YEAR_PLURAL: 年
+    DECADE_PLURAL: 10年
+    SEC_PLURAL: 秒
+    MIN_PLURAL: 分
+    HR_PLURAL: 時
+    DAY_PLURAL: 日
+    WK_PLURAL: 週
+    MO_PLURAL: 月
+    YR_PLURAL: 年
+    DEC_PLURAL: 10年
+FORM:
+    VALIDATION_FAIL: <b>バリデーション失敗 :</b>
+    INVALID_INPUT: 不正な入力：
+    MISSING_REQUIRED_FIELD: 必須項目が入力されていません:
+MONTHS_OF_THE_YEAR: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+DAYS_OF_THE_WEEK: ['月', '火', '水', '木', '金', '土', '日']

system/languages/lt.yaml

@@ -0,0 +1,69 @@
+---
+INFLECTOR_UNCOUNTABLE:
+  2: ryžiai
+  3: pinigai
+  4: prieskoniai
+  5: serijos
+  6: žuvis
+  7: avis
+INFLECTOR_IRREGULAR:
+  person: žmonės
+  man: žmogus
+  child: vaikai
+  sex: lytys
+  move: juda
+NICETIME:
+  NO_DATE_PROVIDED: Nenurodyta data
+  BAD_DATE: Neteisinga data
+  AGO: prieš
+  FROM_NOW: nuo dabar
+  SECOND: sekundė
+  MINUTE: minutė
+  HOUR: valanda
+  DAY: diena
+  WEEK: savaitė
+  MONTH: mėnuo
+  YEAR: metai
+  DECADE: dešimtmetis
+  SEC: sek
+  MIN: min
+  HR: val
+  WK: sav
+  MO: mėn
+  YR: m
+  MINUTE_PLURAL: minutės
+  HOUR_PLURAL: valandos
+  DAY_PLURAL: dienos
+  WEEK_PLURAL: savaitės
+  MONTH_PLURAL: mėnesiai
+  YEAR_PLURAL: metai
+  DECADE_PLURAL: dešimtmečiai
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: val
+  WK_PLURAL: sav
+  MO_PLURAL: mėn
+  YR_PLURAL: m
+FORM:
+  MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:'
+MONTHS_OF_THE_YEAR:
+  - Sausis
+  - Vasaris
+  - Kovas
+  - Balandis
+  - Gegužė
+  - Birželis
+  - Liepa
+  - Rugpjūtis
+  - Rugsėjis
+  - Spalis
+  - Lakpritis
+  - Gruodis
+DAYS_OF_THE_WEEK:
+  - Pirmadienis
+  - Antradienis
+  - Trečiadienis
+  - Ketvirtadienis
+  - Penktadienis
+  - Šeštadienis
+  - Sekmadienis

system/languages/nb.yaml

@@ -0,0 +1,2 @@
+MONTHS_OF_THE_YEAR: ['januar', 'februar', 'mars', 'april', 'mai', 'juni', 'juli', 'august', 'september', 'oktober', 'november', 'desember']
+DAYS_OF_THE_WEEK: ['mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag', 'søndag']

system/languages/nl.yaml

@@ -0,0 +1,64 @@
+---
+INFLECTOR_IRREGULAR:
+  person: personen
+  man: mensen
+  child: kinderen
+  sex: geslacht
+  move: verplaatsen
+NICETIME:
+  NO_DATE_PROVIDED: geen datum opgegeven
+  BAD_DATE: Datumformaat onjuist
+  AGO: geleden
+  FROM_NOW: vanaf nu
+  SECOND: seconde
+  MINUTE: minuut
+  HOUR: uur
+  DAY: dag
+  WEEK: week
+  MONTH: maand
+  YEAR: jaar
+  DECADE: decenium
+  SEC: s
+  MIN: min
+  HR: u
+  MO: ma
+  YR: j
+  SECOND_PLURAL: seconden
+  MINUTE_PLURAL: minuten
+  HOUR_PLURAL: uren
+  DAY_PLURAL: dagen
+  WEEK_PLURAL: weken
+  MONTH_PLURAL: maanden
+  YEAR_PLURAL: jaren
+  DECADE_PLURAL: decennia
+  SEC_PLURAL: seconden
+  MIN_PLURAL: minuten
+  HR_PLURAL: uren
+  WK_PLURAL: weken
+  MO_PLURAL: maanden
+  YR_PLURAL: jaren
+FORM:
+  VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+  INVALID_INPUT: Ongeldige invoer in
+  MISSING_REQUIRED_FIELD: 'Verplicht veld ontbreekt:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februari
+  - Maart
+  - april
+  - Mei
+  - Juni
+  - Juli
+  - Augustus
+  - september
+  - Oktober
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - Maandag
+  - Dinsdag
+  - Woensdag
+  - Donderdag
+  - Vrijdag
+  - Zaterdag
+  - Zondag

system/languages/no.yaml

@@ -0,0 +1,93 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Tittel: %1$s
+  ---
+  
+  # Feilmelding: Ugyldig Frontmatter
+  
+  Pane: '%2$s'
+  
+  **%3$s **
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+INFLECTOR_UNCOUNTABLE:
+  - utstyr
+  - informasjon
+  - ris
+  - penger
+  - arter
+  - serier
+  - fisk
+  - sau
+INFLECTOR_IRREGULAR:
+  person: folk
+  man: menn
+  child: barn
+  sex: kjønn
+  move: trekk
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato gitt
+  BAD_DATE: Dårlig dato
+  AGO: siden
+  FROM_NOW: fra nå
+  SECOND: sekund
+  MINUTE: minutt
+  HOUR: time
+  DAY: dag
+  WEEK: uke
+  MONTH: måned
+  YEAR: år
+  DECADE: tiår
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: uke
+  MO: må
+  YR: år
+  DEC: des
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dager
+  WEEK_PLURAL: uker
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: tiår
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uker
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislyktes:</b>'
+  INVALID_INPUT: Ugyldig innhold i
+  MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:'
+MONTHS_OF_THE_YEAR:
+  - januar
+  - februar
+  - mars
+  - april
+  - mai
+  - juni
+  - juli
+  - august
+  - september
+  - oktober
+  - november
+  - desember
+DAYS_OF_THE_WEEK:
+  - mandag
+  - tirsdag
+  - onsdag
+  - torsdag
+  - fredag
+  - lørdag
+  - søndag

system/languages/pl.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Nieprawidłowy Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Nie podano daty
+  BAD_DATE: Zła data
+  AGO: temu
+  FROM_NOW: od teraz
+  SECOND: sekunda
+  MINUTE: minuta
+  HOUR: godzina
+  DAY: dzień
+  WEEK: tydzień
+  MONTH: miesiąc
+  YEAR: rok
+  DECADE: dekada
+  SEC: sek
+  MIN: min
+  HR: godz
+  WK: tydz
+  MO: m-c
+  YR: rok
+  DEC: dekada
+  SECOND_PLURAL: sekund
+  MINUTE_PLURAL: minut
+  HOUR_PLURAL: godzin
+  DAY_PLURAL: dni
+  WEEK_PLURAL: tygodnie
+  MONTH_PLURAL: miesięcy
+  YEAR_PLURAL: lat
+  DECADE_PLURAL: dekad
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: godz
+  WK_PLURAL: tyg
+  MO_PLURAL: m-ce
+  YR_PLURAL: lat
+  DEC_PLURAL: dekad
+FORM:
+  VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
+  INVALID_INPUT: Nieprawidłowe dane wejściowe
+  MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
+MONTHS_OF_THE_YEAR:
+  - Styczeń
+  - Luty
+  - Marzec
+  - Kwiecień
+  - Maj
+  - Czerwiec
+  - Lipiec
+  - Sierpień
+  - Wrzesień
+  - Październik
+  - Listopad
+  - Grudzień
+DAYS_OF_THE_WEEK:
+  - Poniedziałek
+  - Wtorek
+  - Środa
+  - Czwartek
+  - Piątek
+  - Sobota
+  - Niedziela

system/languages/pt.yaml

@@ -0,0 +1,79 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  título: %1$s
+  ---
+  
+  # Erro: Frontmatter inválida
+  
+  Caminho: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_UNCOUNTABLE:
+  1: informação
+  2: arroz
+  3: dinheiro
+INFLECTOR_IRREGULAR:
+  man: homens
+  sex: sexos
+NICETIME:
+  NO_DATE_PROVIDED: Não foi fornecida data
+  BAD_DATE: Data inválida
+  AGO: atrás
+  FROM_NOW: a partir de agora
+  SECOND: segundo
+  MINUTE: minuto
+  HOUR: hora
+  DAY: dia
+  WEEK: semana
+  MONTH: mês
+  YEAR: ano
+  DECADE: década
+  SEC: seg
+  MIN: mín
+  HR: h
+  WK: sem
+  MO: m
+  YR: a
+  DEC: dec
+  SECOND_PLURAL: segundos
+  MINUTE_PLURAL: minutos
+  HOUR_PLURAL: horas
+  DAY_PLURAL: dias
+  WEEK_PLURAL: semanas
+  MONTH_PLURAL: meses
+  YEAR_PLURAL: anos
+  DECADE_PLURAL: décadas
+  SEC_PLURAL: seg
+  MIN_PLURAL: mins
+  HR_PLURAL: hrs
+  WK_PLURAL: sems
+  YR_PLURAL: anos
+FORM:
+  VALIDATION_FAIL: '<b>Validação falhada: </b>'
+  MISSING_REQUIRED_FIELD: 'Campo obrigatório ausente:'
+MONTHS_OF_THE_YEAR:
+  - Janeiro
+  - Fevereiro
+  - Março
+  - Abril
+  - Maio
+  - Junho
+  - Julho
+  - Agosto
+  - Setembro
+  - Outubro
+  - Novembro
+  - Dezembro
+DAYS_OF_THE_WEEK:
+  - Segunda
+  - Terça
+  - Quarta
+  - Quinta
+  - Sexta
+  - Sábado
+  - Domingo

system/languages/ro.yaml

@@ -0,0 +1,101 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titlu: %1$s
+  ---
+  # Eroare: Frontmatter este invalid
+  
+  Calea: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+INFLECTOR_PLURALS:
+  /(quiz)$/i: '\1zes'
+  /^(ox)$/i: '\1en'
+  "/([m|l])ouse$/i": '\1ice'
+  /(matr|vert|ind)ix|ex$/i: '\1ices'
+  /(x|ch|ss|sh)$/i: '\1es'
+  "/([^aeiouy]|qu)ies$/i": '\1y'
+  "/([^aeiouy]|qu)y$/i": '\1ies'
+  /(hive)$/i: '\1s'
+  "/(?:([^f])fe|([lr])f)$/i": '\1\2ves'
+  /sis$/i: ses
+  "/([ti])um$/i": '\1a'
+  /(buffal|tomat)o$/i: '\1oes'
+INFLECTOR_UNCOUNTABLE:
+  - echipament
+  - informaţie
+  - orez
+  - bani
+  - specii
+  - serii
+  - peşte
+  - oaie
+INFLECTOR_IRREGULAR:
+  person: persoane
+  man: bărbați
+  child: copii
+  sex: sexe
+  move: mutări
+NICETIME:
+  NO_DATE_PROVIDED: Nu există o dată prevăzută
+  BAD_DATE: Dată incorectă
+  AGO: în urmă
+  FROM_NOW: de acum
+  SECOND: secundă
+  MINUTE: minut
+  HOUR: oră
+  DAY: zi
+  WEEK: săptămână
+  MONTH: lună
+  YEAR: an
+  DECADE: decadă
+  SEC: sec
+  MIN: min
+  HR: oră
+  WK: săpt
+  MO: lună
+  YR: an
+  DEC: decadă
+  SECOND_PLURAL: secunde
+  MINUTE_PLURAL: minute
+  HOUR_PLURAL: ore
+  DAY_PLURAL: zile
+  WEEK_PLURAL: săptămâni
+  MONTH_PLURAL: luni
+  YEAR_PLURAL: ani
+  DECADE_PLURAL: decade
+  SEC_PLURAL: sec
+  MIN_PLURAL: min
+  HR_PLURAL: ore
+  WK_PLURAL: săpt
+  MO_PLURAL: luni
+  YR_PLURAL: ani
+  DEC_PLURAL: decenii
+FORM:
+  VALIDATION_FAIL: '<b>Validare nereușită</b>'
+  INVALID_INPUT: Date incorecte în
+  MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
+MONTHS_OF_THE_YEAR:
+  - Ianuarie
+  - Februarie
+  - Martie
+  - Aprilie
+  - Mai
+  - Iunie
+  - Iulie
+  - August
+  - Septembrie
+  - Octombrie
+  - Noiembrie
+  - Decembrie
+DAYS_OF_THE_WEEK:
+  - Luni
+  - Marți
+  - Miercuri
+  - Joi
+  - Vineri
+  - Sâmbătă
+  - Duminică

system/languages/ru.yaml

@@ -0,0 +1,81 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Ошибка: Недопустимое содержимое
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+INFLECTOR_IRREGULAR:
+  person: люди
+  man: человек
+  child: ребенок
+  sex: пол
+  move: движется
+NICETIME:
+  NO_DATE_PROVIDED: Дата не указана
+  BAD_DATE: Неверная дата
+  AGO: назад
+  FROM_NOW: теперь
+  SECOND: секунда
+  MINUTE: минута
+  HOUR: час
+  DAY: д
+  WEEK: неделя
+  MONTH: месяц
+  YEAR: год
+  DECADE: десятилетие
+  SEC: с
+  MIN: мин
+  HR: ч
+  WK: нед.
+  MO: мес.
+  YR: г.
+  DEC: гг.
+  SECOND_PLURAL: секунды
+  MINUTE_PLURAL: минуты
+  HOUR_PLURAL: часы
+  DAY_PLURAL: д
+  WEEK_PLURAL: недели
+  MONTH_PLURAL: месяцы
+  YEAR_PLURAL: годы
+  DECADE_PLURAL: десятилетия
+  SEC_PLURAL: с
+  MIN_PLURAL: мин
+  HR_PLURAL: ч
+  WK_PLURAL: нед
+  MO_PLURAL: мес
+  YR_PLURAL: г.
+  DEC_PLURAL: гг.
+FORM:
+  VALIDATION_FAIL: '<b>Проверка не удалась:</b>'
+  INVALID_INPUT: Неверный ввод в
+  MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:'
+MONTHS_OF_THE_YEAR:
+  - Январь
+  - Февраль
+  - Март
+  - Апрель
+  - Май
+  - Июнь
+  - Июль
+  - Август
+  - Сентябрь
+  - Октябрь
+  - Ноябрь
+  - Декабрь
+DAYS_OF_THE_WEEK:
+  - Понедельник
+  - Вторник
+  - Среда
+  - Четверг
+  - Пятница
+  - Суббота
+  - Воскресенье

system/languages/sk.yaml

@@ -0,0 +1,42 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
+  BAD_DATE: Nesprávny dátum
+  AGO: pred
+  FROM_NOW: odteraz
+  SECOND: sekunda
+  MINUTE: minúta
+  HOUR: hodina
+  DAY: deň
+  WEEK: týždeň
+  MONTH: mesiac
+  YEAR: rok
+  DECADE: desaťročie
+  SEC: sek
+  MIN: min
+  HR: hod
+FORM:
+  VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
+MONTHS_OF_THE_YEAR:
+  - Január
+  - Február
+  - Marec
+  - Apríl
+  - Máj
+  - Jún
+  - Júl
+  - August
+  - September
+  - Október
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Pondelok
+  - Utorok
+  - Streda
+  - Štvrtok
+  - Piatok
+  - Sobota
+  - Nedeľa

system/languages/sv.yaml

@@ -0,0 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: '--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```'
+NICETIME:
+  NO_DATE_PROVIDED: Inget datum har angivits
+  BAD_DATE: Ogiltigt datum
+  AGO: sedan
+  FROM_NOW: från nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: timme
+  DAY: dag
+  WEEK: vecka
+  MONTH: månad
+  YEAR: år
+  DECADE: årtionde
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: v
+  MO: m
+  YR: år
+  DEC: dec
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minuter
+  HOUR_PLURAL: timmar
+  DAY_PLURAL: dagar
+  WEEK_PLURAL: veckor
+  MONTH_PLURAL: månader
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtionden
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: t
+  WK_PLURAL: v
+  MO_PLURAL: må
+  YR_PLURAL: år
+  DEC_PLURAL: dec
+FORM:
+  VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+  INVALID_INPUT: Ogiltig indata i
+  MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februrari
+  - Mars
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - Augusti
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Måndag
+  - Tisdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lördag
+  - Söndag

system/languages/th.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  ชื่อเรื่อง: %1$s
+  ---
+  
+  # ข้อผิดพลาด: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: ไม่มีวันที่ให้
+  BAD_DATE: รูปแบบวันที่ผิด
+  AGO: ที่ผ่านมา
+  FROM_NOW: จากตอนนี้
+  SECOND: วินาที
+  MINUTE: นาที
+  HOUR: ชั่วโมง
+  DAY: วัน
+  WEEK: สัปดาห์
+  MONTH: เดือน
+  YEAR: ปี
+  DECADE: ทศวรรษที่ผ่านมา
+  SEC: วิ
+  MIN: นาที
+  HR: ชม.
+  WK: wk
+  MO: mo
+  YR: yr
+  DEC: dec
+  SECOND_PLURAL: วินาที
+  MINUTE_PLURAL: นาที
+  HOUR_PLURAL: ชั่วโมง
+  DAY_PLURAL: วัน
+  WEEK_PLURAL: สัปดาห์
+  MONTH_PLURAL: เดือน
+  YEAR_PLURAL: ปี
+  DECADE_PLURAL: ทศวรรษที่ผ่านมา
+  SEC_PLURAL: วินาที
+  MIN_PLURAL: นาที
+  HR_PLURAL: ชั่วโมง
+  WK_PLURAL: wks
+  MO_PLURAL: mos
+  YR_PLURAL: ปี
+  DEC_PLURAL: decs
+FORM:
+  VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
+  INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+  MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
+MONTHS_OF_THE_YEAR:
+  - มกราคม
+  - กุมภาพันธ์
+  - มีนาคม
+  - เมษายน
+  - พฤษภาคม
+  - มิถุนายน
+  - กรกฏาคม
+  - สิงหาคม
+  - กันยายน
+  - ตุลาคม
+  - พฤศจิกายน
+  - ธันวาคม
+DAYS_OF_THE_WEEK:
+  - จันทร์
+  - อังคาร
+  - พุธ
+  - พฤหัสบดี
+  - ศุกร์
+  - เสาร์
+  - อาทิตย์

system/languages/tr.yaml

@@ -0,0 +1,59 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Tarih yok
+  BAD_DATE: Yanlış tarih
+  AGO: önce
+  FROM_NOW: (şimdiden)
+  SECOND: saniye
+  MINUTE: dakika
+  HOUR: saat
+  DAY: gün
+  WEEK: hafta
+  MONTH: ay
+  YEAR: yıl
+  DECADE: onyıl
+  SEC: sn
+  MIN: dk
+  HR: sa
+  WK: hft
+  MO: ay
+  YR: yl
+  DEC: onyl
+  SECOND_PLURAL: saniye
+  MINUTE_PLURAL: dakika
+  HOUR_PLURAL: saat
+  DAY_PLURAL: gün
+  WEEK_PLURAL: hafta
+  MONTH_PLURAL: ay
+  YEAR_PLURAL: yıl
+  DECADE_PLURAL: onyıl
+  SEC_PLURAL: sn
+  MIN_PLURAL: dk
+  HR_PLURAL: sa
+  WK_PLURAL: hft
+  MO_PLURAL: ay
+  YR_PLURAL: yl
+  DEC_PLURAL: onyl
+FORM:
+  VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+MONTHS_OF_THE_YEAR:
+  - Ocak
+  - Şubat
+  - Mart
+  - Nisan
+  - Mayıs
+  - Haziran
+  - Temmuz
+  - Ağustos
+  - Eylül
+  - Ekim
+  - Kasım
+  - Aralık
+DAYS_OF_THE_WEEK:
+  - Pazartesi
+  - Salı
+  - Çarşamba
+  - Perşembe
+  - Cuma
+  - Cumartesi
+  - Pazar

system/languages/uk.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Помилка: Недопустимий вміст
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Не вказана дата
+  BAD_DATE: Невірна дата
+  AGO: назад
+  FROM_NOW: відтепер
+  SECOND: секунда
+  MINUTE: хвилина
+  HOUR: година
+  DAY: день
+  WEEK: тиждень
+  MONTH: місяць
+  YEAR: рік
+  DECADE: десятиріччя
+  SEC: с
+  MIN: хв
+  HR: год
+  WK: тиж.
+  MO: міс.
+  YR: р.
+  DEC: рр.
+  SECOND_PLURAL: секунди
+  MINUTE_PLURAL: хвилини
+  HOUR_PLURAL: години
+  DAY_PLURAL: дні
+  WEEK_PLURAL: тижні
+  MONTH_PLURAL: місяці
+  YEAR_PLURAL: роки
+  DECADE_PLURAL: десятиріччя
+  SEC_PLURAL: с
+  MIN_PLURAL: хв
+  HR_PLURAL: год
+  WK_PLURAL: тиж.
+  MO_PLURAL: міс.
+  YR_PLURAL: рр.
+  DEC_PLURAL: рр.
+FORM:
+  VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+  INVALID_INPUT: Невірне введення в
+  MISSING_REQUIRED_FIELD: 'Відсутнє необхідне поле:'
+MONTHS_OF_THE_YEAR:
+  - Січень
+  - Лютий
+  - Березень
+  - Квітень
+  - Травень
+  - Червень
+  - Липень
+  - Серпень
+  - Вересень
+  - Жовтень
+  - Листопад
+  - Грудень
+DAYS_OF_THE_WEEK:
+  - Понеділок
+  - Вівторок
+  - Середа
+  - Четвер
+  - "П'ятниця"
+  - Субота
+  - Неділя

system/languages/vi.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Không có ngày được cung cấp
+  BAD_DATE: Ngày không hợp lệ
+  AGO: cách đây
+  FROM_NOW: từ bây giờ
+  SECOND: giây
+  MINUTE: phút
+  HOUR: giờ
+  DAY: ngày
+  WEEK: tuần
+  MONTH: tháng
+  YEAR: năm
+  DECADE: thập kỷ
+  SEC: giây
+  MIN: phút
+  HR: giờ
+  WK: tuần
+  MO: tháng
+  YR: năm
+  DEC: thập kỷ
+  SECOND_PLURAL: giây
+  MINUTE_PLURAL: phút
+  HOUR_PLURAL: giờ
+  DAY_PLURAL: ngày
+  WEEK_PLURAL: tuần
+  MONTH_PLURAL: tháng
+  YEAR_PLURAL: năm
+  DECADE_PLURAL: thập kỷ
+  SEC_PLURAL: giây
+  MIN_PLURAL: phút
+  HR_PLURAL: giờ
+  WK_PLURAL: tuần
+  MO_PLURAL: tháng
+  YR_PLURAL: năm
+  DEC_PLURAL: thập kỷ
+FORM:
+  VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+  INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+  MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
+MONTHS_OF_THE_YEAR:
+  - Tháng 1
+  - Tháng 2
+  - Tháng 3
+  - Tháng 4
+  - Tháng 5
+  - Tháng 6
+  - Tháng 7
+  - Tháng 8
+  - Tháng 9
+  - Tháng 10
+  - Tháng Mười 11
+  - Tháng 12
+DAYS_OF_THE_WEEK:
+  - Thứ 2
+  - Thứ 3
+  - Thứ 4
+  - Thứ 5
+  - Thứ 6
+  - Thứ 7
+  - Chủ Nhật

system/pages/notfound.md

@@ -0,0 +1,5 @@
+---
+title: Not Found
+routable: false
+notfound: true
+---

system/router.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+if (PHP_SAPI !== 'cli-server') {
+    exit('This script cannot be run from browser. Run it from a CLI.');
+}
+
+$_SERVER['PHP_CLI_ROUTER'] = true;
+
+if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_NAME'])) {
+    return false;
+}
+
+$_SERVER = array_merge($_SERVER, $_ENV);
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['PHP_SELF'] = DIRECTORY_SEPARATOR . 'index.php';
+
+require 'index.php';
+
+error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);

system/src/Grav/Common/Backup/ZipBackup.php

@@ -1,47 +1,59 @@
 <?php
+/**
+ * @package    Grav.Common.Backup
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Backup;
 
-use Grav\Common\GravTrait;
-use Grav\Common\Filesystem\Folder;
+use Grav\Common\Grav;
+use Grav\Common\Inflector;
 
-/**
- * The ZipBackup class lets you create simple zip-backups of a grav site
- *
- * @author RocketTheme
- * @license MIT
- */
 class ZipBackup
 {
-    use GravTrait;
-
     protected static $ignorePaths = [
         'backup',
         'cache',
         'images',
-        'logs'
+        'logs',
+        'tmp'
     ];
 
     protected static $ignoreFolders = [
         '.git',
-        '.idea'
+        '.svn',
+        '.hg',
+        '.idea',
+        'node_modules'
     ];
 
+    /**
+     * Backup
+     *
+     * @param null          $destination
+     * @param callable|null $messager
+     *
+     * @return null|string
+     */
     public static function backup($destination = null, callable $messager = null)
     {
         if (!$destination) {
-            $destination = self::getGrav()['locator']->findResource('backup://', true);
+            $destination = Grav::instance()['locator']->findResource('backup://', true);
 
-            if (!$destination)
+            if (!$destination) {
                 throw new \RuntimeException('The backup folder is missing.');
-
-            Folder::mkdir($destination);
+            }
         }
 
-        $name = self::getGrav()['config']->get('site.title', basename(GRAV_ROOT));
+        $name = substr(strip_tags(Grav::instance()['config']->get('site.title', basename(GRAV_ROOT))), 0, 20);
+
+        $inflector = new Inflector();
 
         if (is_dir($destination)) {
             $date = date('YmdHis', time());
-            $filename = $name . '-' . $date . '.zip';
+            $filename = trim($inflector->hyphenize($name), '-') . '-' . $date . '.zip';
             $destination = rtrim($destination, DS) . DS . $filename;
         }
 
@@ -59,6 +71,8 @@ class ZipBackup
         $zip = new \ZipArchive();
         $zip->open($destination, \ZipArchive::CREATE);
 
+        $max_execution_time = ini_set('max_execution_time', 600);
+
         static::folderToZip(GRAV_ROOT, $zip, strlen(rtrim(GRAV_ROOT, DS) . DS), $messager);
 
         $messager && $messager([
@@ -80,6 +94,10 @@ class ZipBackup
 
         $zip->close();
 
+        if ($max_execution_time !== false) {
+            ini_set('max_execution_time', $max_execution_time);
+        }
+
         return $destination;
     }
 

system/src/Grav/Common/Browser.php

@@ -1,14 +1,23 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 /**
- * Simple wrapper for the very simple parse_user_agent() function
+ * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
  */
 class Browser
 {
-
     protected $useragent = [];
 
+    /**
+     * Browser constructor.
+     */
     public function __construct()
     {
         try {
@@ -18,24 +27,111 @@ class Browser
         }
     }
 
+    /**
+     * Get the current browser identifier
+     *
+     * Currently detected browsers:
+     *
+     * Android Browser
+     * BlackBerry Browser
+     * Camino
+     * Kindle / Silk
+     * Firefox / Iceweasel
+     * Safari
+     * Internet Explorer
+     * IEMobile
+     * Chrome
+     * Opera
+     * Midori
+     * Vivaldi
+     * TizenBrowser
+     * Lynx
+     * Wget
+     * Curl
+     *
+     * @return string the lowercase browser name
+     */
     public function getBrowser()
     {
         return strtolower($this->useragent['browser']);
     }
 
+    /**
+     * Get the current platform identifier
+     *
+     * Currently detected platforms:
+     *
+     * Desktop
+     *   -> Windows
+     *   -> Linux
+     *   -> Macintosh
+     *   -> Chrome OS
+     * Mobile
+     *   -> Android
+     *   -> iPhone
+     *   -> iPad / iPod Touch
+     *   -> Windows Phone OS
+     *   -> Kindle
+     *   -> Kindle Fire
+     *   -> BlackBerry
+     *   -> Playbook
+     *   -> Tizen
+     * Console
+     *   -> Nintendo 3DS
+     *   -> New Nintendo 3DS
+     *   -> Nintendo Wii
+     *   -> Nintendo WiiU
+     *   -> PlayStation 3
+     *   -> PlayStation 4
+     *   -> PlayStation Vita
+     *   -> Xbox 360
+     *   -> Xbox One
+     *
+     * @return string the lowercase platform name
+     */
     public function getPlatform()
     {
         return strtolower($this->useragent['platform']);
     }
 
+    /**
+     * Get the current full version identifier
+     *
+     * @return string the browser full version identifier
+     */
     public function getLongVersion()
     {
         return $this->useragent['version'];
     }
 
+    /**
+     * Get the current major version identifier
+     *
+     * @return string the browser major version identifier
+     */
     public function getVersion()
     {
         $version = explode('.', $this->getLongVersion());
+
         return intval($version[0]);
     }
+
+    /**
+     * Determine if the request comes from a human, or from a bot/crawler
+     *
+     * @return bool
+     */
+    public function isHuman()
+    {
+        $browser = $this->getBrowser();
+        if (empty($browser)) {
+            return false;
+        }
+
+        if (preg_match('~(bot|crawl)~i', $browser)) {
+            return false;
+        }
+
+        return true;
+    }
 }

system/src/Grav/Common/Cache.php

@@ -1,9 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
-use \Doctrine\Common\Cache\Cache as DoctrineCache;
+use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
+use RocketTheme\Toolbox\Event\Event;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
@@ -15,9 +23,6 @@ use Grav\Common\Filesystem\Folder;
  * MemCache
  * MemCacheD
  * FileSystem
- *
- * @author RocketTheme
- * @license MIT
  */
 class Cache extends Getters
 {
@@ -29,13 +34,18 @@ class Cache extends Getters
     protected $lifetime;
     protected $now;
 
+    /** @var Config $config */
     protected $config;
 
     /**
-     * @var DoctrineCache
+     * @var DoctrineCache\CacheProvider
      */
     protected $driver;
 
+    protected $driver_name;
+
+    protected $driver_setting;
+
     /**
      * @var bool
      */
@@ -44,36 +54,41 @@ class Cache extends Getters
     protected $cache_dir;
 
     protected static $standard_remove = [
-        'cache/twig/',
-        'cache/doctrine/',
-        'cache/compiled/',
-        'cache/validated-',
-        'images/',
-        'assets/',
+        'cache://twig/',
+        'cache://doctrine/',
+        'cache://compiled/',
+        'cache://validated-',
+        'cache://images',
+        'asset://',
     ];
 
     protected static $all_remove = [
-        'cache/',
-        'images/',
-        'assets/'
+        'cache://',
+        'cache://images',
+        'asset://',
+        'tmp://'
     ];
 
     protected static $assets_remove = [
-        'assets/'
+        'asset://'
     ];
 
     protected static $images_remove = [
-        'images/'
+        'cache://images'
     ];
 
     protected static $cache_remove = [
-        'cache/'
+        'cache://'
+    ];
+
+    protected static $tmp_remove = [
+        'tmp://'
     ];
 
     /**
      * Constructor
      *
-     * @params Grav $grav
+     * @param Grav $grav
      */
     public function __construct(Grav $grav)
     {
@@ -84,6 +99,7 @@ class Cache extends Getters
      * Initialization that sets a base key and the driver based on configuration settings
      *
      * @param  Grav $grav
+     *
      * @return void
      */
     public function init(Grav $grav)
@@ -99,10 +115,15 @@ class Cache extends Getters
 
         $prefix = $this->config->get('system.cache.prefix');
 
-        $this->enabled = (bool) $this->config->get('system.cache.enabled');
+        if (is_null($this->enabled)) {
+            $this->enabled = (bool)$this->config->get('system.cache.enabled');
+        }
 
         // Cache key allows us to invalidate all cache on configuration changes.
-        $this->key = substr(md5(($prefix ? $prefix : 'g') . $uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
+        $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION),
+                2, 8);
+
+        $this->driver_setting = $this->config->get('system.cache.driver');
 
         $this->driver = $this->getCacheDriver();
 
@@ -110,20 +131,58 @@ class Cache extends Getters
         $this->driver->setNamespace($this->key);
     }
 
+    /**
+     * Public accessor to set the enabled state of the cache
+     *
+     * @param $enabled
+     */
+    public function setEnabled($enabled)
+    {
+        $this->enabled = (bool) $enabled;
+    }
+
+    /**
+     * Returns the current enabled state
+     *
+     * @return bool
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Get cache state
+     *
+     * @return string
+     */
+    public function getCacheStatus()
+    {
+        return 'Cache: [' . ($this->enabled ? 'true' : 'false') . '] Setting: [' . $this->driver_setting . '] Driver: [' . $this->driver_name . ']';
+    }
+
     /**
      * Automatically picks the cache mechanism to use.  If you pick one manually it will use that
      * If there is no config option for $driver in the config, or it's set to 'auto', it will
      * pick the best option based on which cache extensions are installed.
      *
-     * @return DoctrineCacheDriver  The cache driver to use
+     * @return DoctrineCache\CacheProvider  The cache driver to use
      */
     public function getCacheDriver()
     {
-        $setting = $this->config->get('system.cache.driver');
+        $setting = $this->driver_setting;
         $driver_name = 'file';
 
+        // CLI compatibility requires a non-volatile cache driver
+        if ($this->config->get('system.cache.cli_compatibility') && (
+            $setting == 'auto' || $this->isVolatileDriver($setting))) {
+            $setting = $driver_name;
+        }
+
         if (!$setting || $setting == 'auto') {
-            if (extension_loaded('apc')) {
+            if (extension_loaded('apcu')) {
+                $driver_name = 'apcu';
+            } elseif (extension_loaded('apc')) {
                 $driver_name = 'apc';
             } elseif (extension_loaded('wincache')) {
                 $driver_name = 'wincache';
@@ -134,29 +193,58 @@ class Cache extends Getters
             $driver_name = $setting;
         }
 
+        $this->driver_name = $driver_name;
+
         switch ($driver_name) {
             case 'apc':
-                $driver = new \Doctrine\Common\Cache\ApcCache();
+                $driver = new DoctrineCache\ApcCache();
+                break;
+
+            case 'apcu':
+                $driver = new DoctrineCache\ApcuCache();
                 break;
 
             case 'wincache':
-                $driver = new \Doctrine\Common\Cache\WinCacheCache();
+                $driver = new DoctrineCache\WinCacheCache();
                 break;
 
             case 'xcache':
-                $driver = new \Doctrine\Common\Cache\XcacheCache();
+                $driver = new DoctrineCache\XcacheCache();
                 break;
 
             case 'memcache':
                 $memcache = new \Memcache();
-                $memcache->connect($this->config->get('system.cache.memcache.server','localhost'),
-                                   $this->config->get('system.cache.memcache.port', 11211));
-                $driver = new \Doctrine\Common\Cache\MemcacheCache();
+                $memcache->connect($this->config->get('system.cache.memcache.server', 'localhost'),
+                    $this->config->get('system.cache.memcache.port', 11211));
+                $driver = new DoctrineCache\MemcacheCache();
                 $driver->setMemcache($memcache);
                 break;
 
+            case 'memcached':
+                $memcached = new \Memcached();
+                $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
+                    $this->config->get('system.cache.memcached.port', 11211));
+                $driver = new DoctrineCache\MemcachedCache();
+                $driver->setMemcached($memcached);
+                break;
+
+            case 'redis':
+                $redis = new \Redis();
+                $socket = $this->config->get('system.cache.redis.socket', false);
+
+                if ($socket) {
+                    $redis->connect($socket);
+                } else {
+                    $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
+                    $this->config->get('system.cache.redis.port', 6379));
+                }
+
+                $driver = new DoctrineCache\RedisCache();
+                $driver->setRedis($redis);
+                break;
+
             default:
-                $driver = new \Doctrine\Common\Cache\FilesystemCache($this->cache_dir);
+                $driver = new DoctrineCache\FilesystemCache($this->cache_dir);
                 break;
         }
 
@@ -167,7 +255,8 @@ class Cache extends Getters
      * Gets a cached entry if it exists based on an id. If it does not exist, it returns false
      *
      * @param  string $id the id of the cached entry
-     * @return object     returns the cached entry, can be any type, or false if doesn't exist
+     *
+     * @return object|bool     returns the cached entry, can be any type, or false if doesn't exist
      */
     public function fetch($id)
     {
@@ -181,9 +270,9 @@ class Cache extends Getters
     /**
      * Stores a new cached entry.
      *
-     * @param  string $id       the id of the cached entry
+     * @param  string       $id       the id of the cached entry
      * @param  array|object $data     the data for the cached entry to store
-     * @param  int $lifetime    the lifetime to store the entry in seconds
+     * @param  int          $lifetime the lifetime to store the entry in seconds
      */
     public function save($id, $data, $lifetime = null)
     {
@@ -195,6 +284,34 @@ class Cache extends Getters
         }
     }
 
+    /**
+     * Deletes an item in the cache based on the id
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the item was deleted successfully
+     */
+    public function delete($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->delete($id);
+        }
+        return false;
+    }
+
+    /**
+     * Returns a boolean state of whether or not the item exists in the cache based on id key
+     *
+     * @param string $id    the id of the cached data entry
+     * @return bool         true if the cached items exists
+     */
+    public function contains($id)
+    {
+        if ($this->enabled) {
+            return $this->driver->contains(($id));
+        }
+        return false;
+    }
+
     /**
      * Getter method to get the cache key
      */
@@ -203,20 +320,29 @@ class Cache extends Getters
         return $this->key;
     }
 
+    /**
+     * Setter method to set key (Advanced)
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+        $this->driver->setNamespace($this->key);
+    }
+
     /**
      * Helper method to clear all Grav caches
      *
-     * @param string $remove    standard|all|assets-only|images-only|cache-only
+     * @param string $remove standard|all|assets-only|images-only|cache-only
      *
      * @return array
      */
     public static function clearCache($remove = 'standard')
     {
-
+        $locator = Grav::instance()['locator'];
         $output = [];
         $user_config = USER_DIR . 'config/system.yaml';
 
-        switch($remove) {
+        switch ($remove) {
             case 'all':
                 $remove_paths = self::$all_remove;
                 break;
@@ -229,31 +355,47 @@ class Cache extends Getters
             case 'cache-only':
                 $remove_paths = self::$cache_remove;
                 break;
+            case 'tmp-only':
+                $remove_paths = self::$tmp_remove;
+                break;
             default:
                 $remove_paths = self::$standard_remove;
         }
 
+        // Clearing cache event to add paths to clear
+        Grav::instance()->fireEvent('onBeforeCacheClear', new Event(['remove' => $remove, 'paths' => &$remove_paths]));
 
-        foreach ($remove_paths as $path) {
+        foreach ($remove_paths as $stream) {
 
-            $anything = false;
-            $files = glob(ROOT_DIR . $path . '*');
+            // Convert stream to a real path
+            try {
+                $path = $locator->findResource($stream, true, true);
 
-            foreach ($files as $file) {
-                if (is_file($file)) {
-                    if (@unlink($file)) {
-                        $anything = true;
-                    }
-                } elseif (is_dir($file)) {
-                    if (@Folder::delete($file)) {
-                        $anything = true;
+                $anything = false;
+                $files = glob($path . '/*');
+
+                if (is_array($files)) {
+                    foreach ($files as $file) {
+                        if (is_link($file)) {
+                            $output[] = '<yellow>Skipping symlink:  </yellow>' . $file;
+                        } elseif (is_file($file)) {
+                            if (@unlink($file)) {
+                                $anything = true;
+                            }
+                        } elseif (is_dir($file)) {
+                            if (Folder::delete($file)) {
+                                $anything = true;
+                            }
+                        }
                     }
                 }
-            }
 
-
-            if ($anything) {
-                $output[] = '<red>Cleared:  </red>' . $path . '*';
+                if ($anything) {
+                    $output[] = '<red>Cleared:  </red>' . $path . '/*';
+                }
+            } catch (\Exception $e) {
+                // stream not found or another error while deleting files.
+                $output[] = '<red>ERROR: </red>' . $e->getMessage();
             }
         }
 
@@ -301,4 +443,39 @@ class Cache extends Getters
 
         return $this->lifetime;
     }
+
+    /**
+     * Returns the current driver name
+     *
+     * @return mixed
+     */
+    public function getDriverName()
+    {
+        return $this->driver_name;
+    }
+
+    /**
+     * Returns the current driver setting
+     *
+     * @return mixed
+     */
+    public function getDriverSetting()
+    {
+        return $this->driver_setting;
+    }
+
+    /**
+     * is this driver a volatile driver in that it resides in PHP process memory
+     *
+     * @param $setting
+     * @return bool
+     */
+    public function isVolatileDriver($setting)
+    {
+        if (in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

system/src/Grav/Common/Composer.php

@@ -1,13 +1,13 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common;
 
-/**
- * Offers composer helper methods.
- *
- * @author  eschmar
- * @license MIT
- */
 class Composer
 {
     /** @const Default composer location */
@@ -35,6 +35,11 @@ class Composer
         return $path;
     }
 
+    /**
+     * Return the composer executable file path
+     *
+     * @return string
+     */
     public static function getComposerExecutor()
     {
         $executor = PHP_BINARY . ' ';

system/src/Grav/Common/Config/Blueprints.php

@@ -1,207 +0,0 @@
-<?php
-namespace Grav\Common\Config;
-
-use Grav\Common\File\CompiledYamlFile;
-use Grav\Common\Grav;
-use Grav\Common\Filesystem\Folder;
-use RocketTheme\Toolbox\Blueprints\Blueprints as BaseBlueprints;
-use RocketTheme\Toolbox\File\PhpFile;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
-
-/**
- * The Blueprints class contains configuration rules.
- *
- * @author RocketTheme
- * @license MIT
- */
-class Blueprints extends BaseBlueprints
-{
-    protected $grav;
-    protected $files = [];
-    protected $blueprints;
-
-    public function __construct(array $serialized = null, Grav $grav = null)
-    {
-        parent::__construct($serialized);
-        $this->grav = $grav ?: Grav::instance();
-    }
-
-    public function init()
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-
-        $blueprints = $locator->findResources('blueprints://config');
-        $plugins = $locator->findResources('plugins://');
-
-        $blueprintFiles = $this->getBlueprintFiles($blueprints, $plugins);
-
-        $this->loadCompiledBlueprints($plugins + $blueprints, $blueprintFiles);
-    }
-
-    protected function loadCompiledBlueprints($blueprints, $blueprintFiles)
-    {
-        $checksum = md5(serialize($blueprints));
-        $filename = CACHE_DIR . 'compiled/blueprints/' . $checksum .'.php';
-        $checksum .= ':'.md5(serialize($blueprintFiles));
-        $class = get_class($this);
-        $file = PhpFile::instance($filename);
-
-        if ($file->exists()) {
-            $cache = $file->exists() ? $file->content() : null;
-        } else {
-            $cache = null;
-        }
-
-
-        // Load real file if cache isn't up to date (or is invalid).
-        if (
-            !is_array($cache)
-            || empty($cache['checksum'])
-            || empty($cache['$class'])
-            || $cache['checksum'] != $checksum
-            || $cache['@class'] != $class
-        ) {
-            // Attempt to lock the file for writing.
-            $file->lock(false);
-
-            // Load blueprints.
-            $this->blueprints = new Blueprints();
-            foreach ($blueprintFiles as $key => $files) {
-                $this->loadBlueprints($key);
-            }
-
-            $cache = [
-                '@class' => $class,
-                'checksum' => $checksum,
-                'files' => $blueprintFiles,
-                'data' => $this->blueprints->toArray()
-            ];
-
-            // If compiled file wasn't already locked by another process, save it.
-            if ($file->locked() !== false) {
-                $file->save($cache);
-                $file->unlock();
-            }
-        } else {
-            $this->blueprints = new Blueprints($cache['data']);
-        }
-    }
-
-    /**
-     * Load global blueprints.
-     *
-     * @param string $key
-     * @param array $files
-     */
-    public function loadBlueprints($key, array $files = null)
-    {
-        if (is_null($files)) {
-            $files = $this->files[$key];
-        }
-        foreach ($files as $name => $item) {
-            $file = CompiledYamlFile::instance($item['file']);
-            $this->blueprints->embed($name, $file->content(), '/');
-        }
-    }
-
-    /**
-     * Get all blueprint files (including plugins).
-     *
-     * @param array $blueprints
-     * @param array $plugins
-     * @return array
-     */
-    protected function getBlueprintFiles(array $blueprints, array $plugins)
-    {
-        $list = [];
-        foreach (array_reverse($plugins) as $folder) {
-            $list += $this->detectPlugins($folder, true);
-        }
-        foreach (array_reverse($blueprints) as $folder) {
-            $list += $this->detectConfig($folder, true);
-        }
-        return $list;
-    }
-
-    /**
-     * Detects all plugins with a configuration file and returns last modification time.
-     *
-     * @param  string $lookup Location to look up from.
-     * @param  bool $blueprints
-     * @return array
-     * @internal
-     */
-    protected function detectPlugins($lookup = SYSTEM_DIR, $blueprints = false)
-    {
-        $find = $blueprints ? 'blueprints.yaml' : '.yaml';
-        $location = $blueprints ? 'blueprintFiles' : 'configFiles';
-        $path = trim(Folder::getRelativePath($lookup), '/');
-        if (isset($this->{$location}[$path])) {
-            return [$path => $this->{$location}[$path]];
-        }
-
-        $list = [];
-
-        if (is_dir($lookup)) {
-            $iterator = new \DirectoryIterator($lookup);
-
-            /** @var \DirectoryIterator $directory */
-            foreach ($iterator as $directory) {
-                if (!$directory->isDir() || $directory->isDot()) {
-                    continue;
-                }
-
-                $name = $directory->getBasename();
-                $filename = "{$path}/{$name}/" . ($find && $find[0] != '.' ? $find : $name . $find);
-
-                if (is_file($filename)) {
-                    $list["plugins/{$name}"] = ['file' => $filename, 'modified' => filemtime($filename)];
-                }
-            }
-        }
-
-        $this->{$location}[$path] = $list;
-
-        return [$path => $list];
-    }
-
-    /**
-     * Detects all plugins with a configuration file and returns last modification time.
-     *
-     * @param  string $lookup Location to look up from.
-     * @param  bool $blueprints
-     * @return array
-     * @internal
-     */
-    protected function detectConfig($lookup = SYSTEM_DIR, $blueprints = false)
-    {
-        $location = $blueprints ? 'blueprintFiles' : 'configFiles';
-        $path = trim(Folder::getRelativePath($lookup), '/');
-        if (isset($this->{$location}[$path])) {
-            return [$path => $this->{$location}[$path]];
-        }
-
-        if (is_dir($lookup)) {
-            // Find all system and user configuration files.
-            $options = [
-                'compare' => 'Filename',
-                'pattern' => '|\.yaml$|',
-                'filters' => [
-                    'key' => '|\.yaml$|',
-                    'value' => function (\RecursiveDirectoryIterator $file) use ($path) {
-                        return ['file' => "{$path}/{$file->getSubPathname()}", 'modified' => $file->getMTime()];
-                    }],
-                'key' => 'SubPathname'
-            ];
-
-            $list = Folder::all($lookup, $options);
-        } else {
-            $list = [];
-        }
-
-        $this->{$location}[$path] = $list;
-
-        return [$path => $list];
-    }
-}

system/src/Grav/Common/Config/CompiledBase.php

@@ -0,0 +1,247 @@
+<?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Config;
+
+use RocketTheme\Toolbox\File\PhpFile;
+
+abstract class CompiledBase
+{
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 1;
+
+    /**
+     * @var string  Filename (base name) of the compiled configuration.
+     */
+    public $name;
+
+    /**
+     * @var string|bool  Configuration checksum.
+     */
+    public $checksum;
+
+    /**
+     * @var string Cache folder to be used.
+     */
+    protected $cacheFolder;
+
+    /**
+     * @var array  List of files to load.
+     */
+    protected $files;
+
+    /**
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * @var mixed  Configuration object.
+     */
+    protected $object;
+
+    /**
+     * @param  string $cacheFolder  Cache folder to be used.
+     * @param  array  $files  List of files as returned from ConfigFileFinder class.
+     * @param string $path  Base path for the file list.
+     * @throws \BadMethodCallException
+     */
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        if (!$cacheFolder) {
+            throw new \BadMethodCallException('Cache folder not defined.');
+        }
+
+        $this->cacheFolder = $cacheFolder;
+        $this->files = $files;
+        $this->path = $path ? rtrim($path, '\\/') . '/' : '';
+    }
+
+    /**
+     * Get filename for the compiled PHP file.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function name($name = null)
+    {
+        if (!$this->name) {
+            $this->name = $name ?: md5(json_encode(array_keys($this->files)));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Function gets called when cached configuration is saved.
+     */
+    public function modified() {}
+
+    /**
+     * Load the configuration.
+     *
+     * @return mixed
+     */
+    public function load()
+    {
+        if ($this->object) {
+            return $this->object;
+        }
+
+        $filename = $this->createFilename();
+        if (!$this->loadCompiledFile($filename) && $this->loadFiles()) {
+            $this->saveCompiledFile($filename);
+        }
+
+        return $this->object;
+    }
+
+    /**
+     * Returns checksum from the configuration files.
+     *
+     * You can set $this->checksum = false to disable this check.
+     *
+     * @return bool|string
+     */
+    public function checksum()
+    {
+        if (!isset($this->checksum)) {
+            $this->checksum = md5(json_encode($this->files) . $this->version);
+        }
+
+        return $this->checksum;
+    }
+
+    protected function createFilename()
+    {
+        return "{$this->cacheFolder}/{$this->name()->name}.php";
+    }
+
+    /**
+     * Create configuration object.
+     *
+     * @param  array  $data
+     */
+    abstract protected function createObject(array $data = []);
+
+    /**
+     * Finalize configuration object.
+     */
+    abstract protected function finalizeObject();
+
+    /**
+     * Load single configuration file and append it to the correct position.
+     *
+     * @param  string  $name  Name of the position.
+     * @param  string  $filename  File to be loaded.
+     */
+    abstract protected function loadFile($name, $filename);
+
+    /**
+     * Load and join all configuration files.
+     *
+     * @return bool
+     * @internal
+     */
+    protected function loadFiles()
+    {
+        $this->createObject();
+
+        $list = array_reverse($this->files);
+        foreach ($list as $files) {
+            foreach ($files as $name => $item) {
+                $this->loadFile($name, $this->path . $item['file']);
+            }
+        }
+
+        $this->finalizeObject();
+
+        return true;
+    }
+
+    /**
+     * Load compiled file.
+     *
+     * @param  string  $filename
+     * @return bool
+     * @internal
+     */
+    protected function loadCompiledFile($filename)
+    {
+        if (!file_exists($filename)) {
+            return false;
+        }
+
+        $cache = include $filename;
+        if (
+            !is_array($cache)
+            || !isset($cache['checksum'])
+            || !isset($cache['data'])
+            || !isset($cache['@class'])
+            || $cache['@class'] != get_class($this)
+        ) {
+            return false;
+        }
+
+        // Load real file if cache isn't up to date (or is invalid).
+        if ($cache['checksum'] !== $this->checksum()) {
+            return false;
+        }
+
+        $this->createObject($cache['data']);
+
+        $this->finalizeObject();
+
+        return true;
+    }
+
+    /**
+     * Save compiled file.
+     *
+     * @param  string  $filename
+     * @throws \RuntimeException
+     * @internal
+     */
+    protected function saveCompiledFile($filename)
+    {
+        $file = PhpFile::instance($filename);
+
+        // Attempt to lock the file for writing.
+        try {
+            $file->lock(false);
+        } catch (\Exception $e) {
+            // Another process has locked the file; we will check this in a bit.
+        }
+
+        if ($file->locked() === false) {
+            // File was already locked by another process.
+            return;
+        }
+
+        $cache = [
+            '@class' => get_class($this),
+            'timestamp' => time(),
+            'checksum' => $this->checksum(),
+            'files' => $this->files,
+            'data' => $this->getState()
+        ];
+
+        $file->save($cache);
+        $file->unlock();
+        $file->free();
+
+        $this->modified();
+    }
+
+    protected function getState()
+    {
+        return $this->object->toArray();
+    }
+}

system/src/Grav/Common/Config/CompiledBlueprints.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+namespace Grav\Common\Config;
+
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\BlueprintSchema;
+use Grav\Common\Grav;
+
+class CompiledBlueprints extends CompiledBase
+{
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 2;
+
+    /**
+     * @var BlueprintSchema  Blueprints object.
+     */
+    protected $object;
+
+    /**
+     * Returns checksum from the configuration files.
+     *
+     * You can set $this->checksum = false to disable this check.
+     *
+     * @return bool|string
+     */
+    public function checksum()
+    {
+        if (!isset($this->checksum)) {
+            $this->checksum = md5(json_encode($this->files) . json_encode($this->getTypes()) . $this->version);
+        }
+
+        return $this->checksum;
+    }
+
+    /**
+     * Create configuration object.
+     *
+     * @param array  $data
+     */
+    protected function createObject(array $data = [])
+    {
+        $this->object = (new BlueprintSchema($data))->setTypes($this->getTypes());
+    }
+
+    /**
+     * Get list of form field types.
+     *
+     * @return array
+     */
+    protected function getTypes()
+    {
+        return Grav::instance()['plugins']->formFieldTypes ?: [];
+    }
+
+    /**
+     * Finalize configuration object.
+     */
+    protected function finalizeObject()
+    {
+    }
+
+    /**
+     * Load single configuration file and append it to the correct position.
+     *
+     * @param  string  $name  Name of the position.
+     * @param  array   $files  Files to be loaded.
+     */
+    protected function loadFile($name, $files)
+    {
+        // Load blueprint file.
+        $blueprint = new Blueprint($files);
+
+        $this->object->embed($name, $blueprint->load()->toArray(), '/', true);
+    }
+
+    /**
+     * Load and join all configuration files.
+     *
+     * @return bool
+     * @internal
+     */
+    protected function loadFiles()
+    {
+        $this->createObject();
+
+        // Convert file list into parent list.
+        $list = [];
+        foreach ($this->files as $files) {
+            foreach ($files as $name => $item) {
+                $list[$name][] = $this->path . $item['file'];
+            }
+        }
+
+        // Load files.
+        foreach ($list as $name => $files) {
+            $this->loadFile($name, $files);
+        }
+
+        $this->finalizeObject();
+
+        return true;
+    }
+
+    protected function getState()
+    {
+        return $this->object->getState();
+    }
+}

system/src/Grav/Common/Config/CompiledConfig.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Config;
+
+use Grav\Common\File\CompiledYamlFile;
+
+class CompiledConfig extends CompiledBase
+{
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 1;
+
+    /**
+     * @var Config  Configuration object.
+     */
+    protected $object;
+
+    /**
+     * @var callable  Blueprints loader.
+     */
+    protected $callable;
+
+    /**
+     * @var bool
+     */
+    protected $withDefaults;
+
+    /**
+     * Set blueprints for the configuration.
+     *
+     * @param callable $blueprints
+     * @return $this
+     */
+    public function setBlueprints(callable $blueprints)
+    {
+        $this->callable = $blueprints;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $withDefaults
+     * @return mixed
+     */
+    public function load($withDefaults = false)
+    {
+        $this->withDefaults = $withDefaults;
+
+        return parent::load();
+    }
+
+    /**
+     * Create configuration object.
+     *
+     * @param  array  $data
+     */
+    protected function createObject(array $data = [])
+    {
+        if ($this->withDefaults && empty($data) && is_callable($this->callable)) {
+            $blueprints = $this->callable;
+            $data = $blueprints()->getDefaults();
+        }
+
+        $this->object = new Config($data, $this->callable);
+    }
+
+    /**
+     * Finalize configuration object.
+     */
+    protected function finalizeObject()
+    {
+        $this->object->checksum($this->checksum());
+    }
+
+    /**
+     * Function gets called when cached configuration is saved.
+     */
+    public function modified()
+    {
+        $this->object->modified(true);
+    }
+
+    /**
+     * Load single configuration file and append it to the correct position.
+     *
+     * @param  string  $name  Name of the position.
+     * @param  string  $filename  File to be loaded.
+     */
+    protected function loadFile($name, $filename)
+    {
+        $file = CompiledYamlFile::instance($filename);
+        $this->object->join($name, $file->content(), '/');
+        $file->free();
+    }
+}

system/src/Grav/Common/Config/CompiledLanguages.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Config;
+
+use Grav\Common\File\CompiledYamlFile;
+
+class CompiledLanguages extends CompiledBase
+{
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 1;
+
+    /**
+     * @var Languages  Configuration object.
+     */
+    protected $object;
+
+    /**
+     * Create configuration object.
+     *
+     * @param  array  $data
+     */
+    protected function createObject(array $data = [])
+    {
+        $this->object = new Languages($data);
+    }
+
+    /**
+     * Finalize configuration object.
+     */
+    protected function finalizeObject()
+    {
+        $this->object->checksum($this->checksum());
+    }
+
+
+    /**
+     * Function gets called when cached configuration is saved.
+     */
+    public function modified()
+    {
+        $this->object->modified(true);
+    }
+
+    /**
+     * Load single configuration file and append it to the correct position.
+     *
+     * @param  string  $name  Name of the position.
+     * @param  string  $filename  File to be loaded.
+     */
+    protected function loadFile($name, $filename)
+    {
+        $file = CompiledYamlFile::instance($filename);
+        if (preg_match('|languages\.yaml$|', $filename)) {
+            $this->object->mergeRecursive((array)$file->content());
+        } else {
+            $this->object->join($name, $file->content(), '/');
+        }
+        $file->free();
+    }
+}

system/src/Grav/Common/Config/Config.php

@@ -1,476 +1,98 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
-use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Debugger;
 use Grav\Common\Grav;
 use Grav\Common\Data\Data;
-use RocketTheme\Toolbox\Blueprints\Blueprints;
-use RocketTheme\Toolbox\File\PhpFile;
-use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Grav\Common\Service\ConfigServiceProvider;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Config extends Data
 {
-    protected $grav;
-    protected $streams = [
-        'system' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['system'],
-            ]
-        ],
-        'user' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user'],
-            ]
-        ],
-        'blueprints' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://blueprints', 'system/blueprints'],
-            ]
-        ],
-        'config' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://config', 'system/config'],
-            ]
-        ],
-        'plugins' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://plugins'],
-             ]
-        ],
-        'plugin' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://plugins'],
-            ]
-        ],
-        'themes' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://themes'],
-            ]
-        ],
-        'languages' => [
-            'type' => 'ReadOnlyStream',
-            'prefixes' => [
-                '' => ['user://languages', 'system/languages'],
-            ]
-        ],
-        'cache' => [
-            'type' => 'Stream',
-            'prefixes' => [
-                '' => ['cache'],
-                'images' => ['images']
-            ]
-        ],
-        'log' => [
-            'type' => 'Stream',
-            'prefixes' => [
-                '' => ['logs']
-            ]
-        ],
-        'backup' => [
-            'type' => 'Stream',
-            'prefixes' => [
-                '' => ['backup']
-            ]
-        ]
-    ];
-
-    protected $setup = [];
-
-    protected $blueprintFiles = [];
-    protected $configFiles = [];
-    protected $languageFiles = [];
     protected $checksum;
-    protected $timestamp;
-
-    protected $configLookup;
-    protected $blueprintLookup;
-    protected $pluginLookup;
-    protected $languagesLookup;
-
-    protected $finder;
-    protected $environment;
-    protected $messages = [];
-
-    protected $languages;
-
-    public function __construct(array $setup = array(), Grav $grav = null, $environment = null)
-    {
-        $this->grav = $grav ?: Grav::instance();
-        $this->finder = new ConfigFinder;
-        $this->environment = $environment ?: 'localhost';
-        $this->messages[] = 'Environment Name: ' . $this->environment;
-
-        // Make sure that
-        if (!isset($setup['streams']['schemes'])) {
-            $setup['streams']['schemes'] = [];
-        }
-        $setup['streams']['schemes'] += $this->streams;
-
-        $setup = $this->autoDetectEnvironmentConfig($setup);
-
-        $this->setup = $setup;
-        parent::__construct($setup);
-
-        $this->check();
-    }
+    protected $modified = false;
 
     public function key()
     {
         return $this->checksum();
     }
 
-    public function reload()
+    public function checksum($checksum = null)
     {
-        $this->items = $this->setup;
-        $this->check();
-        $this->init();
-        $this->debug();
-
-        return $this;
-    }
-
-    protected function check()
-    {
-        $streams = isset($this->items['streams']['schemes']) ? $this->items['streams']['schemes'] : null;
-        if (!is_array($streams)) {
-            throw new \InvalidArgumentException('Configuration is missing streams.schemes!');
-        }
-        $diff = array_keys(array_diff_key($this->streams, $streams));
-        if ($diff) {
-            throw new \InvalidArgumentException(
-                sprintf('Configuration is missing keys %s from streams.schemes!', implode(', ', $diff))
-            );
-        }
-    }
-
-    public function debug()
-    {
-        foreach ($this->messages as $message) {
-            $this->grav['debugger']->addMessage($message);
-        }
-        $this->messages = [];
-    }
-
-    public function init()
-    {
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-
-        $this->configLookup = $locator->findResources('config://');
-        $this->blueprintLookup = $locator->findResources('blueprints://config');
-        $this->pluginLookup = $locator->findResources('plugins://');
-
-
-        $this->loadCompiledBlueprints($this->blueprintLookup, $this->pluginLookup, 'master');
-        $this->loadCompiledConfig($this->configLookup, $this->pluginLookup, 'master');
-
-        // process languages if supported
-        if ($this->get('system.languages.translations', true)) {
-            $this->languagesLookup = $locator->findResources('languages://');
-            $this->loadCompiledLanguages($this->languagesLookup, $this->pluginLookup, 'master');
-        }
-
-        $this->initializeLocator($locator);
-    }
-
-    public function checksum()
-    {
-        if (empty($this->checksum)) {
-            $checkBlueprints = $this->get('system.cache.check.blueprints', false);
-            $checkLanguages = $this->get('system.cache.check.languages', false);
-            $checkConfig = $this->get('system.cache.check.config', true);
-            $checkSystem = $this->get('system.cache.check.system', true);
-
-            if (!$checkBlueprints && !!$checkLanguages && $checkConfig && !$checkSystem) {
-                $this->messages[] = 'Skip configuration timestamp check.';
-                return false;
-            }
-
-            // Generate checksum according to the configuration settings.
-            if (!$checkConfig) {
-                // Just check changes in system.yaml files and ignore all the other files.
-                $cc = $checkSystem ? $this->finder->locateConfigFile($this->configLookup, 'system') : [];
-            } else {
-                // Check changes in all configuration files.
-                $cc = $this->finder->locateConfigFiles($this->configLookup, $this->pluginLookup);
-            }
-
-            if ($checkBlueprints) {
-                $cb = $this->finder->locateBlueprintFiles($this->blueprintLookup, $this->pluginLookup);
-            } else {
-                $cb = [];
-            }
-
-            if ($checkLanguages) {
-                $cl = $this->finder->locateLanguageFiles($this->languagesLookup, $this->pluginLookup);
-            } else {
-                $cl = [];
-            }
-
-            $this->checksum = md5(json_encode([$cc, $cb, $cl]));
+        if ($checksum !== null) {
+            $this->checksum = $checksum;
         }
 
         return $this->checksum;
     }
 
-    protected function autoDetectEnvironmentConfig($items)
+    public function modified($modified = null)
     {
-        $environment = $this->environment;
-        $env_stream = 'user://'.$environment.'/config';
-
-        if (file_exists(USER_DIR.$environment.'/config')) {
-            array_unshift($items['streams']['schemes']['config']['prefixes'][''], $env_stream);
+        if ($modified !== null) {
+            $this->modified = $modified;
         }
 
-        return $items;
+        return $this->modified;
     }
 
-    protected function loadCompiledBlueprints($blueprints, $plugins, $filename = null)
+    public function reload()
     {
-        $checksum = md5(json_encode($blueprints));
-        $filename = $filename
-            ? CACHE_DIR . 'compiled/blueprints/' . $filename . '-' . $this->environment . '.php'
-            : CACHE_DIR . 'compiled/blueprints/' . $checksum . '-' . $this->environment . '.php';
-        $file = PhpFile::instance($filename);
-        $cache = $file->exists() ? $file->content() : null;
-        $blueprintFiles = $this->finder->locateBlueprintFiles($blueprints, $plugins);
-        $checksum .= ':'.md5(json_encode($blueprintFiles));
-        $class = get_class($this);
+        $grav = Grav::instance();
 
-        // Load real file if cache isn't up to date (or is invalid).
-        if (
-            !is_array($cache)
-            || !isset($cache['checksum'])
-            || !isset($cache['@class'])
-            || $cache['checksum'] != $checksum
-            || $cache['@class'] != $class
-        ) {
-            // Attempt to lock the file for writing.
-            $file->lock(false);
+        // Load new configuration.
+        $config = ConfigServiceProvider::load($grav);
 
-            // Load blueprints.
-            $this->blueprints = new Blueprints;
-            foreach ($blueprintFiles as $files) {
-                $this->loadBlueprintFiles($files);
-            }
+        /** @var Debugger $debugger */
+        $debugger = $grav['debugger'];
 
-            $cache = [
-                '@class' => $class,
-                'checksum' => $checksum,
-                'files' => $blueprintFiles,
-                'data' => $this->blueprints->toArray()
-            ];
-            // If compiled file wasn't already locked by another process, save it.
-            if ($file->locked() !== false) {
-                $this->messages[] = 'Saving compiled blueprints.';
-                $file->save($cache);
-                $file->unlock();
-            }
-        } else {
-            $this->blueprints = new Blueprints($cache['data']);
+        if ($config->modified()) {
+            // Update current configuration.
+            $this->items = $config->toArray();
+            $this->checksum($config->checksum());
+            $this->modified(true);
+
+            $debugger->addMessage('Configuration was changed and saved.');
+        }
+
+        return $this;
+    }
+
+    public function debug()
+    {
+        /** @var Debugger $debugger */
+        $debugger = Grav::instance()['debugger'];
+
+        $debugger->addMessage('Environment Name: ' . $this->environment);
+        if ($this->modified()) {
+            $debugger->addMessage('Configuration reloaded and cached.');
         }
     }
 
-    protected function loadCompiledConfig($configs, $plugins, $filename = null)
+    public function init()
     {
-        $filename = $filename
-            ? CACHE_DIR . 'compiled/config/' . $filename . '-' . $this->environment . '.php'
-            : CACHE_DIR . 'compiled/config/' . $checksum . '-' . $this->environment . '.php';
-        $file = PhpFile::instance($filename);
-        $cache = $file->exists() ? $file->content() : null;
-        $class = get_class($this);
-        $checksum = $this->checksum();
-
-        if (
-            !is_array($cache)
-            || !isset($cache['checksum'])
-            || !isset($cache['@class'])
-            || $cache['@class'] != $class
-        ) {
-            $this->messages[] = 'No cached configuration, compiling new configuration..';
-        } else if ($cache['checksum'] !== $checksum) {
-            $this->messages[] = 'Configuration checksum mismatch, reloading configuration..';
-        } else {
-            $this->messages[] = 'Configuration checksum matches, using cached version.';
-
-            $this->items = $cache['data'];
-            return;
-        }
-
-        $configFiles = $this->finder->locateConfigFiles($configs, $plugins);
-
-        // Attempt to lock the file for writing.
-        $file->lock(false);
-
-        // Load configuration.
-        foreach ($configFiles as $files) {
-            $this->loadConfigFiles($files);
-        }
-        $cache = [
-            '@class' => $class,
-            'timestamp' => time(),
-            'checksum' => $checksum,
-            'data' => $this->toArray()
-        ];
-
-        // If compiled file wasn't already locked by another process, save it.
-        if ($file->locked() !== false) {
-            $this->messages[] = 'Saving compiled configuration.';
-            $file->save($cache);
-            $file->unlock();
-        }
-
-        $this->items = $cache['data'];
-    }
-
-    /**
-     * @param      $languages
-     * @param      $plugins
-     * @param null $filename
-     */
-    protected function loadCompiledLanguages($languages, $plugins, $filename = null)
-    {
-        $checksum = md5(json_encode($languages));
-        $filename = $filename
-            ? CACHE_DIR . 'compiled/languages/' . $filename . '-' . $this->environment . '.php'
-            : CACHE_DIR . 'compiled/languages/' . $checksum . '-' . $this->environment . '.php';
-        $file = PhpFile::instance($filename);
-        $cache = $file->exists() ? $file->content() : null;
-        $languageFiles = $this->finder->locateLanguageFiles($languages, $plugins);
-        $checksum .= ':' . md5(json_encode($languageFiles));
-        $class = get_class($this);
-
-        // Load real file if cache isn't up to date (or is invalid).
-        if (
-            !is_array($cache)
-            || !isset($cache['checksum'])
-            || !isset($cache['@class'])
-            || $cache['checksum'] != $checksum
-            || $cache['@class'] != $class
-        ) {
-            // Attempt to lock the file for writing.
-            $file->lock(false);
-
-            // Load languages.
-            $this->languages = new Languages;
-
-            if (isset($languageFiles['user/plugins'])) {
-                foreach ((array) $languageFiles['user/plugins'] as $plugin => $item) {
-                    $lang_file = CompiledYamlFile::instance($item['file']);
-                    $content = $lang_file->content();
-                    $this->languages->mergeRecursive($content);
-                }
-            }
-
-            if (isset($languageFiles['system/languages'])) {
-                foreach ((array) $languageFiles['system/languages'] as $lang => $item) {
-                    $lang_file = CompiledYamlFile::instance($item['file']);
-                    $content = $lang_file->content();
-                    $this->languages->join($lang, $content, '/');
-                }
-            }
-
-            $cache = [
-                '@class'   => $class,
-                'checksum' => $checksum,
-                'files'    => $languageFiles,
-                'data'     => $this->languages->toArray()
-            ];
-            // If compiled file wasn't already locked by another process, save it.
-            if ($file->locked() !== false) {
-                $this->messages[] = 'Saving compiled languages.';
-                $file->save($cache);
-                $file->unlock();
-            }
-        } else {
-            $this->languages = new Languages($cache['data']);
-        }
-    }
-
-    /**
-     * Load blueprints.
-     *
-     * @param array  $files
-     */
-    public function loadBlueprintFiles(array $files)
-    {
-        foreach ($files as $name => $item) {
-            $file = CompiledYamlFile::instance($item['file']);
-            $this->blueprints->embed($name, $file->content(), '/');
-        }
-    }
-
-    /**
-     * Load configuration.
-     *
-     * @param array  $files
-     */
-    public function loadConfigFiles(array $files)
-    {
-        foreach ($files as $name => $item) {
-            $file = CompiledYamlFile::instance($item['file']);
-            $this->join($name, $file->content(), '/');
-        }
-    }
-
-    /**
-     * Initialize resource locator by using the configuration.
-     *
-     * @param UniformResourceLocator $locator
-     */
-    public function initializeLocator(UniformResourceLocator $locator)
-    {
-        $locator->reset();
-
-        $schemes = (array) $this->get('streams.schemes', []);
-
-        foreach ($schemes as $scheme => $config) {
-            if (isset($config['paths'])) {
-                $locator->addPath($scheme, '', $config['paths']);
-            }
-            if (isset($config['prefixes'])) {
-                foreach ($config['prefixes'] as $prefix => $paths) {
-                    $locator->addPath($scheme, $prefix, $paths);
-                }
+        $setup = Grav::instance()['setup']->toArray();
+        foreach ($setup as $key => $value) {
+            if ($key === 'streams' || !is_array($value)) {
+                // Optimized as streams and simple values are fully defined in setup.
+                $this->items[$key] = $value;
+            } else {
+                $this->joinDefaults($key, $value);
             }
         }
     }
 
     /**
-     * Get available streams and their types from the configuration.
-     *
-     * @return array
+     * @return mixed
+     * @deprecated
      */
-    public function getStreams()
-    {
-        $schemes = [];
-        foreach ((array) $this->get('streams.schemes') as $scheme => $config) {
-            $type = !empty($config['type']) ? $config['type'] : 'ReadOnlyStream';
-            if ($type[0] != '\\') {
-                $type = '\\RocketTheme\\Toolbox\\StreamWrapper\\' . $type;
-            }
-
-            $schemes[$scheme] = $type;
-        }
-
-        return $schemes;
-    }
-
     public function getLanguages()
     {
-        return $this->languages;
+        return Grav::instance()['languages'];
     }
 }

system/src/Grav/Common/Config/ConfigFileFinder.php

@@ -0,0 +1,262 @@
+<?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Config;
+
+use Grav\Common\Filesystem\Folder;
+
+class ConfigFileFinder
+{
+    protected $base = '';
+
+    /**
+     * @param string $base
+     * @return $this
+     */
+    public function setBase($base)
+    {
+        $this->base = $base ? "{$base}/" : '';
+
+        return $this;
+    }
+
+    /**
+     * Return all locations for all the files with a timestamp.
+     *
+     * @param  array  $paths    List of folders to look from.
+     * @param  string $pattern  Pattern to match the file. Pattern will also be removed from the key.
+     * @param  int    $levels   Maximum number of recursive directories.
+     * @return array
+     */
+    public function locateFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
+    {
+        $list = [];
+        foreach ($paths as $folder) {
+            $list += $this->detectRecursive($folder, $pattern, $levels);
+        }
+        return $list;
+    }
+
+    /**
+     * Return all locations for all the files with a timestamp.
+     *
+     * @param  array  $paths    List of folders to look from.
+     * @param  string $pattern  Pattern to match the file. Pattern will also be removed from the key.
+     * @param  int    $levels   Maximum number of recursive directories.
+     * @return array
+     */
+    public function getFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
+    {
+        $list = [];
+        foreach ($paths as $folder) {
+            $path = trim(Folder::getRelativePath($folder), '/');
+
+            $files = $this->detectRecursive($folder, $pattern, $levels);
+
+            $list += $files[trim($path, '/')];
+        }
+        return $list;
+    }
+
+    /**
+     * Return all paths for all the files with a timestamp.
+     *
+     * @param  array  $paths    List of folders to look from.
+     * @param  string $pattern  Pattern to match the file. Pattern will also be removed from the key.
+     * @param  int    $levels   Maximum number of recursive directories.
+     * @return array
+     */
+    public function listFiles(array $paths, $pattern = '|\.yaml$|', $levels = -1)
+    {
+        $list = [];
+        foreach ($paths as $folder) {
+            $list = array_merge_recursive($list, $this->detectAll($folder, $pattern, $levels));
+        }
+        return $list;
+    }
+
+    /**
+     * Find filename from a list of folders.
+     *
+     * Note: Only finds the last override.
+     *
+     * @param string $filename
+     * @param array $folders
+     * @return array
+     */
+    public function locateFileInFolder($filename, array $folders)
+    {
+        $list = [];
+        foreach ($folders as $folder) {
+            $list += $this->detectInFolder($folder, $filename);
+        }
+        return $list;
+    }
+
+    /**
+     * Find filename from a list of folders.
+     *
+     * @param array $folders
+     * @param string $filename
+     * @return array
+     */
+    public function locateInFolders(array $folders, $filename = null)
+    {
+        $list = [];
+        foreach ($folders as $folder) {
+            $path = trim(Folder::getRelativePath($folder), '/');
+            $list[$path] = $this->detectInFolder($folder, $filename);
+        }
+        return $list;
+    }
+
+    /**
+     * Return all existing locations for a single file with a timestamp.
+     *
+     * @param  array  $paths   Filesystem paths to look up from.
+     * @param  string $name    Configuration file to be located.
+     * @param  string $ext     File extension (optional, defaults to .yaml).
+     * @return array
+     */
+    public function locateFile(array $paths, $name, $ext = '.yaml')
+    {
+        $filename = preg_replace('|[.\/]+|', '/', $name) . $ext;
+
+        $list = [];
+        foreach ($paths as $folder) {
+            $path = trim(Folder::getRelativePath($folder), '/');
+
+            if (is_file("{$folder}/{$filename}")) {
+                $modified = filemtime("{$folder}/{$filename}");
+            } else {
+                $modified = 0;
+            }
+            $basename = $this->base . $name;
+            $list[$path] = [$basename => ['file' => "{$path}/{$filename}", 'modified' => $modified]];
+        }
+
+        return $list;
+    }
+
+    /**
+     * Detects all directories with a configuration file and returns them with last modification time.
+     *
+     * @param  string $folder   Location to look up from.
+     * @param  string $pattern  Pattern to match the file. Pattern will also be removed from the key.
+     * @param  int    $levels   Maximum number of recursive directories.
+     * @return array
+     * @internal
+     */
+    protected function detectRecursive($folder, $pattern, $levels)
+    {
+        $path = trim(Folder::getRelativePath($folder), '/');
+
+        if (is_dir($folder)) {
+            // Find all system and user configuration files.
+            $options = [
+                'levels'  => $levels,
+                'compare' => 'Filename',
+                'pattern' => $pattern,
+                'filters' => [
+                    'pre-key' => $this->base,
+                    'key' => $pattern,
+                    'value' => function (\RecursiveDirectoryIterator $file) use ($path) {
+                        return ['file' => "{$path}/{$file->getSubPathname()}", 'modified' => $file->getMTime()];
+                    }
+                ],
+                'key' => 'SubPathname'
+            ];
+
+            $list = Folder::all($folder, $options);
+
+            ksort($list);
+        } else {
+            $list = [];
+        }
+
+        return [$path => $list];
+    }
+
+    /**
+     * Detects all directories with the lookup file and returns them with last modification time.
+     *
+     * @param  string $folder Location to look up from.
+     * @param  string $lookup Filename to be located (defaults to directory name).
+     * @return array
+     * @internal
+     */
+    protected function detectInFolder($folder, $lookup = null)
+    {
+        $folder = rtrim($folder, '/');
+        $path = trim(Folder::getRelativePath($folder), '/');
+        $base = $path === $folder ? '' : ($path ? substr($folder, 0, -strlen($path)) : $folder . '/');
+
+        $list = [];
+
+        if (is_dir($folder)) {
+            $iterator = new \DirectoryIterator($folder);
+
+            /** @var \DirectoryIterator $directory */
+            foreach ($iterator as $directory) {
+                if (!$directory->isDir() || $directory->isDot()) {
+                    continue;
+                }
+
+                $name = $directory->getBasename();
+                $find = ($lookup ?: $name) . '.yaml';
+                $filename = "{$path}/{$name}/{$find}";
+
+                if (file_exists($base . $filename)) {
+                    $basename = $this->base . $name;
+                    $list[$basename] = ['file' => $filename, 'modified' => filemtime($base . $filename)];
+                }
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Detects all plugins with a configuration file and returns them with last modification time.
+     *
+     * @param  string $folder   Location to look up from.
+     * @param  string $pattern  Pattern to match the file. Pattern will also be removed from the key.
+     * @param  int    $levels   Maximum number of recursive directories.
+     * @return array
+     * @internal
+     */
+    protected function detectAll($folder, $pattern, $levels)
+    {
+        $path = trim(Folder::getRelativePath($folder), '/');
+
+        if (is_dir($folder)) {
+            // Find all system and user configuration files.
+            $options = [
+                'levels'  => $levels,
+                'compare' => 'Filename',
+                'pattern' => $pattern,
+                'filters' => [
+                    'pre-key' => $this->base,
+                    'key' => $pattern,
+                    'value' => function (\RecursiveDirectoryIterator $file) use ($path) {
+                        return ["{$path}/{$file->getSubPathname()}" => $file->getMTime()];
+                    }
+                ],
+                'key' => 'SubPathname'
+            ];
+
+            $list = Folder::all($folder, $options);
+
+            ksort($list);
+        } else {
+            $list = [];
+        }
+
+        return $list;
+    }
+}