Merge branch 'release/1.6.25'

Signed-off-by: Andy Miller <rhuk@mac.com>

.dependencies

@@ -11,9 +11,9 @@ git:
         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
+    quark:
+        url: https://github.com/getgrav/grav-theme-quark
+        path: user/themes/quark
         branch: master
 links:
     problems:
@@ -28,7 +28,7 @@ links:
         src: grav-plugin-markdown-notices
         path: user/plugins/markdown-notices
         scm: github
-    antimatter:
-        src: grav-theme-antimatter
-        path: user/themes/antimatter
+    quark:
+        src: grav-theme-quark
+        path: user/themes/quark
         scm: github

.editorconfig

@@ -13,6 +13,5 @@ indent_style = space
 indent_size = 4
 
 # 2 space indentation
-[*.yaml, *.yml]
-indent_style = space
+[*.{yaml,yml}]
 indent_size = 2

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: grav
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: # Replace with a single custom sponsorship URL

.gitignore

@@ -37,9 +37,10 @@ Thumbs.db
 
 # phpstorm
 .idea/*
-user/config/security.yaml
 
+# testing stuff
 tests/_output/*
 tests/_support/_generated/*
 tests/cache/*
 tests/error.log
+system/templates/testing/*

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 php:
-  - '5.5'
-  - '5.6'
-  - '7.0.21'
   - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
 branches:
   only:
     - develop
@@ -13,13 +13,6 @@ notifications:
   email:
     on_success: never
     on_failure: always
-  hipchat:
-  # hipchat_api@grav
-    rooms:
-      - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
-    template:
-      - '%{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:
@@ -53,10 +46,10 @@ before_install:
   - 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
+  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $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);
-        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.8 bash)";
-        go get github.com/aktau/github-release;
+        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.13 bash)";
+        go get github.com/github-release/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};
@@ -64,13 +57,13 @@ before_install:
         fi;
     fi
 before_script:
-    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
+  - phpenv config-rm xdebug.ini
 script:
   - 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
+  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do
         NAME=${file##*/};

CHANGELOG.md

@@ -1,3 +1,804 @@
+# v1.6.25
+## 05/14/2020
+
+1. [](#improved)
+    * Added system configuration support for `HTTP_X_Forwarded` headers (host disabled by default)
+    * Updated `PHPUserAgentParser` to 1.0.0
+    * Bump `Go` to version 1.13 in `travis.yaml`
+
+# v1.6.24
+## 04/27/2020
+
+1. [](#improved)
+    * Added support for `X-Forwarded-Host` [#2891](https://github.com/getgrav/grav/pull/2891)
+    * Disable XDebug in Travis builds
+
+# v1.6.23
+## 03/19/2020
+
+1. [](#new)
+    * Moved `Parsedown` 1.6 and `ParsedownExtra` 0.7 into `Grav\Framework\Parsedown` to allow fixes
+    * Added `aliases.php` with references to direct `\Parsedown` and `\ParsedownExtra` references
+1. [](#improved)
+    * Upgraded `jQuery` to latest 3.4.1 version [#2859](https://github.com/getgrav/grav/issues/2859)
+1. [](#bugfix)
+    * Fixed PHP 7.4 issue in ParsedownExtra [#2832](https://github.com/getgrav/grav/issues/2832)
+    * Fix for [user reported](https://twitter.com/OriginalSicksec) CVE path-based open redirect
+    * Fix for `stream_set_option` error with PHP 7.4 via Toolbox#28 [#2850](https://github.com/getgrav/grav/issues/2850)
+
+# v1.6.22
+## 03/05/2020
+
+1. [](#new)
+    * Added `Pages::reset()` method
+1. [](#improved)
+    * Updated Negotiation library to address issues [#2513](https://github.com/getgrav/grav/issues/2513)
+1. [](#bugfix)
+    * Fixed issue with search plugins not being able to switch between page translations
+    * Fixed issues with `Pages::baseRoute()` not picking up active language reliably
+    * Reverted `validation: strict` fix as it breaks sites, see [#1273](https://github.com/getgrav/grav/issues/1273)
+
+# v1.6.21
+## 02/11/2020
+
+1. [](#new)
+    * Added `ConsoleCommand::setLanguage()` method to set language to be used from CLI
+    * Added `ConsoleCommand::initializeGrav()` method to properly set up Grav instance to be used from CLI
+    * Added `ConsoleCommand::initializePlugins()`method to properly set up all plugins to be used from CLI
+    * Added `ConsoleCommand::initializeThemes()`method to properly set up current theme to be used from CLI
+    * Added `ConsoleCommand::initializePages()` method to properly set up pages to be used from CLI
+1. [](#improved)
+    * Vendor updates
+1. [](#bugfix)
+    * Fixed `bin/plugin` CLI calling `$themes->init()` way too early (removed it, use above methods instead)
+    * Fixed call to `$grav['page']` crashing CLI
+    * Fixed encoding problems when PHP INI setting `default_charset` is not `utf-8` [#2154](https://github.com/getgrav/grav/issues/2154)
+
+# v1.6.20
+## 02/03/2020
+
+1. [](#bugfix)
+    * Fixed incorrect routing caused by `str_replace()` in `Uri::init()` [#2754](https://github.com/getgrav/grav/issues/2754)
+    * Fixed session cookie is being set twice in the HTTP header [#2745](https://github.com/getgrav/grav/issues/2745)
+    * Fixed session not restarting if user was invalid (downgrading from Grav 1.7)
+    * Fixed filesystem iterator calls with non-existing folders
+    * Fixed `checkbox` field not being saved, requires also Form v4.0.2 [#1225](https://github.com/getgrav/grav/issues/1225)
+    * Fixed `validation: strict` not working in blueprints [#1273](https://github.com/getgrav/grav/issues/1273)
+    * Fixed `Data::filter()` removing empty fields (such as empty list) by default [#2805](https://github.com/getgrav/grav/issues/2805)
+    * Fixed fatal error with non-integer page param value [#2803](https://github.com/getgrav/grav/issues/2803)
+    * Fixed `Assets::addInlineJs()` parameter type mismatch between v1.5 and v1.6 [#2659](https://github.com/getgrav/grav/issues/2659)
+    * Fixed `site.metadata` saving issues [#2615](https://github.com/getgrav/grav/issues/2615)
+
+# v1.6.19
+## 12/04/2019
+
+1. [](#new)
+    * Catch PHP 7.4 deprecation messages and report them in debugbar instead of throwing fatal error
+1. [](#bugfix)
+    * Fixed fatal error when calling `{{ grav.undefined }}`
+    * Fixed multiple issues when there are no pages in the site
+    * PHP 7.4 fix for [#2750](https://github.com/getgrav/grav/issues/2750)
+
+# v1.6.18
+## 12/02/2019
+
+1. [](#bugfix)
+    * PHP 7.4 fix in `Pages::buildSort()`
+    * Updated vendor libraries for PHP 7.4 fixes in Twig and other libraries
+    * Fixed fatal error when `$page->id()` is null [#2731](https://github.com/getgrav/grav/pull/2731)
+    * Fixed cache conflicts on pages with no set id
+    * Fix rewrite rule for for `lighttpd` default config [#721](https://github.com/getgrav/grav/pull/2721)
+
+# v1.6.17
+## 11/06/2019
+
+1. [](#new)
+    * Added working ETag (304 Not Modified) support based on the final rendered HTML
+1. [](#improved)
+    * Safer file handling + customizable null char replacement in `CsvFormatter::decode()`
+    * Change of Behavior: `Inflector::hyphenize` will now automatically trim dashes at beginning and end of a string.
+    * Change in Behavior for `Folder::all()` so no longer fails if trying to copy non-existent dot file [#2581](https://github.com/getgrav/grav/pull/2581)
+    * renamed composer `test-plugins` script to `phpstan-plugins` to be more explicit [#2637](https://github.com/getgrav/grav/pull/2637)
+1. [](#bugfix)
+    * Fixed PHP 7.1 bug in FlexMedia
+    * Fix cache image generation when using cropResize [#2639](https://github.com/getgrav/grav/pull/2639)
+    * Fix `array_merge()` exception with non-array page header metadata [#2701](https://github.com/getgrav/grav/pull/2701)
+
+# v1.6.16
+## 09/19/2019
+
+1. [](#bugfix)
+    * Fixed Flex user creation if file storage is being used [#2444](https://github.com/getgrav/grav/issues/2444)
+    * Fixed `Badly encoded JSON data` warning when uploading files [#2663](https://github.com/getgrav/grav/issues/2663)
+
+# v1.6.15
+## 08/20/2019
+
+1. [](#improved)
+    * Improved robots.txt [#2632](https://github.com/getgrav/grav/issues/2632)
+1. [](#bugfix)
+    * Fixed broken markdown Twig tag [#2635](https://github.com/getgrav/grav/issues/2635)
+    * Force Symfony 4.2 in Grav 1.6 to remove a bunch of deprecated messages
+
+# v1.6.14
+## 08/18/2019
+
+1. [](#bugfix)
+    * Actually include fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627)
+
+# v1.6.13
+## 08/16/2019
+
+1. [](#bugfix)
+    * Regression fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627)
+
+# v1.6.12
+## 08/14/2019
+
+1. [](#new)
+    * Added support for custom `FormFlash` save locations
+    * Added a new `Utils::arrayLower()` method for lowercasing arrays
+    * Support new GRAV_BASEDIR environment variable [#2541](https://github.com/getgrav/grav/pull/2541)
+    * Allow users to override plugin handler priorities [#2165](https://github.com/getgrav/grav/pull/2165)
+1. [](#improved)
+    * Use new `Utils::getSupportedPageTypes()` to enforce `html,htm` at the front of the list [#2531](https://github.com/getgrav/grav/issues/2531)
+    * Updated vendor libraries
+    * Markdown filter is now page-aware so that it works with modular references [admin#1731](https://github.com/getgrav/grav-plugin-admin/issues/1731)
+    * Check of `GRAV_USER_INSTANCE` constant is already defined [#2621](https://github.com/getgrav/grav/pull/2621)
+1. [](#bugfix)
+    * Fixed some potential issues when `$grav['user']` is not set
+    * Fixed error when calling `Media::add($name, null)`
+    * Fixed `url()` returning wrong path if using stream with grav root path in it, eg: `user-data://shop` when Grav is in `/shop`
+    * Fixed `url()` not returning a path to non-existing file (`user-data://shop` => `/user/data/shop`) if it is set to fail gracefully
+    * Fixed `url()` returning false on unknown streams, such as `ftp://domain.com`, they should be treated as external URL
+    * Fixed Flex User to have permissions to save and delete his own user
+    * Fixed new Flex User creation not being possible because of username could not be given
+    * Fixed fatal error 'Expiration date must be an integer, a DateInterval or null, "double" given' [#2529](https://github.com/getgrav/grav/issues/2529)
+    * Fixed non-existing Flex object having a bad media folder
+    * Fixed collections using `page@.self:` should allow modular pages if requested
+    * Fixed an error when trying to delete a file from non-existing Flex Object
+    * Fixed `FlexObject::exists()` failing sometimes just after the object has been saved
+    * Fixed CSV formatter not encoding strings with `"` and `,` properly
+    * Fixed var order in `Validation.php` [#2610](https://github.com/getgrav/grav/issues/2610)
+
+# v1.6.11
+## 06/21/2019
+
+1. [](#new)
+    * Added `FormTrait::getAllFlashes()` method to get all the available form flash objects for the form
+    * Added creation and update timestamps to `FormFlash` objects
+1. [](#improved)
+    * Added `FormFlashInterface`, changed constructor to take `$config` array
+1. [](#bugfix)
+    * Fixed error in `ImageMedium::url()` if the image cache folder does not exist
+    * Fixed empty form flash name after file upload or form state update
+    * Fixed a bug in `Route::withParam()` method
+    * Fixed issue with `FormFlash` objects when there is no session initialized
+
+# v1.6.10
+## 06/14/2019
+
+1. [](#improved)
+    * Added **page blueprints** to `YamlLinter` CLI and Admin reports
+    * Removed `Gitter` and `Slack` [#2502](https://github.com/getgrav/grav/issues/2502)
+    * Optimizations for Plugin/Theme loading
+    * Generalized markdown classes so they can be used outside of `Page` scope with a custom `Excerpts` class instance
+    * Change minimal port number to 0 (unix socket) [#2452](https://github.com/getgrav/grav/issues/2452)
+1. [](#bugfix)
+    * Force question to install demo content in theme update [#2493](https://github.com/getgrav/grav/issues/2493)
+    * Fixed GPM errors from blueprints not being logged [#2505](https://github.com/getgrav/grav/issues/2505)
+    * Don't error when IP is invalid [#2507](https://github.com/getgrav/grav/issues/2507)
+    * Fixed regression with `bin/plugin` not listing the plugins available (1c725c0)
+    * Fixed bitwise operator in `TwigExtension::exifFunc()` [#2518](https://github.com/getgrav/grav/issues/2518)
+    * Fixed issue with lang prefix incorrectly identifying as admin [#2511](https://github.com/getgrav/grav/issues/2511)
+    * Fixed issue with `U0ils::pathPrefixedBYLanguageCode()` and trailing slash [#2510](https://github.com/getgrav/grav/issues/2511)
+    * Fixed regresssion issue of `Utils::Url()` not returning `false` on failure. Added new optional `fail_gracefully` 3rd attribute to return string that caused failure [#2524](https://github.com/getgrav/grav/issues/2524)
+
+# v1.6.9
+## 05/09/2019
+
+1. [](#new)
+    * Added `Route::withoutParams()` methods
+    * Added `Pages::setCheckMethod()` method to override page configuration in Admin Plugin
+    * Added `Cache::clearCache('invalidate')` parameter for just invalidating the cache without deleting any cached files
+    * Made `UserCollectionInderface` to extend `Countable` to get the count of existing users
+1. [](#improved)
+    * Flex admin: added default search options for flex objects
+    * Flex collection and object now fall back to the default template if template file doesn't exist
+    * Updated Vendor libraries including Twig 1.40.1
+    * Updated language files from `https://crowdin.com/project/grav-core`
+1. [](#bugfix)
+    * Fixed `$grav['route']` from being modified when the route instance gets modified
+    * Fixed Assets options array mixed with standalone priority [#2477](https://github.com/getgrav/grav/issues/2477)
+    * Fix for `avatar_url` provided by 3rd party providers
+    * Fixed non standard `lang` code lengths in `Utils` and `Session` detection
+    * Fixed saving a new object in Flex `SimpleStorage`
+    * Fixed exception in `Flex::getDirectories()` if the first parameter is set
+    * Output correct "Last Updated" in `bin/gpm info` command
+    * Checkbox getting interpreted as string, so created new `Validation::filterCheckbox()`
+    * Fixed backwards compatibility to `select` field with `selectize.create` set to true [git-sync#141](https://github.com/trilbymedia/grav-plugin-git-sync/issues/141)
+    * Fixed `YamlFormatter::decode()` to always return array [#2494](https://github.com/getgrav/grav/pull/2494)
+    * Fixed empty `$grav['request']->getAttribute('route')->getExtension()`
+
+# v1.6.8
+## 04/23/2019
+
+1. [](#new)
+    * Added `FlexCollection::filterBy()` method
+1. [](#bugfix)
+    * Revert `Use Null Coalesce Operator` [#2466](https://github.com/getgrav/grav/pull/2466)
+    * Fixed `FormTrait::render()` not providing config variable
+    * Updated `bin/grav clean` to clear `cache/compiled` and `user/config/security.yaml`
+
+# v1.6.7
+## 04/22/2019
+
+1. [](#new)
+    * Added a new `bin/grav yamllinter` CLI command to find YAML Linting issues [#2468](https://github.com/getgrav/grav/issues/2468#issuecomment-485151681)
+1. [](#improved)
+    * Improve `FormTrait` backwards compatibility with existing forms
+    * Added a new `Utils::getSubnet()` function for IPv4/IPv6 parsing [#2465](https://github.com/getgrav/grav/pull/2465)
+1. [](#bugfix)
+    * Remove disabled fields from the form schema
+    * Fix issue when excluding `inlineJs` and `inlineCss` from Assets pipeline [#2468](https://github.com/getgrav/grav/issues/2468)
+    * Fix for manually set position on external URLs [#2470](https://github.com/getgrav/grav/issues/2470)
+
+# v1.6.6
+## 04/17/2019
+
+1. [](#new)
+    * `FormInterface` now implements `RenderInterface`
+    * Added new `FormInterface::getTask()` method which reads the task from `form.task` in the blueprint
+1. [](#improved)
+    * Updated vendor libraries to latest
+1. [](#bugfix)
+    * Rollback `redirect_default_route` logic as it has issues with multi-lang [#2459](https://github.com/getgrav/grav/issues/2459)
+    * Fix potential issue with `|contains` Twig filter on PHP 7.3
+    * Fixed bug in text field filtering: return empty string if value isn't a string or number [#2460](https://github.com/getgrav/grav/issues/2460)
+    * Force Asset `priority` to be an integer and not throw error if invalid string passed [#2461](https://github.com/getgrav/grav/issues/2461)
+    * Fixed bug in text field filtering: return empty string if value isn't a string or number
+    * Fixed `FlexForm` missing getter methods for defining form variables
+
+# v1.6.5
+## 04/15/2019
+
+1. [](#bugfix)
+    * Backwards compatiblity with old `Uri::__toString()` output
+
+# v1.6.4
+## 04/15/2019
+
+1. [](#bugfix)
+    * Improved `redirect_default_route` logic as well as `Uri::toArray()` to take into account `root_path` and `extension`
+    * Rework logic to pull out excluded files from pipeline more reliably [#2445](https://github.com/getgrav/grav/issues/2445)
+    * Better logic in `Utils::normalizePath` to handle externals properly [#2216](https://github.com/getgrav/grav/issues/2216)
+    * Fixed to force all `Page::taxonomy` to be treated as strings [#2446](https://github.com/getgrav/grav/issues/2446)
+    * Fixed issue with `Grav['user']` not being available [form#332](https://github.com/getgrav/grav-plugin-form/issues/332)
+    * Updated rounding logic for `Utils::parseSize()` [#2394](https://github.com/getgrav/grav/issues/2394)
+    * Fixed Flex simple storage not being properly initialized if used with caching
+
+# v1.6.3
+## 04/12/2019
+
+1. [](#new)
+    * Added `Blueprint::addDynamicHandler()` method to allow custom dynamic handlers, for example `custom-options@: getCustomOptions`
+1. [](#bugfix)
+    * Missed a `CacheCommand` reference in `bin/grav` [#2442](https://github.com/getgrav/grav/issues/2442)
+    * Fixed issue with `Utils::normalizePath` messing with external URLs [#2216](https://github.com/getgrav/grav/issues/2216)
+    * Fix for `vUndefined` versions when upgrading
+
+# v1.6.2
+## 04/11/2019
+
+1. [](#bugfix)
+    * Revert renaming of `ClearCacheCommand` to ensure CLI GPM upgrades go smoothly
+
+# v1.6.1
+## 04/11/2019
+
+1. [](#improved)
+    * Improved CSS for the bottom filter bar of DebugBar
+1. [](#bugfix)
+    * Fixed issue with `@import` not being added to top of pipelined css [#2440](https://github.com/getgrav/grav/issues/2440)
+
+# v1.6.0
+## 04/11/2019
+
+1. [](#new)
+    * Set minimum requirements to [PHP 7.1.3](https://getgrav.org/blog/raising-php-requirements-2018)
+    * New `Scheduler` functionality for periodic jobs
+    * New `Backup` functionality with multiple backup profiles and scheduler integration
+    * Refactored `Assets Manager` to be more powerful and flexible
+    * Updated Doctrine Collections to 1.6
+    * Updated Doctrine Cache to 1.8
+    * Updated Symfony Components to 4.2
+    * Added new Cache purge functionality old cache manually via CLI/Admin as well as scheduler integration
+    * Added new `{% throw 404 'Not Found' %}` twig tag (with custom code/message)
+    * Added `Grav\Framework\File` classes for handling YAML, Markdown, JSON, INI and PHP serialized files
+    * Added `Grav\Framework\Collection\AbstractIndexCollection` class
+    * Added `Grav\Framework\Object\ObjectIndex` class
+    * Added `Grav\Framework\Flex` classes
+    * Added support for hiding form fields in blueprints by using dynamic property like `security@: admin.foobar`, `scope@: object` or `scope-ignore@: object` to any field
+    * New experimental **FlexObjects** powered `Users` for increased performance and capability (**disabled** by default)
+    * Added PSR-7 and PSR-15 classes
+    * Added `Grav\Framework\DI\Container` class
+    * Added `Grav\Framework\RequestHandler\RequestHandler` class
+    * Added `Page::httpResponseCode()` and `Page::httpHeaders()` methods
+    * Added `Grav\Framework\Form\Interfaces\FormInterface`
+    * Added `Grav\Framework\Form\Interfaces\FormFactoryInterface`
+    * Added `Grav\Framework\Form\FormTrait`
+    * Added `Page::forms()` method to get normalized list of all form headers defined in the page
+    * Added `onPageAction`, `onPageTask`, `onPageAction.{$action}` and `onPageTask.{$task}` events
+    * Added `Blueprint::processForm()` method to filter form inputs
+    * Move `processMarkdown()` method from `TwigExtension` to more general `Utils` class
+    * Added support to include extra files into `Media` (such as uploaded files)
+    * Added form preview support for `FlexObject`, including a way to render newly uploaded files before saving them
+    * Added `FlexObject::getChanges()` to determine what fields change during an update
+    * Added `arrayDiffMultidimensional`, `arrayIsAssociative`, `arrayCombine` Util functions
+    * New `$grav['users']` service to allow custom user classes implementing `UserInterface`
+    * Added `LogViewer` helper class and CLI command: `bin/grav logviewer`
+    * Added `select()` and `unselect()` methods to `CollectionInterface` and its base classes
+    * Added `orderBy()` and `limit()` methods to `ObjectCollectionInterface` and its base classes
+    * Added `user-data://` which is a writable stream (`user://data` is not and should be avoided)
+    * Added support for `/action:{$action}` (like task but used without nonce when only receiving data)
+    * Added `onAction.{$action}` event
+    * Added `Grav\Framework\Form\FormFlash` class to contain AJAX uploaded files in more reliable way
+    * Added `Grav\Framework\Form\FormFlashFile` class which implements `UploadedFileInterface` from PSR-7
+    * Added `Grav\Framework\Filesystem\Filesystem` class with methods to manipulate stream URLs
+    * Added new `$grav['filesystem']` service using an instance of the new `Filesystem` object
+    * Added `{% render object layout: 'default' with { variable: true } %}` for Flex objects and collections
+    * Added `$grav->setup()` to simplify CLI and custom access points
+    * Added `CsvFormatter` and `CsvFile` classes
+    * Added new system config option to `pages.hide_empty_folders` if a folder has no valid `.md` file available. Default behavior is `false` for compatibility.
+    * Added new system config option for `languages.pages_fallback_only` forcing only 'fallback' to find page content through supported languages, default behavior is to display any language found if active language is missing
+    * Added `Utils::arrayFlattenDotNotation()` and `Utils::arrayUnflattenDotNotation()` helper methods
+1. [](#improved)
+    * Add the page to onMarkdownInitialized event [#2412](https://github.com/getgrav/grav/issues/2412)
+    * Doctrine filecache is now namespaced with prefix to support purging
+    * Register all page types into `blueprint://pages` stream
+    * Removed `apc` and `xcache` support, made `apc` alias of `apcu`
+    * Support admin and regular translations via the `|t` twig filter and `t()` twig function
+    * Improved Grav Core installer/updater to run installer script
+    * Updated vendor libraries including Symfony `4.2.3`
+    * Renamed old `User` class to `Grav\Common\User\DataUser\User` with multiple improvements and small fixes
+    * `User` class now acts as a compatibility layer to older versions of Grav
+    * Deprecated `new User()`, `User::load()`, `User::find()` and `User::delete()` in favor of `$grav['users']` service
+    * `Media` constructor has now support to not to initialize the media objects
+    * Cleanly handle session corruption due to changing Flex object types
+    * Added `FlexObjectInterface::getDefaultValue()` and `FormInterface::getDefaultValue()`
+    * Added new `onPageContent()` event for every call to `Page::content()`
+    * Added phpstan: PHP Static Analysis Tool [#2393](https://github.com/getgrav/grav/pull/2393)
+    * Added `composer test-plugins` to test plugin issues with the current version of Grav
+    * Added `Flex::getObjects()` and `Flex::getMixedCollection()` methods for co-mingled collections
+    * Added support to use single Flex key parameter in `Flex::getObject()` method
+    * Added `FlexObjectInterface::search()` and `FlexCollectionInterface::search()` methods
+    * Override `system.media.upload_limit` with PHP's `post_max_size` or `upload_max_filesize`
+    * Class `Grav\Common\Page\Medium\AbstractMedia` now use array traits instead of extending `Grav\Common\Getters`
+    * Implemented `Grav\Framework\Psr7` classes as `Nyholm/psr7` decorators
+    * Added a new `cache-clear` scheduled job to go along with `cache-purge`
+    * Renamed `Grav\Framework\File\Formatter\FormatterInterface` to `Grav\Framework\File\Interfaces\FileFormatterInterface`
+    * Improved `File::save()` to use a temporary file if file isn't locked
+    * Improved `|t` filter to better support admin `|tu` style filter if in admin
+    * Update all classes to rely on `PageInterface` instead of `Page` class
+    * Better error checking in `bin/plugin` for existence and enabled
+    * Removed `media.upload_limit` references
+    * Twig `nicenumber`: do not use 0 + string casting hack
+    * Converted Twig tags to use namespaced Twig classes
+    * Site shows error on page rather than hard-crash when page has invalid frontmatter [#2343](https://github.com/getgrav/grav/issues/2343)
+    * Added `languages.default_lang` option to override the default lang (usually first supported language)
+    * Added `Content-Type: application/json` body support for PSR-7 `ServerRequest`
+    * Remove PHP time limit in `ZipArchive`
+    * DebugBar: Resolve twig templates in deprecated backtraces in order to help locating Twig issues
+    * Added `$grav['cache']->getSimpleCache()` method for getting PSR-16 compatible cache
+    * MediaTrait: Use PSR-16 cache
+    * Improved `Utils::normalizePath()` to support non-protocol URLs
+    * Added ability to reset `Page::metadata` to allow rebuilding from automatically generated values
+    * Added back missing `page.types` field in system content configuration [admin#1612](https://github.com/getgrav/grav-plugin-admin/issues/1612)
+    * Console commands: add method for invalidating cache
+    * Updated languages
+    * Improved `$page->forms()` call, added `$page->addForms()`
+    * Updated languages from crowdin
+    * Fixed `ImageMedium` constructor warning when file does not exist
+    * Improved `Grav\Common\User` class; added `$user->update()` method
+    * Added trim support for text input fields `validate: trim: true`
+    * Improved `Grav\Framework\File\Formatter` classes to have abstract parent class and some useful methods
+    * Support negotiated content types set via the Request `Accept:` header
+    * Support negotiated language types set via the Request `Accept-Language:` header
+    * Cleaned up and sorted the Service `idMap`
+    * Updated `Grav` container object to implement PSR-11 `ContainerInterface`
+    * Updated Grav `Processor` classes to implement PSR-15 `MiddlewareInterface`
+    * Make `Data` class to extend `JsonSerializable`
+    * Modified debugger icon to use retina space-dude version
+    * Added missing `Video::preload()` method
+    * Set session name based on `security.salt` rather than `GRAV_ROOT` [#2242](https://github.com/getgrav/grav/issues/2242)
+    * Added option to configure list of `xss_invalid_protocols` in `Security` config [#2250](https://github.com/getgrav/grav/issues/2250)
+    * Smarter `security.salt` checking now we use `security.yaml` for other options
+    * Added apcu autoloader optimization
+    * Additional helper methods in `Language`, `Languages`, and `LanguageCodes` classes
+    * Call `onFatalException` event also on internal PHP errors
+    * Built-in PHP Webserver: log requests before handling them
+    * Added support for syslog and syslog facility logging (default: 'file')
+    * Improved usability of `System` configuration blueprint with side-tabs
+ 1. [](#bugfix)
+    * Fixed issue with `Truncator::truncateWords` and `Truncator::truncateLetters` when string not wrapped in tags [#2432](https://github.com/getgrav/grav/issues/2432)
+    * Fixed `Undefined method closure::fields()` when getting avatar for user, thanks @Romarain [#2422](https://github.com/getgrav/grav/issues/2422)
+    * Fixed cached images not being updated when source image is modified
+    * Fixed deleting last list item in the form
+    * Fixed issue with `Utils::url()` method would append extra `base_url` if URL already included it
+    * Fixed `mkdir(...)` race condition
+    * Fixed `Obtaining write lock failed on file...`
+    * Fixed potential undefined property in `onPageNotFound` event handling
+    * Fixed some potential issues/bugs found by phpstan
+    * Fixed regression in GPM packages casted to Array (ref, getgrav/grav-plugin-admin@e3fc4ce)
+    * Fixed session_start(): Setting option 'session.name' failed [#2408](https://github.com/getgrav/grav/issues/2408)
+    * Fixed validation for select field type with selectize
+    * Fixed validation for boolean toggles
+    * Fixed non-namespaced exceptions in scheduler
+    * Fixed trailing slash redirect in multlang environment [#2350](https://github.com/getgrav/grav/issues/2350)
+    * Fixed some issues related to Medium objects losing query string attributes
+    * Broke out Medium timestamp so it's not cleared on `reset()`s
+    * Fixed issue with `redirect_trailing_slash` losing query string [#2269](https://github.com/getgrav/grav/issues/2269)
+    * Fixed failed login if user attempts to log in with upper case non-english letters
+    * Removed extra authenticated/authorized fields when saving existing user from a form
+    * Fixed `Grav\Framework\Route::__toString()` returning relative URL, not relative route
+    * Fixed handling of `append_url_extension` inside of `Page::templateFormat()` [#2264](https://github.com/getgrav/grav/issues/2264)
+    * Fixed a broken language string [#2261](https://github.com/getgrav/grav/issues/2261)
+    * Fixed clearing cache having no effect on Doctrine cache
+    * Fixed `Medium::relativePath()` for streams
+    * Fixed `Object` serialization breaking if overriding `jsonSerialize()` method
+    * Fixed `YamlFormatter::decode()` when calling `init_set()` with integer
+    * Fixed session throwing error in CLI if initialized
+    * Fixed `Uri::hasStandardPort()` to support reverse proxy configurations [#1786](https://github.com/getgrav/grav/issues/1786)
+    * Use `append_url_extension` from page header to set template format if set [#2604](https://github.com/getgrav/grav/pull/2064)
+    * Fixed some bugs in Grav environment selection logic
+    * Use login provider User avatar if set
+    * Fixed `Folder::doDelete($folder, false)` removing symlink when it should not
+    * Fixed asset manager to not add empty assets when they don't exist in the filesystem
+    * Update `script` and `style` Twig tags to use the new `Assets` classes
+    * Fixed asset pipeline to rewrite remote URLs as well as local [#2216](https://github.com/getgrav/grav/issues/2216)
+
+# v1.5.10
+## 03/21/2019
+
+1. [](#new)
+    * Added new `deferred` Twig extension
+
+# v1.5.9
+## 03/20/2019
+
+1. [](#new)
+    * Added new `onPageContent()` event for every call to `Page::content()`
+1. [](#improved)
+    * Fixed phpdoc generation
+    * Updated vendor libraries
+    * Force Toolbox v1.4.2
+1. [](#bugfix)
+    * EXIF fix for streams
+    * Fix for User avatar not working due to uppercase or spaces in email [#2403](https://github.com/getgrav/grav/pull/2403)
+
+# v1.5.8
+## 02/07/2019
+
+1. [](#improved)
+    * Improved `User` unserialize to not to break the object if serialized data is not what expected
+    * Removed unused parameter [#2357](https://github.com/getgrav/grav/pull/2357)
+
+# v1.5.7
+## 01/25/2019
+
+1. [](#new)
+    * Support for AWS Cloudfront forwarded scheme header [#2297](https://github.com/getgrav/grav/pull/2297)
+1. [](#improved)
+    * Set homepage with `https://` protocol [#2299](https://github.com/getgrav/grav/pull/2299)
+    * Preserve accents in fields containing Twig expr. using unicode [#2279](https://github.com/getgrav/grav/pull/2279)
+    * Updated vendor libraries
+1. [](#bugfix)
+    * Support spaces with filenames in responsive images [#2300](https://github.com/getgrav/grav/pull/2300)
+
+# v1.5.6
+## 12/14/2018
+
+1. [](#improved)
+    * Updated InitializeProcessor.php to use lang-safe redirect [#2268](https://github.com/getgrav/grav/pull/2268)
+    * Improved user serialization to use less memory in the session
+
+# v1.5.5
+## 11/12/2018
+
+1. [](#new)
+    * Register theme prefixes as namespaces in Twig [#2210](https://github.com/getgrav/grav/pull/2210)
+1. [](#improved)
+    * Propogate error code between 400 and 600 for production sites [#2181](https://github.com/getgrav/grav/pull/2181)
+1. [](#bugfix)
+    * Remove hardcoded `302` when redirecting trailing slash [#2155](https://github.com/getgrav/grav/pull/2155)
+
+# v1.5.4
+## 11/05/2018
+
+1. [](#improved)
+    * Updated default page `index.md` with some consistency fixes [#2245](https://github.com/getgrav/grav/pull/2245)
+1. [](#bugfix)
+    * Fixed fatal error if calling `$session->invalidate()` when there's no active session
+    * Fixed typo in media.yaml for `webm` extension [#2220](https://github.com/getgrav/grav/pull/2220)
+    * Fixed markdown processing for telephone links [#2235](https://github.com/getgrav/grav/pull/2235)
+
+# v1.5.3
+## 10/08/2018
+
+1. [](#new)
+    * Added `Utils::getMimeByFilename()`, `Utils::getMimeByLocalFile()` and `Utils::checkFilename()` methods
+    * Added configurable dangerous upload extensions in `security.yaml`
+1. [](#improved)
+    * Updated vendor libraries to latest
+
+# v1.5.2
+## 10/01/2018
+
+1. [](#new)
+    * Added new `Security` class for Grav security functionality including XSS checks
+    * Added new `bin/grav security` command to scan for security issues
+    * Added new `xss()` Twig function to allow for XSS checks on strings and arrays
+    * Added `onHttpPostFilter` event to allow plugins to globally clean up XSS in the forms and tasks
+    * Added `Deprecated` tab to DebugBar to catch future incompatibilities with later Grav versions
+    * Added deprecation notices for features which will be removed in Grav 2.0
+1. [](#improved)
+    * Updated vendor libraries to latest
+1. [](#bugfix)
+    * Allow `$page->slug()` to be called before `$page->init()` without breaking the page
+    * Fix for `Page::translatedLanguages()` to use routes always [#2163](https://github.com/getgrav/grav/issues/2163)
+    * Fixed `nicetime()` twig function
+    * Allow twig tags `{% script %}`, `{% style %}` and `{% switch %}` to be placed outside of blocks
+    * Session expires in 30 mins independent from config settings [login#178](https://github.com/getgrav/grav-plugin-login/issues/178)
+
+# v1.5.1
+## 08/23/2018
+
+1. [](#new)
+    * Added static `Grav\Common\Yaml` class which should be used instead of `Symfony\Component\Yaml\Yaml`
+1. [](#improved)
+    * Updated deprecated Twig code so it works in both in Twig 1.34+ and Twig 2.4+
+    * Switched to new Grav Yaml class to support Native + Fallback YAML libraries
+1. [](#bugfix)
+    * Broken handling of user folder in Grav URI object [#2151](https://github.com/getgrav/grav/issues/2151)
+
+# v1.5.0
+## 08/17/2018
+
+1. [](#new)
+    * Set minimum requirements to [PHP 5.6.4](https://getgrav.org/blog/raising-php-requirements-2018)
+    * Updated Doctrine Collections to 1.4
+    * Updated Symfony Components to 3.4 (with compatibility mode to fall back to Symfony YAML 2.8)
+    * Added `Uri::method()` to get current HTTP method (GET/POST etc)
+    * `FormatterInterface`: Added `getSupportedFileExtensions()` and `getDefaultFileExtension()` methods
+    * Added option to disable `SimpleCache` key validation
+    * Added support for multiple repo locations for `bin/grav install` command
+    * Added twig filters for casting values: `|string`, `|int`, `|bool`, `|float`, `|array`
+    * Made `ObjectCollection::matching()` criteria expressions to behave more like in Twig
+    * Criteria: Added support for `LENGTH()`, `LOWER()`, `UPPER()`, `LTRIM()`, `RTRIM()` and `TRIM()`
+    * Added `Grav\Framework\File\Formatter` classes for encoding/decoding YAML, Markdown, JSON, INI and PHP serialized strings
+    * Added `Grav\Framework\Session` class to replace `RocketTheme\Toolbox\Session\Session`
+    * Added `Grav\Common\Media` interfaces and trait; use those in `Page` and `Media` classes
+    * Added `Grav\Common\Page` interface to allow custom page types in the future
+    * Added setting to disable sessions from the site [#2013](https://github.com/getgrav/grav/issues/2013)
+    * Added new `strict_mode` settings in `system.yaml` for compatibility
+1. [](#improved)
+    * Improved `Utils::url()` to support query strings
+    * Display better exception message if Grav fails to initialize
+    * Added `muted` and `playsinline` support to videos [#2124](https://github.com/getgrav/grav/pull/2124)
+    * Added `MediaTrait::clearMediaCache()` to allow cache to be cleared
+    * Added `MediaTrait::getMediaCache()` to allow custom caching
+    * Improved session handling, allow all session configuration options in `system.session.options`
+1. [](#bugfix)
+    * Fix broken form nonce logic [#2121](https://github.com/getgrav/grav/pull/2121)
+    * Fixed issue with uppercase extensions and fallback media URLs [#2133](https://github.com/getgrav/grav/issues/2133)
+    * Fixed theme inheritance issue with `camel-case` that includes numbers [#2134](https://github.com/getgrav/grav/issues/2134)
+    * Typo in demo typography page [#2136](https://github.com/getgrav/grav/pull/2136)
+    * Fix for incorrect plugin order in debugger panel
+    * Made `|markdown` filter HTML safe
+    * Fixed bug in `ContentBlock` serialization
+    * Fixed `Route::withQueryParam()` to accept array values
+    * Fixed typo in truncate function [#1943](https://github.com/getgrav/grav/issues/1943)
+    * Fixed blueprint field validation: Allow numeric inputs in text fields
+
+# v1.4.8
+## 07/31/2018
+
+1. [](#improved)
+    * Add Grav version to debug bar messages tab [#2106](https://github.com/getgrav/grav/pull/2106)
+    * Add Nginx config for ddev project to `webserver-configs` [#2117](https://github.com/getgrav/grav/pull/2117)
+    * Vendor library updates
+1. [](#bugfix)
+    * Don't allow `null` to be set as Page content
+
+# v1.4.7
+## 07/13/2018
+
+1. [](#improved)
+    * Use `getFilename` instead of `getBasename` [#2087](https://github.com/getgrav/grav/issues/2087)
+1. [](#bugfix)
+    * Fix for modular page preview [#2066](https://github.com/getgrav/grav/issues/2066)
+    * `Page::routeCanonical()` should be string not array [#2069](https://github.com/getgrav/grav/issues/2069)
+
+# v1.4.6
+## 06/20/2018
+
+1. [](#improved)
+    * Manually re-added the improved SSL off-loading that was lost with Grav v1.4.0 merge [#1888](https://github.com/getgrav/grav/pull/1888)
+    * Handle multibyte strings in `truncateLetters()` [#2007](https://github.com/getgrav/grav/pull/2007)
+    * Updated robots.txt to include `/user/images/` folder [#2043](https://github.com/getgrav/grav/pull/2043)
+    * Add getter methods for original and action to the Page object [#2005](https://github.com/getgrav/grav/pull/2005)
+    * Modular template extension follows the master page extension [#2044](https://github.com/getgrav/grav/pull/2044)
+    * Vendor library updates
+1. [](#bugfix)
+    * Handle `errors.display` system property better in admin plugin [admin#1452](https://github.com/getgrav/grav-plugin-admin/issues/1452)
+    * Fix classes on non-http based protocol links [#2034](https://github.com/getgrav/grav/issues/2034)
+    * Fixed crash on IIS (Windows) with open_basedir in effect [#2053](https://github.com/getgrav/grav/issues/2053)
+    * Fixed incorrect routing with setup.php based base [#1892](https://github.com/getgrav/grav/issues/1892)
+    * Fixed image resource memory deallocation [#2045](https://github.com/getgrav/grav/pull/2045)
+    * Fixed issue with Errors `display:` option not handling integers properly [admin#1452](https://github.com/getgrav/grav-plugin-admin/issues/1452)
+
+# v1.4.5
+## 05/15/2018
+
+1. [](#bugfix)
+    * Fixed an issue with some users getting **2FA** prompt after upgrade [admin#1442](https://github.com/getgrav/grav-plugin-admin/issues/1442)
+    * Do not crash when generating URLs with arrays as parameters [#2018](https://github.com/getgrav/grav/pull/2018)
+    * Utils::truncateHTML removes whitespace when generating summaries [#2004](https://github.com/getgrav/grav/pull/2004)
+
+# v1.4.4
+## 05/11/2018
+
+1. [](#new)
+    * Added support for `Uri::post()` and `Uri::getConentType()`
+    * Added a new `Medium:thumbnailExists()` function [#1966](https://github.com/getgrav/grav/issues/1966)
+    * Added `authorized` support for 2FA
+1. [](#improved)
+    * Added default configuration for images [#1979](https://github.com/getgrav/grav/pull/1979)
+    * Added dedicated PHPUnit assertions [#1990](https://github.com/getgrav/grav/pull/1990)
+1. [](#bugfix)
+    * Use `array_key_exists` instead of `in_array + array_keys` [#1991](https://github.com/getgrav/grav/pull/1991)
+    * Fixed an issue with `custom_base_url` always causing 404 errors
+    * Improve support for regex redirects with query and params [#1983](https://github.com/getgrav/grav/issues/1983)
+    * Changed collection-based date sorting to `SORT_REGULAR` for better server compatibility [#1910](https://github.com/getgrav/grav/issues/1910)
+    * Fix hardcoded string in modular blueprint [#1933](https://github.com/getgrav/grav/pull/1993)
+
+# v1.4.3
+## 04/12/2018
+
+1. [](#new)
+    * moved Twig `sortArrayByKey` logic into `Utils::` class
+1. [](#improved)
+    * Rolled back Parsedown library to stable `1.6.4` until a better solution for `1.8.0` compatibility can fe found
+    * Updated vendor libraries to latest versions
+1. [](#bugfix)
+    * Fix for bad reference to `ZipArchive` in `GPM::Installer`
+
+# v1.4.2
+## 03/21/2018
+
+1. [](#new)
+    * Added new `|nicefilesize` Twig filter for pretty file (auto converts to bytes, kB, MB, GB, etc)
+    * Added new `regex_filter()` Twig function to values in arrays
+1. [](#improved)
+    * Added bosnian to lang codes [#1917](https://github.com/getgrav/grav/issues/1917)
+    * Improved Zip extraction error codes [#1922](https://github.com/getgrav/grav/issues/1922)
+1. [](#bugfix)
+    * Fixed an issue with Markdown Video and Audio that broke after Parsedown 1.7.0 Security updates [#1924](https://github.com/getgrav/grav/issues/1924)
+    * Fix for case-sensitive page metadata [admin#1370](https://github.com/getgrav/grav-plugin-admin/issues/1370)
+    * Fixed missing composer requirements for the new `Grav\Framework\Uri` classes
+    * Added missing PSR-7 vendor library required for URI additions in Grav 1.4.0
+
+# v1.4.1
+## 03/11/2018
+
+1. [](#bugfix)
+    * Fixed session timing out because of session cookie was not being sent
+
+# v1.4.0
+## 03/09/2018
+
+1. [](#new)
+    * Added `Grav\Framework\Uri` classes extending PSR-7 `HTTP message UriInterface` implementation
+    * Added `Grav\Framework\Route` classes to allow route/link manipulation
+    * Added `$grav['uri]->getCurrentUri()` method to get `Grav\Framework\Uri\Uri` instance for the current URL
+    * Added `$grav['uri]->getCurrentRoute()` method to get `Grav\Framework\Route\Route` instance for the current URL
+    * Added ability to have `php` version dependencies in GPM assets
+    * Added new `{% switch %}` twig tag for more elegant if statements
+    * Added new `{% markdown %}` twig tag
+    * Added **Route Overrides** to the default page blueprint
+    * Added new `Collection::toExtendedArray()` method that's particularly useful for Json output of data
+    * Added new `|yaml_encode` and `|yaml_decode` Twig filter to convert to and from YAML
+    * Added new `read_file()` Twig function to allow you to load and display a file in Twig (Supports streams and regular paths)
+    * Added a new `Medium::exists()` method to check for file existence
+    * Moved Twig `urlFunc()` to `Utils::url()` as its so darn handy
+    * Transferred overall copyright from RocketTheme, LLC, to Trilby Media LLC
+    * Added `theme_var`, `header_var` and `body_class` Twig functions for themes
+    * Added `Grav\Framework\Cache` classes providing PSR-16 `Simple Cache` implementation
+    * Added `Grav\Framework\ContentBlock` classes for nested HTML blocks with CSS/JS assets
+    * Added `Grav\Framework\Object` classes for creating collections of objects
+    * Added `|nicenumber` Twig filter
+    * Added `{% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %}` tag to allow basic exception handling inside Twig
+    * Added `{% script %}` and `{% style %}` tags for Twig templates
+    * Deprecated GravTrait
+1. [](#improved)
+    * Improved `Session` initialization
+    * Added ability to set a `theme_var()` option in page frontmatter
+    * Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`
+    * Better `Page.collection()` filtering support including ability to have non-published pages in collections
+    * Stopped Chrome from auto-completing admin user profile form [#1847](https://github.com/getgrav/grav/issues/1847)
+    * Support for empty `switch` field like a `checkbox`
+    * Made `modular` blueprint more flexible
+    * Code optimizations to `Utils` class [#1830](https://github.com/getgrav/grav/pull/1830)
+    * Objects: Add protected function `getElement()` to get serialized value for a single property
+    * `ObjectPropertyTrait`: Added protected functions `isPropertyLoaded()`, `offsetLoad()`, `offsetPrepare()` and `offsetSerialize()`
+    * `Grav\Framework\Cache`: Allow unlimited TTL
+    * Optimizations & refactoring to the test suite [#1779](https://github.com/getgrav/grav/pull/1779)
+    * Slight modification of Whoops error colors
+    * Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin
+    * Updated vendor libraries to latest versions
+    * Removed constructor from `ObjectInterface`
+    * Make it possible to include debug bar also into non-HTML responses
+    * Updated built-in JQuery to latest 3.3.1
+1. [](#bugfix)
+    * Fixed issue with image alt tag always getting empted out unless set in markdown
+    * Fixed issue with remote PHP version determination for Grav updates [#1883](https://github.com/getgrav/grav/issues/1883)
+    * Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)
+    * Properly validate YAML blueprint fields so admin can save as proper YAML now  [addresses many issues]
+    * Fixed OpenGraph metatags so only Twitter uses `name=`, and all others use `property=` [#1849](https://github.com/getgrav/grav/issues/1849)
+    * Fixed an issue with `evaluate()` and `evaluate_twig()` Twig functions that throws invalid template error
+    * Fixed issue with `|sort_by_key` twig filter if the input was null or not an array
+    * Date ordering should always be numeric [#1810](https://github.com/getgrav/grav/issues/1810)
+    * Fix for base paths containing special characters [#1799](https://github.com/getgrav/grav/issues/1799)
+    * Fix for session cookies in paths containing special characters
+    * Fix for `vundefined` error for version numbers in GPM [form#222](https://github.com/getgrav/grav-plugin-form/issues/222)
+    * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
+    * NOTE: Parsedown security release now escapes `&` to `&` in Markdown links
+
+# v1.3.10
+## 12/06/2017
+
+1. [](#bugfix)
+    * Reverted GPM Local pull request as it broken admin [#1742](https://github.com/getgrav/grav/issues/1742)
+
+# v1.3.9
+## 12/05/2017
+
+1. [](#new)
+    * Added new core Twig templates for `partials/metadata.html.twig` and `partials/messages.html.twig`
+    * Added ability to work with GPM locally [#1742](https://github.com/getgrav/grav/issues/1742)
+    * Added new HTML5 audio controls [#1756](https://github.com/getgrav/grav/issues/1756)
+    * Added `Medium::copy()` method to create a copy of a medium object
+    * Added new `force_lowercase_urls` functionality on routes and slugs
+    * Added new `item-list` filter type to remove empty items
+    * Added new `setFlashCookieObject()` and `getFlashCookieObject()` methods to `Session` object
+    * Added new `intl_enabled` option to disable PHP intl module collation when not needed
+1. [](#bugfix)
+    * Fixed an issue with checkbox field validation [form#216](https://github.com/getgrav/grav-plugin-form/issues/216)
+    * Fixed issue with multibyte Markdown link URLs [#1749](https://github.com/getgrav/grav/issues/1749)
+    * Fixed issue with multibyte folder names [#1751](https://github.com/getgrav/grav/issues/1751)
+    * Fixed several issues related to `system.custom_base_url` that were broken [#1736](https://github.com/getgrav/grav/issues/1736)
+    * Dynamically added pages via `Pages::addPage()` were not firing `onPageProcessed()` event causing forms not to be processed
+    * Fixed `Page::active()` and `Page::activeChild()` to work with UTF-8 characters in the URL [#1727](https://github.com/getgrav/grav/issues/1727)
+    * Fixed typo in `modular.yaml` causing media to be ignored [#1725](https://github.com/getgrav/grav/issues/1725)
+    * Reverted `case_insensitive_urls` option as it was causing issues with taxonomy [#1733](https://github.com/getgrav/grav/pull/1733)
+    * Removed an extra `/` in `CompileFile.php` [#1693](https://github.com/getgrav/grav/pull/1693)
+    * Uri::Encode user and password to prevent issues in browsers
+    * Fixed "Invalid AJAX response" When using Built-in PHP Webserver in Windows [#1258](https://github.com/getgrav/grav-plugin-admin/issues/1258)
+    * Remove support for `config.user`, it was broken and bad practise
+    * Make sure that `clean cache` uses valid path [#1745](https://github.com/getgrav/grav/pull/1745)
+    * Fixed token creation issue with `Uri` params like `/id:3`
+    * Fixed CSS Pipeline failing with Google remote fonts if the file was minified [#1261](https://github.com/getgrav/grav-plugin-admin/issues/1261)
+    * Forced `field.multiple: true` to allow use of min/max options in `checkboxes.validate`
+
+# v1.3.8
+## 10/26/2017
+
+1. [](#new)
+    * Added Page `media_order` capability to manually order page media via a page header
+1. [](#bugfix)
+    * Fixed GPM update issue with filtered slugs [#1711](https://github.com/getgrav/grav/issues/1711)
+    * Fixed issue with missing image file not throwing 404 properly [#1713](https://github.com/getgrav/grav/issues/1713)
+
 # v1.3.7
 ## 10/18/2017
 
@@ -12,20 +813,20 @@
 1. [](#bugfix)
     * Regression: Ajax error in Nginx [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
     * Remove the `_url=$uri` portion of the the Nginx `try_files` command [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
-    
+
 # v1.3.5
 ## 10/11/2017
 
 1. [](#improved)
     * Refactored `URI` class with numerous bug fixes, and optimizations
     * Override `system.media.upload_limit` with PHP's `post_max_size` or `upload_max_filesize`
-    * Updated `bin/grav clean` command to remove unnecessary vendor files (save some bytes) 
+    * Updated `bin/grav clean` command to remove unnecessary vendor files (save some bytes)
     * Added a `http_status_code` Twig function to allow setting HTTP status codes from Twig directly.
     * Deter XSS attacks via URI path/uri methods (credit:newbthenewbd)
     * Added support for `$uri->toArray()` and `(string)$uri`
     * Added support for `type` on `Asstes::addInlineJs()` [#1683](https://github.com/getgrav/grav/pull/1683)
 1. [](#bugfix)
-    * Fixed method signature error with `GPM\InstallCommand::processPackage()` [#1682](https://github.com/getgrav/grav/pull/1682)   
+    * Fixed method signature error with `GPM\InstallCommand::processPackage()` [#1682](https://github.com/getgrav/grav/pull/1682)
 
 # v1.3.4
 ## 09/29/2017
@@ -39,7 +840,7 @@
     * Improved support for Assets with query strings [#1451](https://github.com/getgrav/grav/issues/1451)
     * Twig extension cleanup
 1. [](#bugfix)
-    * Fixed an issue where fallback was not supporting dynamic page generation 
+    * Fixed an issue where fallback was not supporting dynamic page generation
     * Fixed issue with Image query string not being fully URL encoded [#1622](https://github.com/getgrav/grav/issues/1622)
     * Fixed `Page::summary()` when using delimiter and multibyte UTF8 Characters [#1644](https://github.com/getgrav/grav/issues/1644)
     * Fixed missing `.json` thumbnail throwing error when adding media [grav-plugin-admin#1156](https://github.com/getgrav/grav-plugin-admin/issues/1156)
@@ -82,7 +883,7 @@
     * Allow `session.timeout` field to be set to `0` via blueprints [#1598](https://github.com/getgrav/grav/issues/1598)
     * Fixed `Data::exists()` and `Data::raw()` functions breaking if `Data::file()` hasn't been called with non-null value
     * Fixed parent theme auto-loading in child themes of Gantry 5
-    
+
 # v1.3.1
 ## 07/19/2017
 

CONTRIBUTING.md

@@ -12,7 +12,7 @@ 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.
+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.
 
@@ -29,7 +29,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 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).
+  [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/).
 
 
 <a name="bugs"></a>
@@ -60,20 +60,20 @@ Guidelines for bug reports:
 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 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 steps will reproduce the issue? What browser(s) and OS experience the problem?
 
-What would you expect to be the outcome?
+- 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?
+- 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.
+- 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.
+- 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.
+All these details will help contributors 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.
 
@@ -110,7 +110,8 @@ 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 [Slack](https://getgrav.org/slack) or in the Forum before embarking on any significant pull request (e.g.
+**Please ask first** in [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/) 
+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.

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Grav
+Copyright (c) 2018 Grav
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,24 +1,27 @@
 # ![](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) [![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)
+[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
+[![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](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:
 
-* [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 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 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
+* [Twig Templating](https://twig.sensiolabs.org/): for powerful control of the user interface
+* [Markdown](https://en.wikipedia.org/wiki/Markdown): for easy content creation
+* [YAML](https://yaml.org): for simple configuration
+* [Parsedown](https://parsedown.org/): for fast Markdown and Markdown Extra support
+* [Doctrine Cache](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
+* [Pimple Dependency Injection Container](https://pimple.sensiolabs.org/): for extensibility and maintainability
+* [Symfony Event Dispatcher](https://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [Symfony Console](https://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)
+- PHP 7.1.3 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
@@ -86,7 +89,7 @@ $ bin/gpm update
 We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
 
 ## Security issues
-If you discover a possible security issue related to Grav or one of its plugins, please send an email to the core team at contact@getgrav.org and we'll address it as soon as possible.
+If you discover a possible security issue related to Grav or one of its plugins, please email the core team at contact@getgrav.org and we'll address it as soon as possible.
 
 # Getting Started
 
@@ -94,82 +97,26 @@ If you discover a possible security issue related to Grav or one of its plugins,
 * [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)!
+* If you have questions, jump on our [Discord Chat Server](https://chat.getgrav.org)!
 * Have fun!
 
 # Exploring More
 
 * Have a look at our [Basic Tutorial](https://learn.getgrav.org/basics/basic-tutorial)
 * Dive into more [advanced](https://learn.getgrav.org/advanced) functions
+* Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
+* Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
+* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
 
 # 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>
+Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]
 
+<img src="https://opencollective.com/grav/tiers/backers.svg?avatarHeight=36&width=600" />
 
 # 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>
+<img src="https://opencollective.com/grav/tiers/sponsors.svg?avatarHeight=36&width=600" />
 
 # License
 
@@ -183,5 +130,5 @@ See [LICENSE](LICENSE.txt)
 
 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.
-
+Windows users should use the `composer test-windows` command.
 You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`

bin/gpm

@@ -1,26 +1,24 @@
 #!/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;
-use Grav\Common\Config\Setup;
+use Symfony\Component\Console\Application;
+use Grav\Common\Grav;
 
-if (!file_exists(__DIR__ . '/../vendor')){
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
     // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
     $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 Grav\Common\Grav;
-
-$autoload = require_once(__DIR__ . '/../vendor/autoload.php');
+$autoload = require __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));
@@ -30,7 +28,14 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -48,15 +53,16 @@ $climate->arguments->add([
     ]
 ]);
 $climate->arguments->parse();
-$environment = $climate->arguments->get('environment');
 
 // Set up environment based on params.
-Setup::$environment = $environment;
+$environment = $climate->arguments->get('environment');
 
 $grav = Grav::instance(array('loader' => $autoload));
-$grav['uri']->init();
+$grav->setup($environment);
+
 $grav['config']->init();
-$grav['streams'];
+$grav['uri']->init();
+$grav['accounts'];
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
 $app->addCommands(array(

bin/grav

@@ -1,24 +1,25 @@
 #!/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;
+use Grav\Common\Grav;
+use League\CLImate\CLImate;
+use Symfony\Component\Console\Application;
 
-if (!file_exists(__DIR__ . '/../vendor')){
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
     // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
     $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;
-
-require_once __DIR__ . '/../vendor/autoload.php';
+$autoload = require __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));
@@ -28,7 +29,31 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+
+// Set up environment based on params.
+$environment = $climate->arguments->get('environment');
+
+$grav = Grav::instance(array('loader' => $autoload));
+$grav->setup($environment);
+
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -41,5 +66,9 @@ $app->addCommands(array(
     new \Grav\Console\Cli\ClearCacheCommand(),
     new \Grav\Console\Cli\BackupCommand(),
     new \Grav\Console\Cli\NewProjectCommand(),
+    new \Grav\Console\Cli\SchedulerCommand(),
+    new \Grav\Console\Cli\SecurityCommand(),
+    new \Grav\Console\Cli\LogViewerCommand(),
+    new \Grav\Console\Cli\YamlLinterCommand(),
 ));
 $app->run();

bin/plugin

@@ -1,30 +1,28 @@
 #!/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');
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
+    // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
+    $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";
+}
+
+$autoload = require __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));
@@ -34,7 +32,14 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
+    die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+@ini_set('default_charset', 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -48,18 +53,12 @@ $climate->arguments->add([
     ]
 ]);
 $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();
-
+$grav->setup($environment);
+$grav->initializeCli();
 
 $app     = new Application('Grav Plugins Commands', GRAV_VERSION);
 $pattern = '([A-Z]\w+Command\.php)';
@@ -75,6 +74,7 @@ $argv = array_merge([$bin], $argv);
 
 $input = new ArgvInput($argv);
 
+/** @var \Grav\Common\Data\Data $plugin */
 $plugin = $grav['plugins']->get($name);
 
 $output = new ConsoleOutput();
@@ -83,13 +83,14 @@ $output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', nul
 
 if (!$name) {
     $output->writeln('');
-    $output->writeln("<red>Usage:</red>");
+    $output->writeln('<red>Usage:</red>');
     $output->writeln("  {$bin} [slug] [command] [arguments]");
     $output->writeln('');
-    $output->writeln("<red>Example:</red>");
+    $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]);
 
+    $total = 0;
     if (count($list)) {
         $available = [];
         $output->writeln('');
@@ -98,17 +99,31 @@ if (!$name) {
             $split = explode('/', $entry);
             $entry = array_shift($split);
             $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
-
-            if (in_array($entry, $available)) {
+            $total = str_pad($total++ + 1, 2, '0', STR_PAD_LEFT);
+            if (\in_array($entry, $available, true)) {
+                $total--;
                 continue;
             }
 
             $available[] = $entry;
-            $output->writeln('  ' . $index . ". <red>" . str_pad($entry, 15) . "</red> <white>${bin} ${entry} list</white>");
+            $commands_count = $index - $total + 1;
+            $output->writeln('  ' . $total . '. <red>' . str_pad($entry, 15) . "</red> <white>{$bin} {$entry} list</white>");
         }
     }
 
     exit;
+} else {
+    if (is_null($plugin)) {
+        $output->writeln('');
+        $output->writeln("<red>$name plugin not found</red>");
+        die;
+    }
+
+    if (!$plugin->enabled) {
+        $output->writeln('');
+        $output->writeln("<red>$name not enabled</red>");
+        die;
+    }
 }
 
 if ($plugin === null) {

composer.json

@@ -2,44 +2,77 @@
     "name": "getgrav/grav",
     "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",
+    "keywords": [
+        "cms",
+        "flat-file cms",
+        "flat cms",
+        "flatfile cms",
+        "php"
+    ],
+    "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=5.5.9",
-        "twig/twig": "~1.24",
-        "erusev/parsedown": "~1.6",
-        "erusev/parsedown-extra": "~0.7",
-        "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.6.*",
-        "doctrine/collections": "1.3",
-        "filp/whoops": "~2.0",
-        "matthiasmullie/minify": "^1.3",
-        "monolog/monolog": "~1.0",
-        "gregwar/image": "2.*",
-        "donatj/phpuseragentparser": "~0.3",
-        "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "~1.0",
-        "maximebf/debugbar": "~1.10",
+        "php": ">=7.1.3",
+        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
-        "league/climate": "^3.2",
+        "ext-dom": "*",
+        "symfony/polyfill-iconv": "^1.9",
+        "symfony/polyfill-php72": "^1.9",
+        "symfony/polyfill-php73": "^1.9",
+        "psr/simple-cache": "^1.0",
+        "psr/http-message": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "kodus/psr7-server": "*",
+        "nyholm/psr7": "^1.0",
+        "twig/twig": "~1.40",
+        "symfony/yaml": "~4.2.0",
+        "symfony/console": "~4.2.0",
+        "symfony/event-dispatcher": "~4.2.0",
+        "symfony/var-dumper": "~4.2.0",
+        "symfony/process": "~4.2.0",
+        "doctrine/cache": "^1.8",
+        "doctrine/collections": "^1.5",
+        "guzzlehttp/psr7": "^1.4",
+        "filp/whoops": "~2.2",
+        "matthiasmullie/minify": "^1.3",
+        "monolog/monolog": "~1.0",
+        "gregwar/image": "2.*",
+        "donatj/phpuseragentparser": "~1.0",
+        "pimple/pimple": "~3.2",
+        "rockettheme/toolbox": "~1.4.0",
+        "maximebf/debugbar": "~1.15",
+        "league/climate": "^3.4",
         "antoligy/dom-string-iterators": "^1.0",
-        "miljar/php-exif": "^0.6.3",
-        "composer/ca-bundle": "^1.0"
+        "miljar/php-exif": "^0.6.4",
+        "composer/ca-bundle": "^1.0",
+        "dragonmantank/cron-expression": "^1.2",
+        "phive/twig-extensions-deferred": "^1.0",
+        "willdurand/negotiation": "2.x-dev"
     },
     "require-dev": {
-        "codeception/codeception": "^2.1",
-        "phpunit/php-code-coverage": "~2.0",
-        "fzaninotto/faker": "^1.5",
+        "codeception/codeception": "^2.4",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-deprecation-rules": "^0.11.0",
+        "phpunit/php-code-coverage": "~6.0",
+        "fzaninotto/faker": "^1.8",
         "victorjonsson/markdowndocs": "dev-master"
     },
+    "suggest": {
+        "ext-zend-opcache": "Recommended for better performance",
+        "ext-intl": "Recommended for multi-language sites",
+        "ext-memcache": "Needed to support Memcache servers",
+        "ext-memcached": "Needed to support Memcached servers",
+        "ext-redis": "Needed to support Redis servers"
+    },
+    "config": {
+        "apcu-autoloader": true,
+        "platform": {
+            "php": "7.1.3"
+        }
+    },
     "repositories": [
         {
             "type": "vcs",
@@ -50,13 +83,23 @@
         "psr-4": {
             "Grav\\": "system/src/Grav"
         },
-        "files": ["system/defines.php"]
+        "files": [
+            "system/defines.php",
+            "system/aliases.php"
+        ]
     },
     "archive": {
-        "exclude": ["VERSION"]
+        "exclude": [
+            "VERSION"
+        ]
     },
     "scripts": {
+        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
+        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
         "post-create-project-cmd": "bin/grav install",
+        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
+        "phpstan-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },

index.php

@@ -1,45 +1,47 @@
 <?php
+
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav;
-define('GRAV_PHP_MIN', '5.5.9');
 
-// Ensure vendor libraries exist
-$autoload = __DIR__ . '/vendor/autoload.php';
-if (!is_file($autoload)) {
-    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;
+\define('GRAV_REQUEST_TIME', microtime(true));
+\define('GRAV_PHP_MIN', '7.1.3');
 
 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;
+if (PHP_SAPI === 'cli-server' && !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>");
+}
 
 // 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')) {
+// Set internal encoding.
+if (!\extension_loaded('mbstring')) {
     die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
 }
+@ini_set('default_charset', 'UTF-8');
 mb_internal_encoding('UTF-8');
 
+// Ensure vendor libraries exist
+$autoload = __DIR__ . '/vendor/autoload.php';
+if (!is_file($autoload)) {
+    die('Please run: <i>bin/grav install</i>');
+}
+
+// Register the auto-loader.
+$loader = require $autoload;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
 // Get the Grav instance
 $grav = Grav::instance(
     array(
@@ -50,6 +52,9 @@ $grav = Grav::instance(
 // Process the page
 try {
     $grav->process();
+} catch (\Error $e) {
+    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
+    throw $e;
 } catch (\Exception $e) {
     $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
     throw $e;

now.json

@@ -0,0 +1,4 @@
+    {
+  "version": 2,
+  "builds": [{ "src": "*.php", "use": "@now/php" }]
+}

robots.txt

@@ -9,3 +9,5 @@ Disallow: /vendor/
 Disallow: /user/
 Allow: /user/pages/
 Allow: /user/themes/
+Allow: /user/images/
+Allow: /

system/aliases.php

@@ -0,0 +1,5 @@
+<?php
+
+/** Moved from non-namespaced classes to Grav Framework */
+class_alias(Grav\Framework\Parsedown\Parsedown::class, '\Parsedown');
+class_alias(Grav\Framework\Parsedown\ParsedownExtra::class, '\ParsedownExtra');

system/assets/debugger.css

@@ -30,9 +30,25 @@ div.phpdebugbar {
 }
 
 .phpdebugbar .phpdebugbar-widgets-toolbar {
+    border-top: 1px solid #ddd;
     padding-left: 5px;
+    padding-right: 2px;
+    padding-top: 2px;
+    background-color: #fafafa !important;
+    width: auto !important;
+    left: 0;
+    right: 0;
 }
 
+.phpdebugbar .phpdebugbar-widgets-toolbar input {
+    background: transparent !important;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
+
+}
+
+
 .phpdebugbar input[type=text] {
     padding: 0;
     display: inline;

system/assets/whoops.css

@@ -1,5 +1,5 @@
 body header {
-    background: #8552A2;
+    background: #3085EE;
 }
 
 body .left-panel {

system/blueprints/config/backups.yaml

@@ -0,0 +1,125 @@
+title: PLUGIN_ADMIN.BACKUPS
+
+form:
+    validation: loose
+
+    fields:
+        history_title:
+            type: section
+            title: PLUGIN_ADMIN.BACKUPS_HISTORY
+            underline: true
+
+        history:
+            type: backupshistory
+
+        config_title:
+            type: section
+            title: PLUGIN_ADMIN.BACKUPS_PURGE_CONFIG
+            underline: true
+
+        purge.trigger:
+            type: select
+            label: PLUGIN_ADMIN.BACKUPS_STORAGE_PURGE_TRIGGER
+            size: medium
+            default: space
+            options:
+                space: Maximum Backup Space
+                number: Maximum Number of Backups
+                time: maximum Retention Time
+            validate:
+                required: true
+
+        purge.max_backups_count:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
+            default: 25
+            size: x-small
+            help: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
+            validate:
+                min: 0
+                type: number
+                required: true
+                message: Must be a number 0 or greater
+
+        purge.max_backups_space:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_SPACE
+            append: in GB
+            size: x-small
+            default: 5
+            validate:
+                min: 1
+                type: number
+                required: true
+                message: Space must be 1GB or greater
+
+        purge.max_backups_time:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME
+            append: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME_APPEND
+            size: x-small
+            default: 365
+            validate:
+                min: 7
+                type: number
+                required: true
+                message: Rentenion days must be 7 or greater
+
+        profiles_title:
+          type: section
+          title: PLUGIN_ADMIN.BACKUPS_PROFILES
+          underline: true
+
+        profiles:
+          type: list
+          style: vertical
+          label:
+          classes: backups-list compact
+          sort: false
+
+          fields:
+            .name:
+              type: text
+              label: PLUGIN_ADMIN.NAME
+              placeholder: PLUGIN_ADMIN.BACKUPS_PROFILE_NAME
+              validate:
+                  max: 20
+                  message: 'Name must be less than 20 characters'
+                  required: true
+            .root:
+              type: text
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER_HELP
+              placeholder: '/'
+              default: '/'
+              validate:
+                  required: true
+            .exclude_paths:
+              type: textarea
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS
+              rows: 5
+              placeholder: "/backup\r/cache\r/images\r/logs\r/tmp"
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS_HELP
+            .exclude_files:
+                type: textarea
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES
+                rows: 5
+                placeholder: ".DS_Store\r.git\r.svn\r.hg\r.idea\r.vscode\rnode_modules"
+                help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES_HELP
+            .schedule:
+                type: toggle
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE
+                highlight: 1
+                default: 1
+                options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                validate:
+                    type: bool
+            .schedule_at:
+                type: cron
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE_AT
+                default: '* 3 * * *'
+                validate:
+                    required: true
+

system/blueprints/config/scheduler.yaml

@@ -0,0 +1,76 @@
+title: PLUGIN_ADMIN.SCHEDULER
+
+form:
+    validation: loose
+
+    fields:
+
+        status_title:
+            type: section
+            title: PLUGIN_ADMIN.SCHEDULER_STATUS
+            underline: true
+
+        status:
+            type: cronstatus
+            validate:
+                type: commalist
+
+        jobs_title:
+            type: section
+            title: PLUGIN_ADMIN.SCHEDULER_JOBS
+            underline: true
+
+        custom_jobs:
+          type: list
+          style: vertical
+          label:
+          classes: cron-job-list compact
+          key: id
+          fields:
+            .id:
+              type: key
+              label: ID
+              placeholder: 'process-name'
+              validate:
+                  required: true
+                  pattern: '[a-zа-я0-9_\-]+'
+                  max: 20
+                  message: 'ID must be lowercase with dashes/underscores only and less than 20 characters'
+            .command:
+              type: text
+              label: PLUGIN_ADMIN.COMMAND
+              placeholder: 'cd ~;ls -lah;'
+              validate:
+                  required: true
+            .args:
+              type: text
+              label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
+            .at:
+              type: cron
+              label: PLUGIN_ADMIN.SCHEDULER_RUNAT
+              help: PLUGIN_ADMIN.SCHEDULER_RUNAT_HELP
+              placeholder: '* * * * *'
+              validate:
+                  required: true
+            .output:
+              type: text
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_HELP
+              placeholder: 'logs/ls-cron.out'
+            .output_mode:
+              type: select
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE_HELP
+              default: append
+              options:
+                  append: Append
+                  overwrite: Overwrite
+            .email:
+                type: text
+                label: PLUGIN_ADMIN.SCHEDULER_EMAIL
+                help: PLUGIN_ADMIN.SCHEDULER_EMAIL_HELP
+                placeholder: 'notifications@yoursite.com'
+
+
+
+

system/blueprints/config/security.yaml

@@ -0,0 +1,107 @@
+title: PLUGIN_ADMIN.SECURITY
+
+form:
+    validation: loose
+    fields:
+
+        xss_section:
+            type: section
+            title: PLUGIN_ADMIN.XSS_SECURITY
+            underline: true
+
+        xss_whitelist:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_WHITELIST_PERMISSIONS
+            help: PLUGIN_ADMIN.XSS_WHITELIST_PERMISSIONS_HELP
+            placeholder: 'admin.super'
+            classes: fancy
+            validate:
+                type: commalist
+
+        xss_enabled.on_events:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_ON_EVENTS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.invalid_protocols:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_INVALID_PROTOCOLS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_invalid_protocols:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_INVALID_PROTOCOLS_LIST
+            classes: fancy
+            validate:
+                type: commalist
+
+        xss_enabled.moz_binding:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_MOZ_BINDINGS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.html_inline_styles:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_HTML_INLINE_STYLES
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.dangerous_tags:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_DANGEROUS_TAGS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_dangerous_tags:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_DANGEROUS_TAGS_LIST
+            classes: fancy
+            validate:
+                type: commalist
+
+        uploads_section:
+            type: section
+            title: PLUGIN_ADMIN.UPLOADS_SECURITY
+            underline: true
+
+
+        uploads_dangerous_extensions:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.UPLOADS_DANGEROUS_EXTENSIONS
+            help: PLUGIN_ADMIN.UPLOADS_DANGEROUS_EXTENSIONS_HELP
+            classes: fancy
+            validate:
+                type: commalist
+

system/blueprints/config/site.yaml

@@ -65,7 +65,7 @@ form:
 
                 summary.size:
                     type: text
-                    size: x-small
+                    size: small
                     append: PLUGIN_ADMIN.CHARACTERS
                     label: PLUGIN_ADMIN.SUMMARY_SIZE
                     help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP

system/blueprints/pages/default.yaml

@@ -21,6 +21,9 @@ form:
           title: PLUGIN_ADMIN.CONTENT
 
           fields:
+            xss_check:
+              type: xss
+
             header.title:
               type: text
               autofocus: true
@@ -32,7 +35,7 @@ form:
                 validate:
                   type: textarea
 
-            uploads:
+            header.media_order:
               type: pagemedia
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
@@ -310,6 +313,31 @@ form:
                   toggleable: true
                   help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
 
+            routes_only:
+              type: section
+              title: PLUGIN_ADMIN.ROUTE_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.routes.default:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_DEFAULT
+
+                header.routes.canonical:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_CANONICAL
+
+                header.routes.aliases:
+                  type: array
+                  toggleable: true
+                  value_only: true
+                  size: large
+                  label: PLUGIN_ADMIN.ROUTE_ALIASES
+
+
             admin_only:
               type: section
               title: PLUGIN_ADMIN.ADMIN_SPECIFIC_OVERRIDES

system/blueprints/pages/external.yaml

@@ -1,5 +1,5 @@
 title: PLUGIN_ADMIN:EXTERNAL
-@extends:
+extends@:
     type: default
     context: blueprints://pages
 
@@ -25,7 +25,7 @@ form:
             content:
               unset@: true
 
-            uploads:
+            header.media_order:
               unset@: true
 
             header.external_url:

system/blueprints/pages/modular.yaml

@@ -1,7 +1,5 @@
 title: PLUGIN_ADMIN.MODULAR
-@extends:
-    type: default
-    context: blueprints://pages
+extends@: default
 
 form:
   fields:
@@ -13,35 +11,28 @@ form:
         content:
           fields:
 
+            modular_title:
+              type: spacer
+              title: PLUGIN_ADMIN.MODULAR_SETUP
+
             header.content.items:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
-              options:
-                '@self.modular': Modular Children
+              size: medium
 
             header.content.order.by:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER_BY
-              default: date
-              options:
-                folder: PLUGIN_ADMIN.FOLDER
-                title: PLUGIN_ADMIN.TITLE
-                date: PLUGIN_ADMIN.DATE
-                default: PLUGIN_ADMIN.DEFAULT
+              placeholder: date
+              help:
+              size: small
 
             header.content.order.dir:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER
-              default: desc
-              options:
-                asc: PLUGIN_ADMIN.ASCENDING
-                desc: PLUGIN_ADMIN.DESCENDING
+              help: '"desc" or "asc" are valid values'
+              placeholder: desc
+              size: small
 
-            header.process:
-              type: ignore
-            content:
-              type: ignore
-            uploads:
-              type: ignore
 

system/blueprints/user/account.yaml

@@ -4,120 +4,124 @@ form:
 
     fields:
 
-            info:
-                type: userinfo
-                size: large
+        info:
+            type: userinfo
+            size: large
 
-            avatar:
-                type: file
-                size: large
-                destination: 'user://accounts/avatars'
-                multiple: false
-                random_name: true
+        avatar:
+            type: file
+            size: large
+            destination: 'user://accounts/avatars'
+            multiple: false
+            random_name: true
 
-            content:
-                type: section
-                title: PLUGIN_ADMIN.ACCOUNT
-                underline: true
+        content:
+            type: section
+            title: PLUGIN_ADMIN.ACCOUNT
+            underline: true
 
-            username:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.USERNAME
-                disabled: true
-                readonly: true
+        username:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.USERNAME
+            disabled: true
+            readonly: true
 
-            email:
-                type: email
-                size: large
-                label: PLUGIN_ADMIN.EMAIL
-                validate:
-                  type: email
-                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                  required: true
+        email:
+            type: email
+            size: large
+            label: PLUGIN_ADMIN.EMAIL
+            validate:
+              type: email
+              message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+              required: true
 
-            password:
-                type: password
-                size: large
-                label: PLUGIN_ADMIN.PASSWORD
-                validate:
-                  required: false
-                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                  config-pattern@: system.pwd_regex
+        password:
+            type: password
+            size: large
+            label: PLUGIN_ADMIN.PASSWORD
+            autocomplete: new-password
+            validate:
+              required: false
+              message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+              config-pattern@: system.pwd_regex
 
-            fullname:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.FULL_NAME
-                validate:
-                  required: true
+        fullname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.FULL_NAME
+            validate:
+              required: true
 
-            title:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.TITLE
+        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
+        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
 
-            twofa_check:
-                type: conditional
-                condition: config.plugins.admin.twofa_enabled
+        twofa_check:
+            type: conditional
+            condition: config.plugins.admin.twofa_enabled
 
-                fields:
+            fields:
 
-                    twofa:
-                        title: PLUGIN_ADMIN.2FA_TITLE
-                        type: section
-                        underline: true
+                twofa:
+                    title: PLUGIN_ADMIN.2FA_TITLE
+                    type: section
+                    underline: true
 
-                    twofa_enabled:
-                        type: toggle
-                        label: PLUGIN_ADMIN.2FA_ENABLED
-                        classes: twofa-toggle
-                        highlight: 1
-                        default: 0
-                        options:
-                          1: PLUGIN_ADMIN.YES
-                          0: PLUGIN_ADMIN.NO
-                        validate:
-                          type: bool
+                twofa_enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.2FA_ENABLED
+                    classes: twofa-toggle
+                    highlight: 1
+                    default: 0
+                    options:
+                      1: PLUGIN_ADMIN.YES
+                      0: PLUGIN_ADMIN.NO
+                    validate:
+                      type: bool
 
 
-                    twofa_secret:
-                        type: 2fa_secret
-                        outerclasses: 'twofa-secret'
-                        label: PLUGIN_ADMIN.2FA_SECRET
-                        sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
+                twofa_secret:
+                    type: 2fa_secret
+                    outerclasses: 'twofa-secret'
+                    markdown: true
+                    label: PLUGIN_ADMIN.2FA_SECRET
+                    sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
 
-            security:
-                title: PLUGIN_ADMIN.ACCESS_LEVELS
-                type: section
-                security: admin.super
-                underline: true
+        security:
+            security@: admin.super
+            title: PLUGIN_ADMIN.ACCESS_LEVELS
+            type: section
+            underline: true
 
-                fields:
-                    groups:
-                        type: select
-                        multiple: true
-                        size: large
-                        label: PLUGIN_ADMIN.GROUPS
-                        data-options@: '\Grav\Common\User\Group::groupNames'
-                        classes: fancy
-                        help: PLUGIN_ADMIN.GROUPS_HELP
-                        validate:
-                            type: commalist
+            fields:
+                groups:
+                    security@: admin.super
+                    type: select
+                    multiple: true
+                    size: large
+                    label: PLUGIN_ADMIN.GROUPS
+                    data-options@: '\Grav\Common\User\Group::groupNames'
+                    classes: fancy
+                    help: PLUGIN_ADMIN.GROUPS_HELP
+                    validate:
+                        type: commalist
 
-                    access:
-                        type: permissions
-                        label: PLUGIN_ADMIN.PERMISSIONS
-                        ignore_empty: true
-                        validate:
-                            type: array
+                access:
+                    security@: admin.super
+                    type: permissions
+                    label: PLUGIN_ADMIN.PERMISSIONS
+                    ignore_empty: true
+                    validate:
+                        type: array

system/blueprints/user/account_new.yaml

@@ -12,5 +12,7 @@ form:
       type: text
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
+      unset-disabled@: true
+      unset-readonly@: true
       validate:
         required: true

system/blueprints/user/accounts.yaml

@@ -0,0 +1,39 @@
+title: User Accounts
+description: User Accounts
+type: flex-objects
+
+extends@: 'user/account'
+
+config:
+  admin:
+    list:
+      fields:
+        username:
+          link: edit
+          search: true
+        email:
+          search: true
+        fullname:
+          search: true
+      options:
+        per_page: 20
+        order:
+          by: username
+          dir: asc
+
+    menu:
+      list:
+        route: '/accounts'
+        title: Accounts
+        icon: fa-users
+        authorize: ['admin.users', 'admin.accounts', 'admin.super']
+
+form:
+  fields:
+    username:
+      flex-disabled@: exists
+      disabled: false
+      flex-readonly@: exists
+      readonly: false
+      validate:
+        required: true

system/config/backups.yaml

@@ -0,0 +1,15 @@
+purge:
+    trigger: space
+    max_backups_count: 25
+    max_backups_space: 5
+    max_backups_time: 365
+
+profiles:
+  -
+    name: 'Default Site Backup'
+    root: '/'
+    schedule: false
+    schedule_at: '0 3 * * *'
+    exclude_paths: "/backup\r\n/cache\r\n/images\r\n/logs\r\n/tmp"
+    exclude_files: ".DS_Store\r\n.git\r\n.svn\r\n.hg\r\n.idea\r\n.vscode\r\nnode_modules"
+

system/config/media.yaml

@@ -53,7 +53,7 @@ types:
     thumb: media/thumb-flv.png
     mime: video/x-flv
   webm:
-    type: file
+    type: video
     thumb: media/thumb-webm.png
     mime: video/webm
   ogv:

system/config/security.yaml

@@ -0,0 +1,38 @@
+xss_whitelist: [admin.super] # Whitelist of user access that should 'skip' XSS checking
+xss_enabled:
+    on_events: true
+    invalid_protocols: true
+    moz_binding: true
+    html_inline_styles: true
+    dangerous_tags: true
+xss_invalid_protocols:
+    - javascript
+    - livescript
+    - vbscript
+    - mocha
+    - feed
+    - data
+xss_dangerous_tags:
+    - applet
+    - meta
+    - xml
+    - blink
+    - link
+    - style
+    - script
+    - embed
+    - object
+    - iframe
+    - frame
+    - frameset
+    - ilayer
+    - layer
+    - bgsound
+    - title
+    - base
+uploads_dangerous_extensions:
+    - php
+    - html
+    - htm
+    - js
+    - exe

system/config/site.yaml

@@ -3,7 +3,7 @@ default_lang: en                            # Default language for site (potenti
 
 author:
   name: John Appleseed                      # Default author name
-  email: 'john@email.com'                   # Default author email
+  email: 'john@example.com'                 # Default author email
 
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
 
@@ -17,17 +17,17 @@ 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)
 
-#menu:                                      # Sample Menu Example
+#menu:                                      # Menu Example
 #    - text: Source
 #      icon: github
 #      url: https://github.com/getgrav/grav

system/config/streams.yaml

@@ -1,6 +1,6 @@
 schemes:
   image:
-    type: ReadOnlyStream
+    type: Stream
     paths:
       - user://images
       - system://images

system/config/system.yaml

@@ -5,13 +5,22 @@ param_sep: ':'                                   # Parameter separator, use ';'
 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)
+force_lowercase_urls: true                       # If you want to support mixed cased URLs set this to false
 custom_base_url: ''                              # Set the base_url manually, e.g. http://yoursite.com/yourpath
 username_regex: '^[a-z0-9_-]{3,16}$'             # Only lowercase chars, digits, dashes, underscores. 3 - 16 chars
 pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' # At least one number, one uppercase and lowercase letter, and be at least 8+ chars
+intl_enabled: true                               # Special logic for PHP International Extension (mod_intl)
+http_x_forwarded:                                # Configuration options for the various HTTP_X_FORWARD headers
+  protocol: true
+  host: false
+  port: true
+  ip: true
 
 languages:
   supported: []                                  # List of languages supported. eg: [en, fr, de]
+  default_lang:                                  # Default is the first supported language. Must be one of the supported languages
   include_default_lang: true                     # Include the default lang prefix in all URLs
+  pages_fallback_only: false                     # Only fallback to find page content through supported languages
   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
@@ -23,7 +32,7 @@ home:
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  theme: antimatter                              # Default theme (defaults to "antimatter" theme)
+  theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
     dir: asc                                     # Default ordering direction, "asc" or "desc"
@@ -50,7 +59,7 @@ pages:
     special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [txt,xml,html,htm,json,rss,atom]        # list of valid page types
+  types: [html,htm,xml,txt,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)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
@@ -63,6 +72,7 @@ pages:
   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
+  hide_empty_folders: false                      # If folder has no .md file, should it be hidden
   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?
@@ -72,8 +82,11 @@ cache:
   enabled: true                                  # Set to true to enable caching
   check:
     method: file                                 # Method to check for updates in pages: file|folder|hash|none
-  driver: auto                                   # One of: auto|file|apc|xcache|memcache|wincache
+  driver: auto                                   # One of: auto|file|apcu|memcache|wincache
   prefix: 'g'                                    # Cache prefix string (prevents cache conflicts)
+  purge_at: '0 4 * * *'                          # How often to purge old file cache (using new scheduler)
+  clear_at: '0 3 * * *'                           # How often to clear cache (using new scheduler)
+  clear_job_type: 'standard'                     # Type to clear when processing the scheduled clear job `standard`|`all`
   clear_images_by_default: true                  # By default grav will include processed images in cache clear, this can be disabled
   cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
   lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
@@ -86,7 +99,7 @@ twig:
   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
+  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
   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
@@ -110,6 +123,11 @@ errors:
   display: 0                                     # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
   log: true                                      # Log errors to /logs folder
 
+log:
+  handler: file                                 # Log handler. Currently supported: file | syslog
+  syslog:
+    facility: local6                            # Syslog facilities output
+
 debugger:
   enabled: false                                 # Enable Grav debugger and following settings
   shutdown:
@@ -121,6 +139,7 @@ images:
   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
+  seofriendly: false                             # SEO-friendly processed image names
 
 media:
   enable_media_timestamp: false                  # Enable media timestamps
@@ -130,8 +149,10 @@ media:
 
 session:
   enabled: true                                  # Enable Session support
+  initialize: true                               # Initialize session from Grav (if false, plugin needs to start the session)
   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
+  uniqueness: path                               # Should sessions be `path` based or `security.salt` based
   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)
@@ -143,3 +164,11 @@ gpm:
   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
+
+accounts:
+  type: data                                     # Account type: data or flex
+  storage: file                                  # Flex storage type: file or folder
+
+strict_mode:
+  yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
+  twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)

system/defines.php

@@ -1,19 +1,19 @@
 <?php
 /**
- * @package    Grav.Core
+ * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.3.7');
-//define('GRAV_TESTING', true);
+define('GRAV_VERSION', '1.6.25');
+define('GRAV_TESTING', false);
 define('DS', '/');
 
 if (!defined('GRAV_PHP_MIN')) {
-    define('GRAV_PHP_MIN', '5.5.9');
+    define('GRAV_PHP_MIN', '7.1.3');
 }
 
 // Directories and Paths

system/install.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package    Grav\Core
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+if (!defined('GRAV_ROOT')) {
+    die();
+}
+
+use Grav\Installer\Install;
+
+require_once __DIR__ . '/src/Grav/Installer/Install.php';
+
+return Install::instance();

system/languages/ar.yaml

@@ -1,75 +1,63 @@
 ---
-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:
-  - الاثنين
-  - الثلاثاء
-  - الأربعاء
-  - الخميس
-  - الجمعة
-  - السبت
-  - الأحد
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nالعنوان: %1$s\n---\n# خطأ: مادة أمامية غير صحيحة\n\nمسار: '%2$s'\n\n**%3$s**\n\n, , ,\n\n%4$s\n, , ,"
+  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/bg.yaml

@@ -0,0 +1,62 @@
+---
+GRAV:
+  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

@@ -1,75 +1,62 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# S'ha produït un error: Frontmatter invàlid\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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
+    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

@@ -1,81 +1,144 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Chyba: Chybný frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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:
+    - '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ď
+    JUST_NOW: právě 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:
+    - 'leden'
+    - 'únor'
+    - 'březen'
+    - 'duben'
+    - 'květen'
+    - 'červen'
+    - 'červenec'
+    - 'srpen'
+    - 'září'
+    - 'říjen'
+    - 'listopad'
+    - 'prosinec'
+  DAYS_OF_THE_WEEK:
+    - 'pondělí'
+    - 'úterý'
+    - 'středa'
+    - 'čtvrtek'
+    - 'pátek'
+    - 'sobota'
+    - 'neděle'
+  CRON:
+    EVERY: každý
+    EVERY_HOUR: každou hodinu
+    EVERY_MINUTE: každou minutu
+    EVERY_DAY_OF_WEEK: každý den v týdnu
+    EVERY_DAY_OF_MONTH: každý den v měsíci
+    EVERY_MONTH: každý měsíc
+    TEXT_PERIOD: Every <b />
+    TEXT_MINS: ' at <b /> minute(s) past the hour'
+    TEXT_TIME: ' at <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: Tag %s není podporován!
+    ERROR2: Chybný počet prvků
+    ERROR3: jquery_element musí být nastaven v nastaveních pro jqCron
+    ERROR4: Nerozpoznaný výraz

system/languages/da.yaml

@@ -1,75 +1,62 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nTitel: %1$s\n---\n\n# Fejl: Ugyldigt frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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
+    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'
+    - '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/de.yaml

@@ -1,89 +1,144 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n# Fehler: Frontmatter enthält Fehler\n\nPfad: `%2$s`\n\n**%3$s ** \n\n```\n%4$s\n```"
+  INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ice'
+    '/(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': '\1ies'
+    '/(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\2ves'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+  INFLECTOR_UNCOUNTABLE:
+    - 'Ausstattung'
+    - 'Informationen'
+    - 'Reis'
+    - 'Geld'
+    - 'Arten'
+    - 'Serie'
+    - 'Fisch'
+    - 'Schaf'
+  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
+    JUST_NOW: jetzt gerade
+    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: Dez
+    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'
+  CRON:
+    EVERY: jede
+    EVERY_HOUR: jede Stunde
+    EVERY_MINUTE: Jede Minute
+    EVERY_DAY_OF_WEEK: jeden Tag der Woche
+    EVERY_DAY_OF_MONTH: jeden Tag des Monats
+    EVERY_MONTH: jeden Monat
+    TEXT_PERIOD: Alle <b />
+    TEXT_MINS: ' bei <b /> Minuten nach der vollen Stunde (n)'
+    TEXT_TIME: ' bei <b />:<b />'
+    TEXT_DOW: ' auf <b />'
+    TEXT_MONTH: ' von <b />'
+    TEXT_DOM: ' auf <b />'
+    ERROR1: Der Tag %s wird nicht unterstützt!
+    ERROR2: Ungültige Anzahl von Elementen
+    ERROR3: jquery_element sollte in den jqCron Einstellungen gesetzt werden
+    ERROR4: Unbekannter Ausdruck

system/languages/el.yaml

@@ -1,22 +1,63 @@
 ---
-MONTHS_OF_THE_YEAR:
-  - Ιανουάριος
-  - Φεβρουάριος
-  - Μάρτιος
-  - Απρίλιος
-  - Μάιος
-  - Ιούνιος
-  - Ιούλιος
-  - Αύγουστος
-  - Σεπτέμβριος
-  - Οκτώβριος
-  - Νοέμβριος
-  - Δεκέμβριος
-DAYS_OF_THE_WEEK:
-  - Δευτέρα
-  - Τρίτη
-  - Τετάρτη
-  - Πέμπτη
-  - Παρασκευή
-  - Σάββατο
-  - Κυριακή
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nΤίτλος: %1$s\n---\n\n# Σφάλμα: Μη έγκυρη διαδρομή Frontmatter\n\nΔιαδρομή: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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/en.yaml

@@ -1,101 +1,120 @@
-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'
-    '/([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'
-    '/s$/i': ''
-INFLECTOR_UNCOUNTABLE: ['equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep']
-INFLECTOR_IRREGULAR:
-    'person': 'people'
-    'man': 'men'
-    'child': 'children'
-    'sex': 'sexes'
-    'move': 'moves'
-INFLECTOR_ORDINALS:
-    'default': 'th'
-    'first': 'st'
-    'second': 'nd'
-    'third': 'rd'
-NICETIME:
-    NO_DATE_PROVIDED: No date provided
-    BAD_DATE: Bad date
-    AGO: ago
-    FROM_NOW: from now
-    JUST_NOW: just 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']
+---
+GRAV:
+    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'
+        '/([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'
+        '/s$/i': ''
+    INFLECTOR_UNCOUNTABLE: ['equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep']
+    INFLECTOR_IRREGULAR:
+        'person': 'people'
+        'man': 'men'
+        'child': 'children'
+        'sex': 'sexes'
+        'move': 'moves'
+    INFLECTOR_ORDINALS:
+        'default': 'th'
+        'first': 'st'
+        'second': 'nd'
+        'third': 'rd'
+    NICETIME:
+        NO_DATE_PROVIDED: No date provided
+        BAD_DATE: Bad date
+        AGO: ago
+        FROM_NOW: from now
+        JUST_NOW: just now
+        SECOND: second
+        MINUTE: minute
+        HOUR: hour
+        DAY: day
+        WEEK: week
+        MONTH: month
+        YEAR: year
+        DECADE: decade
+        SEC: sec
+        MIN: min
+        HR: hr
+        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
+        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']
+    YES: "Yes"
+    NO: "No"
+    CRON:
+        EVERY: every
+        EVERY_HOUR: every hour
+        EVERY_MINUTE: every minute
+        EVERY_DAY_OF_WEEK: every day of the week
+        EVERY_DAY_OF_MONTH: every day of the month
+        EVERY_MONTH: every month
+        TEXT_PERIOD: Every <b />
+        TEXT_MINS: ' at <b /> minute(s) past the hour'
+        TEXT_TIME: ' at <b />:<b />'
+        TEXT_DOW: ' on <b />'
+        TEXT_MONTH: ' of <b />'
+        TEXT_DOM: ' on <b />'
+        ERROR1: The tag %s is not supported!
+        ERROR2: Bad number of elements
+        ERROR3: The jquery_element should be set into jqCron settings
+        ERROR4: Unrecognized expression

system/languages/es.yaml

@@ -1,90 +1,95 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Frontmatter no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipo'
+    - 'información'
+    - 'rice'
+    - 'dinero'
+    - 'species'
+    - 'series'
+    - 'pescado'
+    - '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 errónea
+    AGO: antes
+    FROM_NOW: desde ahora
+    JUST_NOW: hace un momento
+    SECOND: segundo
+    MINUTE: minuto
+    HOUR: hora
+    DAY: día
+    WEEK: semana
+    MONTH: mes
+    YEAR: año
+    DECADE: década
+    SEC: seg
+    HR: h
+    WK: sem
+    MO: mes
+    YR: año
+    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
+    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'
+  CRON:
+    EVERY: cada
+    EVERY_HOUR: cada hora
+    EVERY_MINUTE: cada minuto
+    EVERY_DAY_OF_WEEK: cada día de la semana
+    EVERY_DAY_OF_MONTH: cada día del mes
+    EVERY_MONTH: cada mes
+    TEXT_PERIOD: Cada <b />
+    TEXT_MINS: ' a <b /> minuto(s) despues de la hora'
+    TEXT_TIME: ' a <b />:<b />'
+    TEXT_DOW: ' en <b />'
+    TEXT_MONTH: ' de<b />'
+    TEXT_DOM: ' en<b />'
+    ERROR1: La etiqueta %s no está soportada!
+    ERROR2: El número de elementos es erroneo
+    ERROR3: El jquery_element debería establecerse en la configuración del jqCron
+    ERROR4: Expresión no reconocida

system/languages/et.yaml

@@ -0,0 +1,85 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'informatsioon'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'kala'
+    - 'lammas'
+  INFLECTOR_IRREGULAR:
+    'person': 'inimesed'
+    'man': 'mees'
+    'child': 'lapsed'
+  INFLECTOR_ORDINALS:
+    'default': '.'
+    'first': '.'
+    'second': '.'
+    'third': '.'
+  NICETIME:
+    NO_DATE_PROVIDED: Kuupäev määramata
+    BAD_DATE: Vigane kuupäev
+    AGO: tagasi
+    FROM_NOW: praegusest
+    JUST_NOW: just nüüd
+    SECOND: sekund
+    MINUTE: minut
+    HOUR: tundi
+    DAY: päev
+    WEEK: nädal
+    MONTH: kuu
+    YEAR: aasta
+    DECADE: 10 aastat
+    SEC: sek
+    HR: t
+    WK: näd
+    MO: k.
+    YR: a.
+    DEC: dekaad
+    SECOND_PLURAL: sekundit
+    MINUTE_PLURAL: minutit
+    HOUR_PLURAL: tundi
+    DAY_PLURAL: päeva
+    WEEK_PLURAL: nädalat
+    MONTH_PLURAL: kuud
+    YEAR_PLURAL: aastat
+    DECADE_PLURAL: dekaadi
+    SEC_PLURAL: sekundit
+    MIN_PLURAL: min
+    HR_PLURAL: t
+    WK_PLURAL: näd
+    MO_PLURAL: kuud
+    YR_PLURAL: aastat
+    DEC_PLURAL: dek.
+  FORM:
+    VALIDATION_FAIL: <b>Kinnitamine nurjus:</b>
+    INVALID_INPUT: 'Vigane sisend:'
+    MISSING_REQUIRED_FIELD: 'Nõutud väli puudub:'
+  MONTHS_OF_THE_YEAR:
+    - 'jaanuar'
+    - 'veebruar'
+    - 'märts'
+    - 'aprill'
+    - 'mai'
+    - 'juuni'
+    - 'juuli'
+    - 'august'
+    - 'september'
+    - 'oktoober'
+    - 'november'
+    - 'detsember'
+  DAYS_OF_THE_WEEK:
+    - 'esmaspäev'
+    - 'teisipäev'
+    - 'kolmapäev'
+    - 'neljapäev'
+    - 'reede'
+    - 'laupäev'
+    - 'pühapäev'
+  CRON:
+    EVERY: iga
+    EVERY_MONTH: iga kuu
+    TEXT_PERIOD: Iga <b />

system/languages/eu.yaml

@@ -0,0 +1,62 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "--- title: %1$s --- # Errorea: Baliogabeko Frontmatter Bidea: `%2$s` **%3$s** ``` %4$s ```"
+  NICETIME:
+    NO_DATE_PROVIDED: Ez da datarik ezarri
+    BAD_DATE: Okerreko data
+    AGO: ' duela'
+    FROM_NOW: oraindik aurrera
+    SECOND: segundo
+    MINUTE: minutu
+    HOUR: ordua
+    DAY: egun
+    WEEK: astea
+    MONTH: hilabetea
+    YEAR: urtea
+    DECADE: hamarkada
+    SEC: seg
+    HR: h
+    WK: ast
+    MO: hil
+    YR: urt
+    DEC: ham
+    SECOND_PLURAL: segundo
+    MINUTE_PLURAL: minutu
+    HOUR_PLURAL: ordu
+    DAY_PLURAL: egun
+    WEEK_PLURAL: aste
+    MONTH_PLURAL: hilabete
+    YEAR_PLURAL: urte
+    DECADE_PLURAL: hamarkada
+    SEC_PLURAL: segundo
+    MIN_PLURAL: minutu
+    HR_PLURAL: h
+    WK_PLURAL: ast
+    MO_PLURAL: hil
+    YR_PLURAL: urt
+    DEC_PLURAL: ham
+  FORM:
+    VALIDATION_FAIL: <b>Balidazioak huts egin du</b>
+    INVALID_INPUT: Baliogabeko sarrera
+    MISSING_REQUIRED_FIELD: 'Derrigorrezko eremua bete gabe:'
+  MONTHS_OF_THE_YEAR:
+    - 'Urtarrila'
+    - 'Otsaila'
+    - 'Martxoa'
+    - 'Apirila'
+    - 'Maiatza'
+    - 'Ekaina'
+    - 'Uztaila'
+    - 'Abuztua'
+    - 'Iraila'
+    - 'Urria'
+    - 'Azaroa'
+    - 'Abendua'
+  DAYS_OF_THE_WEEK:
+    - 'Astelehena'
+    - 'Asteartea'
+    - 'Azteazkena'
+    - 'Osteguna'
+    - 'Ostirala'
+    - 'Larunbata'
+    - 'Igandea'

system/languages/fa.yaml

@@ -0,0 +1,62 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nعنوان: %1$s\n---\n\n# خطا: Frontmatter غلط\n\nمسیر: %2$s\n\n**%3$s**\n\n```\n%4$s\n```"
+  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: هفته
+    YR_PLURAL: سال
+    DEC_PLURAL: دهه
+  FORM:
+    VALIDATION_FAIL: <b>سنجش اعتبار ناموفق بود</b>
+    INVALID_INPUT: ورودی نامعتبر در
+    MISSING_REQUIRED_FIELD: 'قسمت ضروری جا افتاده:'
+  MONTHS_OF_THE_YEAR:
+    - 'ژانویه'
+    - 'فوریه'
+    - 'مارس'
+    - 'آوریل'
+    - 'می'
+    - 'ژوئن'
+    - 'ژوئیه'
+    - 'اوت'
+    - 'سپتامبر'
+    - 'اکتبر'
+    - 'نوامبر'
+    - 'دسامبر'
+  DAYS_OF_THE_WEEK:
+    - 'دوشنبه'
+    - 'سه‌ شنبه'
+    - 'چهارشنبه'
+    - 'پنج شنبه'
+    - 'جمعه'
+    - 'شنبه'
+    - 'یک‌شنبه'

system/languages/fi.yaml

@@ -1,60 +1,134 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\notsikko: %1$s\n---\n\n# Virhe: Virheellinen Frontmatter\n\nPolku: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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:
+    - 'equipment'
+    - 'information'
+    - 'riisi'
+    - 'raha'
+    - 'lajit'
+    - 'series'
+    - 'kala'
+    - 'lammas'
+  INFLECTOR_IRREGULAR:
+    'person': 'ihmiset'
+    'man': 'miehet'
+    'child': 'lapset'
+    'sex': 'sukupuoli'
+  INFLECTOR_ORDINALS:
+    'default': '.'
+    'first': '.'
+    'second': '.'
+    'third': '.'
+  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
+    JUST_NOW: juuri nyt
+    SECOND: sekuntti
+    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>
+    INVALID_INPUT: Syöte ei kelpaa
+    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'
+  CRON:
+    EVERY: joka
+    EVERY_HOUR: joka tunti
+    EVERY_MINUTE: joka minuutti
+    EVERY_DAY_OF_WEEK: viikon jokaisena päivänä
+    EVERY_DAY_OF_MONTH: kuukauden jokaisena päivänä
+    EVERY_MONTH: joka kuukausi
+    TEXT_PERIOD: Joka <b />

system/languages/fr.yaml

@@ -1,138 +1,123 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitre: %1$s\n---\n\n# Erreur : Frontmatter invalide\n\nChemin: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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': '\1es'
+    '/(bu)s$/i': 'Bus'
+    '/(alias|status)/i': 'alias|status'
+    '/(ax|test)is$/i': '\1s'
+    '/s$/i': 's'
+    '/$/': 's'
+  INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+  INFLECTOR_UNCOUNTABLE:
+    - 'équipement'
+    - 'information'
+    - '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
+    JUST_NOW: à l'instant
+    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'
+  CRON:
+    EVERY: chaque
+    EVERY_HOUR: toutes les heures
+    EVERY_MINUTE: chaque minute
+    EVERY_DAY_OF_WEEK: tous les jours de la semaine
+    EVERY_DAY_OF_MONTH: tous les jours du mois
+    EVERY_MONTH: chaque mois
+    TEXT_PERIOD: Chaque<b/>
+    TEXT_MINS: ' à <b /> minute(s) après l''heure'
+    TEXT_TIME: ' à<b/>:<b/>'
+    TEXT_DOW: ' sur <b/>'
+    TEXT_MONTH: ' de <b />'
+    TEXT_DOM: ' sur <b/>'
+    ERROR1: La balise %s n'est pas supportée!
+    ERROR2: Nombre invalide d'éléments
+    ERROR3: L'élément jquery_element doit être défini dans les paramètres jqCron
+    ERROR4: Expression non reconnue

system/languages/he.yaml

@@ -0,0 +1,63 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nכותרת: %1$s\n---\n# שגיאה: Fronmatter לא חוקי\nנתיב: `%2$s`\n**%3$s**\n```\n%4$s\n```"
+  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/hr.yaml

@@ -1,75 +1,76 @@
 ---
-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
+GRAV:
+  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

@@ -1,138 +1,97 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ncím: %1$s\n---\n\n# Hiba: Érvénytelen Frontmatter\n\nElérési út: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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
+    JUST_NOW: épp most
+    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>Érvényesítés nem sikerült:</b>
+    INVALID_INPUT: 'A 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'
+  CRON:
+    EVERY: minden
+    EVERY_HOUR: óránként
+    EVERY_MINUTE: percenként
+    EVERY_DAY_OF_WEEK: a hét minden napján
+    EVERY_DAY_OF_MONTH: a hónap minden napján
+    EVERY_MONTH: minden hónapban
+    TEXT_PERIOD: Minden <b />
+    TEXT_MINS: '<b /> perccel az óra elteltével'
+    ERROR1: A %s címke nem engedélyezett!
+    ERROR2: Hibás elemszám
+    ERROR3: A jquery_element-et a jqCron beállítsokban kell meghatározni
+    ERROR4: Ismeretlen kifejezés

system/languages/id.yaml

@@ -0,0 +1,95 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Frontmatter tidak valid\n\nLokasi: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'peralatan'
+    - 'informasi'
+    - 'nasi'
+    - 'uang'
+    - 'spesies'
+    - 'rangkaian'
+    - 'ikan'
+    - 'domba'
+  INFLECTOR_IRREGULAR:
+    'person': 'orang-orang'
+    'man': 'laki-laki'
+    'child': 'anak-anak'
+    'sex': 'jenis kelamin'
+    'move': 'pindahkan'
+  NICETIME:
+    NO_DATE_PROVIDED: Tanggal tidak tersedia
+    BAD_DATE: Format tanggal salah
+    AGO: yang lalu
+    FROM_NOW: dari saat ini
+    JUST_NOW: baru saja
+    SECOND: detik
+    MINUTE: menit
+    HOUR: jam
+    DAY: hari
+    WEEK: pekan
+    MONTH: bulan
+    YEAR: tahun
+    DECADE: dekade
+    SEC: dtk
+    MIN: mnt
+    HR: j
+    WK: mng
+    MO: bln
+    YR: thn
+    DEC: desimal
+    SECOND_PLURAL: detik
+    MINUTE_PLURAL: menit
+    HOUR_PLURAL: jam
+    DAY_PLURAL: hari
+    WEEK_PLURAL: pekan
+    MONTH_PLURAL: bulan
+    YEAR_PLURAL: tahun
+    DECADE_PLURAL: dekade
+    SEC_PLURAL: dtk
+    MIN_PLURAL: mnt
+    HR_PLURAL: j
+    WK_PLURAL: mgg
+    MO_PLURAL: bln
+    YR_PLURAL: thn
+    DEC_PLURAL: dekade
+  FORM:
+    VALIDATION_FAIL: <b>Validasi gagal:</b>
+    INVALID_INPUT: Input tidak valid di
+    MISSING_REQUIRED_FIELD: 'Data yang diperlukan belum terisi:'
+  MONTHS_OF_THE_YEAR:
+    - 'Januari'
+    - 'Februari'
+    - 'Maret'
+    - 'April'
+    - 'Mei'
+    - 'Juni'
+    - 'Juli'
+    - 'Agustus'
+    - 'September'
+    - 'Oktober'
+    - 'November'
+    - 'Desember'
+  DAYS_OF_THE_WEEK:
+    - 'Senin'
+    - 'Selasa'
+    - 'Rabu'
+    - 'Kamis'
+    - 'Jumat'
+    - 'Sabtu'
+    - 'Minggu'
+  CRON:
+    EVERY: Setiap
+    EVERY_HOUR: Setiap jam
+    EVERY_MINUTE: Setiap menit
+    EVERY_DAY_OF_WEEK: Setiap hari selama seminggu
+    EVERY_DAY_OF_MONTH: pada tanggal setiap bulannya
+    EVERY_MONTH: setiap bulan
+    TEXT_PERIOD: Setiap <b />
+    TEXT_TIME: ' pada <b />:<b />'
+    TEXT_DOW: ' pada <b />'
+    TEXT_MONTH: ' pada <b />'
+    TEXT_DOM: ' pada <b />'
+    ERROR1: Tag %s tidak didukung!
+    ERROR2: Jumlah elemen tidak valid
+    ERROR3: jquery_element harus ditetapkan ke pengaturan jqCron
+    ERROR4: Ekspresi tidak dikenali

system/languages/is.yaml

@@ -0,0 +1,80 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitill: %1$s\n---\n\n# Villa: Ógilt efni á forsíðu\n\nSlóð: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'upplýsingar'
+    - 'rice'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'
+  NICETIME:
+    NO_DATE_PROVIDED: Engin dagsetning gefin
+    BAD_DATE: Röng dagsetning
+    AGO: síðan
+    JUST_NOW: í þessu
+    SECOND: sekúndu
+    MINUTE: mínútu
+    HOUR: klukkustund
+    DAY: degi
+    WEEK: viku
+    MONTH: mánuði
+    YEAR: ári
+    DECADE: áratug
+    SEC: sek
+    MIN: mín
+    HR: klst
+    WK: vk
+    MO: mán
+    YR: ár
+    DEC: árat
+    SECOND_PLURAL: sekúndum
+    MINUTE_PLURAL: mínútum
+    HOUR_PLURAL: klukkustundum
+    DAY_PLURAL: dögum
+    WEEK_PLURAL: vikum
+    MONTH_PLURAL: mánuðum
+    YEAR_PLURAL: árum
+    DECADE_PLURAL: áratugum
+    SEC_PLURAL: sek
+    MIN_PLURAL: mín
+    HR_PLURAL: klst
+    WK_PLURAL: vik
+    MO_PLURAL: mán
+    YR_PLURAL: árum
+    DEC_PLURAL: árat
+  FORM:
+    VALIDATION_FAIL: <b>Sannvottun mistókst:</b>
+    INVALID_INPUT: Ógilt inntak í
+    MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:'
+  MONTHS_OF_THE_YEAR:
+    - 'janúar'
+    - 'Febrúar'
+    - 'Mars'
+    - 'Apríl'
+    - 'Maí'
+    - 'Júní'
+    - 'Júlí'
+    - 'Ágúst'
+    - 'September'
+    - 'Október'
+    - 'Nóvember'
+    - 'Desember'
+  DAYS_OF_THE_WEEK:
+    - 'Mánudagur'
+    - 'Þriðjudagur'
+    - 'Miðvikudagur'
+    - 'Fimmtudagur'
+    - 'Föstudagur'
+    - 'Laugardagur'
+    - 'Sunnudagur'
+  CRON:
+    TEXT_TIME: ' á <b />:<b />'
+    TEXT_DOW: ' á <b />'
+    TEXT_MONTH: ' af <b />'
+    TEXT_DOM: ' á <b />'
+    ERROR1: Merkið %s er ekki stutt!
+    ERROR3: Það ætti að setja jquery_element inn í stillingar jqCron
+    ERROR4: Óþekkt segð

system/languages/it.yaml

@@ -1,62 +1,101 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
+  INFLECTOR_UNCOUNTABLE:
+    - 'dotazione'
+    - 'informazione'
+    - 'riso'
+    - 'denaro'
+    - 'specie'
+    - 'serie'
+    - 'pesce'
+    - 'pecora'
+  INFLECTOR_IRREGULAR:
+    'person': 'persone'
+    'man': 'uomini'
+    'child': 'bambino'
+    'sex': 'sessi'
+    'move': 'sposta'
+  INFLECTOR_ORDINALS:
+    'default': '°'
+    'first': '°'
+    'second': 'o'
+    'third': 'o'
+  NICETIME:
+    NO_DATE_PROVIDED: Nessuna data fornita
+    BAD_DATE: Data non valida
+    AGO: fa
+    FROM_NOW: da adesso
+    JUST_NOW: ora
+    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'
+  CRON:
+    EVERY: ogni
+    EVERY_HOUR: ogni ora
+    EVERY_MINUTE: ogni minuto
+    EVERY_DAY_OF_WEEK: ogni giorno della settimana
+    EVERY_DAY_OF_MONTH: ogni giorno del mese
+    EVERY_MONTH: ogni mese
+    TEXT_PERIOD: Ogni <b />
+    TEXT_MINS: ' a <b /> minuto(i) dall''inizio dell''ora'
+    TEXT_TIME: ' alle <b />:<b />'
+    TEXT_DOW: ' su <b />'
+    TEXT_MONTH: ' di <b />'
+    TEXT_DOM: ' di <b />'
+    ERROR1: Il tag %s non è supportato!
+    ERROR2: Numero di elementi non valido
+    ERROR3: Il jquery_element deve essere impostato nelle impostazioni di jqCron
+    ERROR4: Espressione non riconosciuta

system/languages/ja.yaml

@@ -1,24 +1,15 @@
-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:
+---
+GRAV:
+  INFLECTOR_IRREGULAR:
     'person': 'みんな'
     'man': '人'
     'child': '子供'
     'sex': '性別'
     'move': '移動'
-    
-INFLECTOR_ORDINALS: []
-
-NICETIME:
+  NICETIME:
     NO_DATE_PROVIDED: 日付が設定されていません
     BAD_DATE: 不正な日付
     AGO: 前
-    FROM_NOW: from now
     SECOND: 秒
     MINUTE: 分
     HOUR: 時
@@ -30,11 +21,9 @@ NICETIME:
     SEC: 秒
     MIN: 分
     HR: 時
-    DAY: 日
     WK: 週
     MO: 月
     YR: 年
-    DEC: dec
     SECOND_PLURAL: 秒
     MINUTE_PLURAL: 分
     HOUR_PLURAL: 時
@@ -46,14 +35,32 @@ NICETIME:
     SEC_PLURAL: 秒
     MIN_PLURAL: 分
     HR_PLURAL: 時
-    DAY_PLURAL: 日
     WK_PLURAL: 週
     MO_PLURAL: 月
     YR_PLURAL: 年
     DEC_PLURAL: 10年
-FORM:
+  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: ['月', '火', '水', '木', '金', '土', '日']
+    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/ko.yaml

@@ -0,0 +1,63 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# 오류: 무효의 Frontmatter\n\n경로: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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/lt.yaml

@@ -1,69 +1,78 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Klaida: klaidinga įžanginė konfigūracija\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n %4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'information'
+    - 'ryžiai'
+    - 'pinigai'
+    - 'prieskoniai'
+    - 'serijos'
+    - 'žuvis'
+    - '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.
+    DEC: dešimtmetis
+    SECOND_PLURAL: sekundės
+    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.
+    DEC_PLURAL: dešimtmečiai
+  FORM:
+    VALIDATION_FAIL: <b>Patvirtinimas nepavyko:</b>
+    INVALID_INPUT: Neteisingai įvesta į
+    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

@@ -1,2 +1,4 @@
-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']
+---
+GRAV:
+  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

@@ -1,64 +1,144 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitel: %1$s\n---\n\n# Fout: ongeldige frontmatter\n\nPad: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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:
+    - 'uitrusting'
+    - 'informatie'
+    - 'rijst'
+    - 'geld'
+    - 'soorten'
+    - 'reeks'
+    - 'vis'
+    - 'schaap'
+  INFLECTOR_IRREGULAR:
+    'person': 'personen'
+    'man': 'mensen'
+    'child': 'kinderen'
+    'sex': 'geslacht'
+    'move': 'verplaatsen'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: geen datum opgegeven
+    BAD_DATE: Datumformaat onjuist
+    AGO: geleden
+    FROM_NOW: vanaf nu
+    JUST_NOW: zojuist
+    SECOND: seconde
+    MINUTE: minuut
+    HOUR: uur
+    DAY: dag
+    WEEK: week
+    MONTH: maand
+    YEAR: jaar
+    DECADE: decennium
+    SEC: s
+    MIN: min
+    HR: u
+    WK: week
+    MO: ma
+    YR: j
+    DEC: decennia
+    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
+    DEC_PLURAL: decennia
+  FORM:
+    VALIDATION_FAIL: <b>Validatie mislukt:</b>
+    INVALID_INPUT: Ongeldige invoer in
+    MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:'
+  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'
+  CRON:
+    EVERY: elke
+    EVERY_HOUR: elk uur
+    EVERY_MINUTE: elke minuut
+    EVERY_DAY_OF_WEEK: elke dag van de week
+    EVERY_DAY_OF_MONTH: elke dag van de maand
+    EVERY_MONTH: elke maand
+    TEXT_PERIOD: Elke <b />
+    TEXT_MINS: ' <b /> minuten te laat'
+    TEXT_TIME: ' op <b />:<b />'
+    TEXT_DOW: ' op <b />'
+    TEXT_MONTH: ' van <b />'
+    TEXT_DOM: ' op <b />'
+    ERROR1: De tag %s wordt niet ondersteund!
+    ERROR2: Slecht aantal elementen
+    ERROR3: Het jquery_element moet ingesteld worden in de jqCron instellingen
+    ERROR4: Onbekende expressie

system/languages/no.yaml

@@ -1,93 +1,77 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nTittel: %1$s\n---\n\n# Feilmelding: Ugyldig Frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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: Ugyldig 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
+    HR: t
+    WK: uke
+    MO: må
+    YR: år
+    DEC: tiår
+    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: md
+    YR_PLURAL: år
+    DEC_PLURAL: årtier
+  FORM:
+    VALIDATION_FAIL: <b>Godkjenning 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

@@ -1,75 +1,62 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Nieprawidłowy Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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
+    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

@@ -1,79 +1,46 @@
 ---
-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
+GRAV:
+  NICETIME:
+    NO_DATE_PROVIDED: Nenhuma data fornecida
+    AGO: atrás
+    SECOND: segundo
+    MINUTE: minuto
+    HOUR: hora
+    DAY: dia
+    WEEK: semana
+    MONTH: mês
+    YEAR: ano
+    DECADE: década
+    SEC: segundos
+    MIN: minutos
+    MINUTE_PLURAL: minutos
+    DAY_PLURAL: dias
+    WEEK_PLURAL: semanas
+    MONTH_PLURAL: meses
+    YEAR_PLURAL: anos
+    DECADE_PLURAL: decadas
+  FORM:
+    VALIDATION_FAIL: <b>Falha na validação!</b>
+    MISSING_REQUIRED_FIELD: 'Campo obrigatório requerido:'
+  MONTHS_OF_THE_YEAR:
+    - 'Janeiro'
+    - 'Fevereiro'
+    - 'Março'
+    - 'Abril'
+    - 'Maio'
+    - 'Junho'
+    - 'Julho'
+    - 'Agosto'
+    - 'Setembro'
+    - 'Outubro'
+    - 'Novembro'
+    - 'Dezembro'
+  INFLECTOR_UNCOUNTABLE:
+    - 'equipment'
+    - 'information'
+    - 'arroz'
+    - 'money'
+    - 'species'
+    - 'series'
+    - 'fish'
+    - 'sheep'

system/languages/ro.yaml

@@ -1,101 +1,96 @@
 ---
-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ă
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nTitlu: %1$s\n---\n# Eroare: Frontmatter este invalid\n\nCalea: `%2$s`\n\n**%3$s**\n\n```\n%4$s"
+  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
+    JUST_NOW: chiar acum
+    SECOND: secundă
+    MINUTE: minut
+    HOUR: oră
+    DAY: zi
+    WEEK: săptămână
+    MONTH: lună
+    YEAR: an
+    DECADE: decadă
+    SEC: secunde
+    MIN: minute
+    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ă'
+  CRON:
+    EVERY: la fiecare
+    EVERY_HOUR: la fiecare oră
+    EVERY_MINUTE: la fiecare minut
+    EVERY_DAY_OF_WEEK: fiecare zi a săptămânii
+    EVERY_DAY_OF_MONTH: fiecare zi a lunii
+    EVERY_MONTH: fiecare lună
+    TEXT_PERIOD: Fiecare <b />
+    TEXT_MINS: ' la <b /> minut(e) ale fiecărei ore'
+    TEXT_TIME: ' la <b />:<b />'
+    TEXT_DOW: ' pe <b />'
+    TEXT_MONTH: 'al(e) <b />'
+    TEXT_DOM: ' pe <b />'
+    ERROR1: Eticheta %s nu este acceptată!
+    ERROR2: Număr nevalid de elemente
+    ERROR3: jquery_element ar trebui setat în opțiunile jqCron
+    ERROR4: Expresie necunoscută

system/languages/ru.yaml

@@ -1,81 +1,101 @@
 ---
-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:
-  - Понедельник
-  - Вторник
-  - Среда
-  - Четверг
-  - Пятница
-  - Суббота
-  - Воскресенье
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Ошибка: недопустимое содержимое Frontmatter\n\nПуть: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'экипировка'
+    - 'информация'
+    - 'рис'
+    - 'деньги'
+    - 'виды'
+    - 'серии'
+    - 'рыба'
+    - 'овца'
+  INFLECTOR_IRREGULAR:
+    'person': 'люди'
+    'man': 'человек'
+    'child': 'ребенок'
+    'sex': 'пол'
+    'move': 'движется'
+  INFLECTOR_ORDINALS:
+    'default': 'й'
+    'first': 'й'
+    'second': 'й'
+    'third': 'й'
+  NICETIME:
+    NO_DATE_PROVIDED: Дата не указана
+    BAD_DATE: Неверная дата
+    AGO: назад
+    FROM_NOW: теперь
+    JUST_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:
+    - 'понедельник'
+    - 'вторник'
+    - 'среда'
+    - 'четверг'
+    - 'пятница'
+    - 'суббота'
+    - 'воскресенье'
+  CRON:
+    EVERY: раз в
+    EVERY_HOUR: раз в час
+    EVERY_MINUTE: раз в минуту
+    EVERY_DAY_OF_WEEK: каждый день недели
+    EVERY_DAY_OF_MONTH: каждый день недели
+    EVERY_MONTH: раз в месяц
+    TEXT_PERIOD: Каждый <b />
+    TEXT_MINS: ' в <b /> минуте(ах) за час'
+    TEXT_TIME: ' в <b />:<b />'
+    TEXT_DOW: ' на <b />'
+    TEXT_MONTH: ' из <b />'
+    TEXT_DOM: ' на <b />'
+    ERROR1: Тег %s не поддерживается!
+    ERROR2: Неверное количество элементов
+    ERROR3: jquery_element должен быть установлен в настройки jqCron
+    ERROR4: Выражение не распознано

system/languages/sk.yaml

@@ -1,42 +1,144 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Chyba: Chybný frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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:
+    - 'vybavenie'
+    - 'informácie'
+    - 'ryža'
+    - 'peniaze'
+    - 'druhy'
+    - 'séria'
+    - 'ryba'
+    - 'ovce'
+  INFLECTOR_IRREGULAR:
+    'person': 'ľudia'
+    'man': 'muži'
+    'child': 'deti'
+    'sex': 'pohlavia'
+    'move': 'pohyby'
+  INFLECTOR_ORDINALS:
+    'default': '.'
+    'first': '.'
+    'second': '.'
+    'third': '.'
+  NICETIME:
+    NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
+    BAD_DATE: Nesprávny dátum
+    AGO: pred
+    FROM_NOW: odteraz
+    JUST_NOW: práve teraz
+    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
+    WK: t
+    MO: m
+    YR: r
+    DEC: dec
+    SECOND_PLURAL: sekúnd
+    MINUTE_PLURAL: minút
+    HOUR_PLURAL: hodín
+    DAY_PLURAL: dní
+    WEEK_PLURAL: týždňov
+    MONTH_PLURAL: mesiacov
+    YEAR_PLURAL: rokov
+    DECADE_PLURAL: dekád
+    SEC_PLURAL: sek
+    MIN_PLURAL: min
+    HR_PLURAL: hod
+    WK_PLURAL: t
+    MO_PLURAL: mes.
+    YR_PLURAL: rokov
+    DEC_PLURAL: dekád
+  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'
+  CRON:
+    EVERY: každý
+    EVERY_HOUR: každú hodinu
+    EVERY_MINUTE: každú minútu
+    EVERY_DAY_OF_WEEK: každý deň v týždni
+    EVERY_DAY_OF_MONTH: každý deň v mesiaci
+    EVERY_MONTH: každý mesiac
+    TEXT_PERIOD: Každý <b />
+    TEXT_MINS: ' at <b /> minute(s) past the hour'
+    TEXT_TIME: ' at <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: Tag %s nieje podporovaný!
+    ERROR2: Chybný počet položiek
+    ERROR3: jquery_element musí byť nastavený v nastaveniach pre jqCron
+    ERROR4: Neznámy výraz

system/languages/sl.yaml

@@ -0,0 +1,62 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Napaka: Neveljavna Frontmatter\n\nPath: `%2$s`\n\n**%3$s ** \n\n```\n%4$s \n```"
+  NICETIME:
+    NO_DATE_PROVIDED: Datum ni na voljo
+    BAD_DATE: Neveljaven datum
+    AGO: pred
+    FROM_NOW: od zdaj
+    SECOND: sekunda
+    MINUTE: minuta
+    HOUR: ura
+    DAY: dan
+    WEEK: teden
+    MONTH: mesec
+    YEAR: leto
+    DECADE: desetletje
+    SEC: sek
+    HR: ur
+    WK: T.
+    MO: m
+    YR: l
+    DEC: des
+    SECOND_PLURAL: sekund
+    MINUTE_PLURAL: minut
+    HOUR_PLURAL: ure
+    DAY_PLURAL: dnevi
+    WEEK_PLURAL: tednov
+    MONTH_PLURAL: mesecev
+    YEAR_PLURAL: leta
+    DECADE_PLURAL: desetletja
+    SEC_PLURAL: s
+    MIN_PLURAL: min
+    HR_PLURAL: ur
+    WK_PLURAL: t
+    MO_PLURAL: m
+    YR_PLURAL: l
+    DEC_PLURAL: des
+  FORM:
+    VALIDATION_FAIL: <b>Preverjanje veljavnosti ni uspelo:</b>
+    INVALID_INPUT: Neveljaven vnos v
+    MISSING_REQUIRED_FIELD: 'Manjka obvezno polje:'
+  MONTHS_OF_THE_YEAR:
+    - 'Januar'
+    - 'Februar'
+    - 'Marec'
+    - 'April'
+    - 'Maj'
+    - 'Junij'
+    - 'Julij'
+    - 'Avgust'
+    - 'September'
+    - 'Oktober'
+    - 'November'
+    - 'December'
+  DAYS_OF_THE_WEEK:
+    - 'Ponedeljek'
+    - 'Torek'
+    - 'Sreda'
+    - 'Četrtek'
+    - 'Petek'
+    - 'Sobota'
+    - 'Nedelja'

system/languages/sv.yaml

@@ -1,62 +1,72 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```"
+  INFLECTOR_UNCOUNTABLE:
+    - 'utrustning'
+    - 'information'
+    - 'ris'
+    - 'pengar'
+    - 'arter'
+    - 'serier'
+    - 'fisk'
+    - 'får'
+  INFLECTOR_IRREGULAR:
+    'person': 'personer'
+  NICETIME:
+    NO_DATE_PROVIDED: Inget datum har angivits
+    BAD_DATE: Ogiltigt datum
+    AGO: sedan
+    FROM_NOW: fr.o.m nu
+    SECOND: sekund
+    MINUTE: minut
+    HOUR: timme
+    DAY: dag
+    WEEK: vecka
+    MONTH: månad
+    YEAR: år
+    DECADE: årtionde
+    SEC: sek
+    HR: t
+    WK: v
+    MO: m
+    YR: år
+    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'
+    - 'Februari'
+    - '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

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

system/languages/tr.yaml

@@ -1,59 +1,63 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\nBaşlık: %1$s\n---\n\n# Hata: Geçersiz Önbölüm\n\nYol: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  NICETIME:
+    NO_DATE_PROVIDED: Sağlanan tarih yok
+    BAD_DATE: Yanlış tarih
+    AGO: önce
+    FROM_NOW: şu andan itibaren
+    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: yıl
+    DEC_PLURAL: onyl
+  FORM:
+    VALIDATION_FAIL: <b>Doğrulama başarısız:</b>
+    INVALID_INPUT: Geçersiz bilgi girişi
+    MISSING_REQUIRED_FIELD: 'Gerekli alan eksik:'
+  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

@@ -1,75 +1,63 @@
 ---
-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:
-  - Понеділок
-  - Вівторок
-  - Середа
-  - Четвер
-  - "П'ятниця"
-  - Субота
-  - Неділя
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Помилка: Недопустимий вміст\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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

@@ -1,75 +1,63 @@
 ---
-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
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntiêu đề: %1$s\n---\n\n# Error: Trang không hợp lệ\n\nĐường dẫn: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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 11'
+    - 'Tháng 12'
+  DAYS_OF_THE_WEEK:
+    - 'Thứ 2'
+    - 'Thứ 3'
+    - 'Thứ 4'
+    - 'Thứ 5'
+    - 'Thứ 6'
+    - 'Thứ 7'
+    - 'Chủ Nhật'

system/languages/zh-tw.yaml

@@ -0,0 +1,62 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# 錯誤： 不正確的 Frontmatter\n\n路徑： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  NICETIME:
+    NO_DATE_PROVIDED: 沒有提供日期
+    BAD_DATE: 錯誤日期
+    AGO: 之前
+    FROM_NOW: 之後
+    JUST_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:
+    MISSING_REQUIRED_FIELD: 遺漏必填欄位：
+  MONTHS_OF_THE_YEAR:
+    - '一月'
+    - '二月'
+    - '三月'
+    - '四月'
+    - '五月'
+    - '六月'
+    - '七月'
+    - '八月'
+    - '九月'
+    - '十月'
+    - '十一月'
+    - '十二月'
+  DAYS_OF_THE_WEEK:
+    - '星期一'
+    - '星期二'
+    - '星期三'
+    - '星期四'
+    - '星期五'
+    - '星期六'
+    - '星期日'

system/languages/zh.yaml

@@ -0,0 +1,144 @@
+---
+GRAV:
+  FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误：无效参数\n\n位置： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+  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:
+    - '装备'
+    - '信息'
+    - '大米'
+    - '钱'
+    - '物种'
+    - '系列'
+    - '鱼'
+    - '羊'
+  INFLECTOR_IRREGULAR:
+    'person': '人员'
+    'man': '男人'
+    'child': '儿童'
+    'sex': '性别'
+    'move': '移动'
+  INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'md'
+    'third': 'rd'
+  NICETIME:
+    NO_DATE_PROVIDED: 无日期信息
+    BAD_DATE: 无效日期
+    AGO: 前
+    FROM_NOW: 距今
+    JUST_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:
+    - '1月'
+    - '2月'
+    - '3月'
+    - '4月'
+    - '5月'
+    - '6月'
+    - '7月'
+    - '8月'
+    - '9月'
+    - '10月'
+    - '11月'
+    - '12月'
+  DAYS_OF_THE_WEEK:
+    - '星期一'
+    - '星期二'
+    - '星期三'
+    - '星期四'
+    - '星期五'
+    - '星期六'
+    - '星期日'
+  CRON:
+    EVERY: 每隔
+    EVERY_HOUR: 每小时
+    EVERY_MINUTE: 每分钟
+    EVERY_DAY_OF_WEEK: 一周中的每一天
+    EVERY_DAY_OF_MONTH: 月份中的每一天
+    EVERY_MONTH: 每月
+    TEXT_PERIOD: 所有 <b />
+    TEXT_MINS: ' 在 <b /> 小时过后的分钟'
+    TEXT_TIME: ' 在 <b />:<b />'
+    TEXT_DOW: ' on <b />'
+    TEXT_MONTH: ' of <b />'
+    TEXT_DOM: ' on <b />'
+    ERROR1: 不支持分享类型 %s
+    ERROR2: 无效数字
+    ERROR3: 请在 jqCron 设置中设定 jquery_element
+    ERROR4: 无法识别表达式

system/router.php

@@ -1,13 +1,14 @@
 <?php
+
 /**
- * @package    Grav.Core
+ * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, 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.');
+    die('This script cannot be run from browser. Run it from a CLI.');
 }
 
 $_SERVER['PHP_CLI_ROUTER'] = true;
@@ -16,11 +17,21 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N
     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';
+$grav_index = 'index.php';
 
-require 'index.php';
+/* Check the GRAV_BASEDIR environment variable and use if set */
+$grav_basedir = getenv('GRAV_BASEDIR') ?: '';
+if ($grav_basedir) {
+    $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index;
+    $grav_basedir = DIRECTORY_SEPARATOR . trim($grav_basedir, DIRECTORY_SEPARATOR);
+    define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . $grav_basedir);
+}
+
+$_SERVER = array_merge($_SERVER, $_ENV);
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . $grav_basedir .DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_NAME'] = $grav_basedir . DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['PHP_SELF'] = $grav_basedir . DIRECTORY_SEPARATOR . 'index.php';
 
 error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);
+
+require $grav_index;

system/src/Grav/Common/Assets/BaseAsset.php

@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Assets\Traits\AssetUtilsTrait;
+use Grav\Common\Grav;
+use Grav\Common\Uri;
+use Grav\Common\Utils;
+use Grav\Framework\Object\PropertyObject;
+
+abstract class BaseAsset extends PropertyObject
+{
+    use AssetUtilsTrait;
+
+    protected const CSS_ASSET = true;
+    protected const JS_ASSET = false;
+
+    /** @const Regex to match CSS import content */
+    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
+
+    protected $asset;
+
+    protected $asset_type;
+    protected $order;
+    protected $group;
+    protected $position;
+    protected $priority;
+    protected $attributes = [];
+
+
+    protected $timestamp;
+    protected $modified;
+    protected $remote;
+    protected $query = '';
+
+    // Private Bits
+    private $base_url;
+    private $fetch_command;
+    private $css_rewrite = false;
+    private $css_minify = false;
+
+    abstract function render();
+
+    public function __construct(array $elements = [], $key = null)
+    {
+        $base_config = [
+            'group' => 'head',
+            'position' => 'pipeline',
+            'priority' => 10,
+            'modified' => null,
+            'asset' => null
+        ];
+
+        // Merge base defaults
+        $elements = array_merge($base_config, $elements);
+
+        parent::__construct($elements, $key);
+    }
+
+    public function init($asset, $options)
+    {
+        $config = Grav::instance()['config'];
+        $uri = Grav::instance()['uri'];
+
+        // set attributes
+        foreach ($options as $key => $value) {
+            if ($this->hasProperty($key)) {
+                $this->setProperty($key, $value);
+            } else {
+                $this->attributes[$key] = $value;
+            }
+        }
+
+        // Force priority to be an int
+        $this->priority = (int) $this->priority;
+
+        // Do some special stuff for CSS/JS (not inline)
+        if (!Utils::startsWith($this->getType(), 'inline')) {
+            $this->base_url = rtrim($uri->rootUrl($config->get('system.absolute_urls')), '/') . '/';
+            $this->remote = static::isRemoteLink($asset);
+
+            // Move this to render?
+            if (!$this->remote) {
+
+                $asset_parts = parse_url($asset);
+                if (isset($asset_parts['query'])) {
+                    $this->query = $asset_parts['query'];
+                    unset($asset_parts['query']);
+                    $asset = Uri::buildUrl($asset_parts);
+                }
+
+                $locator = Grav::instance()['locator'];
+
+                if ($locator->isStream($asset)) {
+                    $path = $locator->findResource($asset, true);
+                } else {
+                    $path = GRAV_ROOT . $asset;
+                }
+
+                // If local file is missing return
+                if ($path === false) {
+                    return false;
+                }
+
+                $file = new \SplFileInfo($path);
+
+                $asset = $this->buildLocalLink($file->getPathname());
+
+                $this->modified = $file->isFile() ? $file->getMTime() : false;
+            }
+        }
+
+        $this->asset = $asset;
+
+        return $this;
+    }
+
+    public function getAsset()
+    {
+        return $this->asset;
+    }
+
+    public function getRemote()
+    {
+        return $this->remote;
+    }
+
+    public function setPosition($position)
+    {
+        $this->position = $position;
+        return $this;
+    }
+
+
+    /**
+     *
+     * Get the last modification time of asset
+     *
+     * @param  string $asset    the asset string reference
+     *
+     * @return string           the last modifcation time or false on error
+     */
+//    protected function getLastModificationTime($asset)
+//    {
+//        $file = GRAV_ROOT . $asset;
+//        if (Grav::instance()['locator']->isStream($asset)) {
+//            $file = $this->buildLocalLink($asset, true);
+//        }
+//
+//        return file_exists($file) ? filemtime($file) : false;
+//    }
+
+    /**
+     *
+     * Build local links including grav asset shortcodes
+     *
+     * @param  string $asset    the asset string reference
+     *
+     * @return string           the final link url to the asset
+     */
+    protected function buildLocalLink($asset)
+    {
+        if ($asset) {
+            return $this->base_url . ltrim(Utils::replaceFirstOccurrence(GRAV_ROOT, '', $asset), '/');
+        }
+        return false;
+    }
+
+
+    /**
+     * Implements JsonSerializable interface.
+     *
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return ['type' => $this->getType(), 'elements' => $this->getElements()];
+    }
+
+    /**
+     * Placeholder for AssetUtilsTrait method
+     *
+     * @param string $file
+     * @param string $dir
+     * @param bool $local
+     */
+    protected function cssRewrite($file, $dir, $local)
+    {
+        return;
+    }
+}

system/src/Grav/Common/Assets/Css.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+class Css extends BaseAsset
+{
+    public function __construct(array $elements = [], $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'css',
+            'attributes' => [
+                'type' => 'text/css',
+                'rel' => 'stylesheet'
+            ]
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    public function render()
+    {
+        if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
+            $buffer = $this->gatherLinks( [$this], self::CSS_ASSET);
+            return "<style>\n" . trim($buffer) . "\n</style>\n";
+        }
+
+        return '<link href="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+    }
+}

system/src/Grav/Common/Assets/InlineCss.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+class InlineCss extends BaseAsset
+{
+    public function __construct(array $elements = [], $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'css',
+            'position' => 'after'
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    public function render()
+    {
+        return '<style' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</style>\n";
+    }
+}

system/src/Grav/Common/Assets/InlineJs.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+class InlineJs extends BaseAsset
+{
+    public function __construct(array $elements = [], $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'js',
+            'position' => 'after'
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    public function render()
+    {
+        return '<script' . $this->renderAttributes(). ">\n" . trim($this->asset) . "\n</script>\n";
+    }
+}

system/src/Grav/Common/Assets/Js.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Utils;
+
+class Js extends BaseAsset
+{
+    public function __construct(array $elements = [], $key = null)
+    {
+        $base_options = [
+            'asset_type' => 'js',
+        ];
+
+        $merged_attributes = Utils::arrayMergeRecursiveUnique($base_options, $elements);
+
+        parent::__construct($merged_attributes, $key);
+    }
+
+    public function render()
+    {
+        if (isset($this->attributes['loading']) && $this->attributes['loading'] === 'inline') {
+            $buffer = $this->gatherLinks( [$this], self::JS_ASSET);
+            return '<script' . $this->renderAttributes() . ">\n" . trim($buffer) . "\n</script>\n";
+        }
+
+        return '<script src="' . trim($this->asset) . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+    }
+}

system/src/Grav/Common/Assets/Pipeline.php

@@ -0,0 +1,273 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets;
+
+use Grav\Common\Assets\Traits\AssetUtilsTrait;
+use Grav\Common\Config\Config;
+use Grav\Common\Grav;
+use Grav\Common\Uri;
+use Grav\Common\Utils;
+use Grav\Framework\Object\PropertyObject;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+class Pipeline extends PropertyObject
+{
+    use AssetUtilsTrait;
+
+    protected const CSS_ASSET = true;
+    protected const JS_ASSET = false;
+
+    /** @const Regex to match CSS urls */
+    protected const CSS_URL_REGEX = '{url\(([\'\"]?)(.*?)\1\)}';
+
+    /** @const Regex to match CSS sourcemap comments */
+    protected const CSS_SOURCEMAP_REGEX = '{\/\*# (.*?) \*\/}';
+
+    /** @const Regex to match CSS import content */
+    protected const CSS_IMPORT_REGEX = '{@import(.*?);}';
+
+    protected const FIRST_FORWARDSLASH_REGEX = '{^\/{1}\w}';
+
+    protected $css_minify;
+    protected $css_minify_windows;
+    protected $css_rewrite;
+
+    protected $js_minify;
+    protected $js_minify_windows;
+
+    protected $base_url;
+    protected $assets_dir;
+    protected $assets_url;
+    protected $timestamp;
+    protected $attributes;
+    protected $query;
+    protected $asset;
+
+    /**
+     * Closure used by the pipeline to fetch assets.
+     *
+     * Useful when file_get_contents() function is not available in your PHP
+     * installation or when you want to apply any kind of preprocessing to
+     * your assets before they get pipelined.
+     *
+     * The closure will receive as the only parameter a string with the path/URL of the asset and
+     * it should return the content of the asset file as a string.
+     *
+     * @var \Closure
+     */
+    protected $fetch_command;
+
+    public function __construct(array $elements = [], ?string $key = null)
+    {
+        parent::__construct($elements, $key);
+
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        /** @var Config $config */
+        $config = Grav::instance()['config'];
+
+        /** @var Uri $uri */
+        $uri = Grav::instance()['uri'];
+
+        $this->base_url = rtrim($uri->rootUrl($config->get('system.absolute_urls')), '/') . '/';
+        $this->assets_dir = $locator->findResource('asset://') . DS;
+        $this->assets_url = $locator->findResource('asset://', false);
+    }
+
+    /**
+     * Minify and concatenate CSS
+     *
+     * @param array $assets
+     * @param string $group
+     * @param array $attributes
+     *
+     * @return bool|string     URL or generated content if available, else false
+     */
+    public function renderCss($assets, $group, $attributes = [])
+    {
+        // temporary list of assets to pipeline
+        $inline_group = false;
+
+        if (array_key_exists('loading', $attributes) && $attributes['loading'] === 'inline') {
+            $inline_group = true;
+            unset($attributes['loading']);
+        }
+
+        // Store Attributes
+        $this->attributes = array_merge(['type' => 'text/css', 'rel' => 'stylesheet'], $attributes);
+
+        // Compute uid based on assets and timestamp
+        $json_assets = json_encode($assets);
+        $uid = md5($json_assets . $this->css_minify . $this->css_rewrite . $group);
+        $file = $uid . '.css';
+        $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
+
+        $buffer = null;
+
+        if (file_exists($this->assets_dir . $file)) {
+            $buffer = file_get_contents($this->assets_dir . $file) . "\n";
+        } else {
+            //if nothing found get out of here!
+            if (empty($assets)) {
+                return false;
+            }
+
+            // Concatenate files
+            $buffer = $this->gatherLinks($assets, self::CSS_ASSET);
+
+            // Minify if required
+            if ($this->shouldMinify('css')) {
+                $minifier = new \MatthiasMullie\Minify\CSS();
+                $minifier->add($buffer);
+                $buffer = $minifier->minify();
+            }
+
+            // Write file
+            if (trim($buffer) !== '') {
+                file_put_contents($this->assets_dir . $file, $buffer);
+            }
+        }
+
+        if ($inline_group) {
+            $output = "<style>\n" . $buffer . "\n</style>\n";
+        } else {
+            $this->asset = $relative_path;
+            $output = '<link href="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . ">\n";
+        }
+
+        return $output;
+    }
+
+    /**
+     * Minify and concatenate JS files.
+     *
+     * @param array $assets
+     * @param string $group
+     * @param array $attributes
+     *
+     * @return bool|string     URL or generated content if available, else false
+     */
+    public function renderJs($assets, $group, $attributes = [])
+    {
+        // temporary list of assets to pipeline
+        $inline_group = false;
+
+        if (array_key_exists('loading', $attributes) && $attributes['loading'] === 'inline') {
+            $inline_group = true;
+            unset($attributes['loading']);
+        }
+
+        // Store Attributes
+        $this->attributes = $attributes;
+
+        // Compute uid based on assets and timestamp
+        $json_assets = json_encode($assets);
+        $uid = md5($json_assets . $this->js_minify . $group);
+        $file = $uid . '.js';
+        $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
+
+        $buffer = null;
+
+        if (file_exists($this->assets_dir . $file)) {
+            $buffer = file_get_contents($this->assets_dir . $file) . "\n";
+        } else {
+            //if nothing found get out of here!
+            if (empty($assets)) {
+                return false;
+            }
+
+            // Concatenate files
+            $buffer = $this->gatherLinks($assets, self::JS_ASSET);
+
+            // Minify if required
+            if ($this->shouldMinify('js')) {
+                $minifier = new \MatthiasMullie\Minify\JS();
+                $minifier->add($buffer);
+                $buffer = $minifier->minify();
+            }
+
+            // Write file
+            if (trim($buffer) !== '') {
+                file_put_contents($this->assets_dir . $file, $buffer);
+            }
+        }
+
+        if ($inline_group) {
+            $output = '<script' . $this->renderAttributes(). ">\n" . $buffer . "\n</script>\n";
+        } else {
+            $this->asset = $relative_path;
+            $output = '<script src="' . $relative_path . $this->renderQueryString() . '"' . $this->renderAttributes() . "></script>\n";
+        }
+
+        return $output;
+    }
+
+
+    /**
+     * Finds relative CSS urls() and rewrites the URL with an absolute one
+     *
+     * @param string $file the css source file
+     * @param string $dir , $local relative path to the css file
+     * @param bool $local is this a local or remote asset
+     *
+     * @return mixed
+     */
+    protected function cssRewrite($file, $dir, $local)
+    {
+        // Strip any sourcemap comments
+        $file = preg_replace(self::CSS_SOURCEMAP_REGEX, '', $file);
+
+        // Find any css url() elements, grab the URLs and calculate an absolute path
+        // Then replace the old url with the new one
+        $file = (string)preg_replace_callback(self::CSS_URL_REGEX, function ($matches) use ($dir, $local) {
+
+            $old_url = $matches[2];
+
+            // Ensure link is not rooted to web server, a data URL, or to a remote host
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url) || Utils::startsWith($old_url, 'data:') || $this->isRemoteLink($old_url)) {
+                return $matches[0];
+            }
+
+            // clean leading /
+            $old_url = Utils::normalizePath($dir . '/' . $old_url);
+            if (preg_match(self::FIRST_FORWARDSLASH_REGEX, $old_url)) {
+                $old_url = ltrim($old_url, '/');
+            }
+
+            $new_url = ($local ? $this->base_url: '') . $old_url;
+
+            $fixed = str_replace($matches[2], $new_url, $matches[0]);
+
+            return $fixed;
+        }, $file);
+
+        return $file;
+    }
+
+
+
+    private function shouldMinify($type = 'css')
+    {
+        $check = $type . '_minify';
+        $win_check = $type . '_minify_windows';
+
+        $minify = (bool) $this->$check;
+
+        // If this is a Windows server, and minify_windows is false (default value) skip the
+        // minification process because it will cause Apache to die/crash due to insufficient
+        // ThreadStackSize in httpd.conf - See: https://bugs.php.net/bug.php?id=47689
+        if (stripos(php_uname('s'), 'WIN') === 0 && !$this->{$win_check}) {
+            $minify = false;
+        }
+
+        return $minify;
+    }
+}

system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php

@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets\Traits
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets\Traits;
+
+use Grav\Common\Grav;
+use Grav\Common\Utils;
+
+trait AssetUtilsTrait
+{
+    /**
+     * Determine whether a link is local or remote.
+     * Understands both "http://" and "https://" as well as protocol agnostic links "//"
+     *
+     * @param  string $link
+     * @return bool
+     */
+    public static function isRemoteLink($link)
+    {
+        $base = Grav::instance()['uri']->rootUrl(true);
+
+        // Sanity check for local URLs with absolute URL's enabled
+        if (Utils::startsWith($link, $base)) {
+            return false;
+        }
+
+        return (0 === strpos($link, 'http://') || 0 === strpos($link, 'https://') || 0 === strpos($link, '//'));
+    }
+
+    /**
+     * Download and concatenate the content of several links.
+     *
+     * @param  array $assets
+     * @param  bool $css
+     *
+     * @return string
+     */
+    protected function gatherLinks(array $assets, $css = true)
+    {
+        $buffer = '';
+
+
+        foreach ($assets as $id => $asset) {
+            $local = true;
+
+            $link = $asset->getAsset();
+            $relative_path = $link;
+
+            if (static::isRemoteLink($link)) {
+                $local = false;
+                if (0 === strpos($link, '//')) {
+                    $link = 'http:' . $link;
+                }
+                $relative_dir = \dirname($relative_path);
+            } else {
+                // Fix to remove relative dir if grav is in one
+                if (($this->base_url !== '/') && Utils::startsWith($relative_path, $this->base_url)) {
+                    $base_url = '#' . preg_quote($this->base_url, '#') . '#';
+                    $relative_path = ltrim(preg_replace($base_url, '/', $link, 1), '/');
+                }
+
+                $relative_dir = \dirname($relative_path);
+                $link = ROOT_DIR . $relative_path;
+            }
+
+            $file = ($this->fetch_command instanceof \Closure) ? @$this->fetch_command->__invoke($link) : @file_get_contents($link);
+
+            // No file found, skip it...
+            if ($file === false) {
+                continue;
+            }
+
+            // Double check last character being
+            if (!$css) {
+                $file = rtrim($file, ' ;') . ';';
+            }
+
+            // If this is CSS + the file is local + rewrite enabled
+            if ($css && $this->css_rewrite) {
+                $file = $this->cssRewrite($file, $relative_dir, $local);
+            }
+
+            $file = rtrim($file) . PHP_EOL;
+            $buffer .= $file;
+        }
+
+        // Pull out @imports and move to top
+        if ($css) {
+            $buffer = $this->moveImports($buffer);
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * Moves @import statements to the top of the file per the CSS specification
+     *
+     * @param  string $file the file containing the combined CSS files
+     *
+     * @return string       the modified file with any @imports at the top of the file
+     */
+    protected function moveImports($file)
+    {
+        $imports = [];
+
+        $file = (string)preg_replace_callback(self::CSS_IMPORT_REGEX, function ($matches) use (&$imports) {
+            $imports[] = $matches[0];
+
+            return '';
+        }, $file);
+
+        return implode("\n", $imports) . "\n\n" . $file;
+    }
+
+    /**
+     *
+     * Build an HTML attribute string from an array.
+     *
+     * @return string
+     */
+    protected function renderAttributes()
+    {
+        $html = '';
+        $no_key = ['loading'];
+
+        foreach ($this->attributes as $key => $value) {
+            if (is_numeric($key)) {
+                $key = $value;
+            }
+            if (\is_array($value)) {
+                $value = implode(' ', $value);
+            }
+
+            if (\in_array($key, $no_key, true)) {
+                $element = htmlentities($value, ENT_QUOTES, 'UTF-8', false);
+            } else {
+                $element = $key . '="' . htmlentities($value, ENT_QUOTES, 'UTF-8', false) . '"';
+            }
+
+            $html .= ' ' . $element;
+        }
+
+        return $html;
+    }
+
+    /**
+     * Render Querystring
+     *
+     * @param string $asset
+     * @return string
+     */
+    protected function renderQueryString($asset = null)
+    {
+        $querystring = '';
+
+        $asset = $asset ?? $this->asset;
+
+        if (!empty($this->query)) {
+            if (Utils::contains($asset, '?')) {
+                $querystring .=  '&' . $this->query;
+            } else {
+                $querystring .= '?' . $this->query;
+            }
+        }
+
+        if ($this->timestamp) {
+            if (Utils::contains($asset, '?') || $querystring) {
+                $querystring .=  '&' . $this->timestamp;
+            } else {
+                $querystring .= '?' . $this->timestamp;
+            }
+        }
+
+        return $querystring;
+    }
+}

system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php

@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets\Traits
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets\Traits;
+
+use Grav\Common\Assets;
+
+trait LegacyAssetsTrait
+{
+
+    /**
+     * @param array $args
+     * @param string $type
+     * @return array
+     */
+    protected function unifyLegacyArguments($args, $type = Assets::CSS_TYPE)
+    {
+        // First argument is always the asset
+        array_shift($args);
+
+        if (count($args) === 0) {
+            return [];
+        }
+        // New options array format
+        if (count($args) === 1 && is_array($args[0])) {
+            return $args[0];
+        }
+        // Handle obscure case where options array is mixed with a priority
+        if (count($args) === 2 && is_array($args[0]) && is_int($args[1])) {
+            $arguments = $args[0];
+            $arguments['priority'] = $args[1];
+            return $arguments;
+        }
+
+        switch ($type) {
+            case(Assets::JS_TYPE):
+                $defaults = ['priority' => null, 'pipeline' => true, 'loading' => null, 'group' => null];
+                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
+                break;
+
+            case(Assets::INLINE_JS_TYPE):
+                $defaults = ['priority' => null, 'group' => null, 'attributes' => null];
+                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
+
+                // special case to handle old attributes being passed in
+                if (isset($arguments['attributes'])) {
+                    $old_attributes = $arguments['attributes'];
+                    if (is_array($old_attributes)) {
+                        $arguments = array_merge($arguments, $old_attributes);
+                    } else {
+                        $arguments['type'] = $old_attributes;
+                    }
+                }
+                unset($arguments['attributes']);
+
+                break;
+
+            case(Assets::INLINE_CSS_TYPE):
+                $defaults = ['priority' => null, 'group' => null];
+                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
+                break;
+
+            default:
+            case(Assets::CSS_TYPE):
+                $defaults = ['priority' => null, 'pipeline' => true, 'group' => null, 'loading' => null];
+                $arguments = $this->createArgumentsFromLegacy($args, $defaults);
+        }
+
+        return $arguments;
+    }
+
+    protected function createArgumentsFromLegacy(array $args, array $defaults)
+    {
+        // Remove arguments with old default values.
+        $arguments = [];
+        foreach ($args as $arg) {
+            $default = current($defaults);
+            if ($arg !== $default) {
+                $arguments[key($defaults)] = $arg;
+            }
+            next($defaults);
+        }
+
+        return $arguments;
+    }
+
+    /**
+     * Convenience wrapper for async loading of JavaScript
+     *
+     * @param string|array  $asset
+     * @param int           $priority
+     * @param bool          $pipeline
+     * @param string        $group name of the group
+     *
+     * @return \Grav\Common\Assets
+     * @deprecated Please use dynamic method with ['loading' => 'async'].
+     */
+    public function addAsyncJs($asset, $priority = 10, $pipeline = true, $group = 'head')
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use dynamic method with [\'loading\' => \'async\']', E_USER_DEPRECATED);
+
+        return $this->addJs($asset, $priority, $pipeline, 'async', $group);
+    }
+
+    /**
+     * Convenience wrapper for deferred loading of JavaScript
+     *
+     * @param string|array  $asset
+     * @param int           $priority
+     * @param bool          $pipeline
+     * @param string        $group name of the group
+     *
+     * @return \Grav\Common\Assets
+     * @deprecated Please use dynamic method with ['loading' => 'defer'].
+     */
+    public function addDeferJs($asset, $priority = 10, $pipeline = true, $group = 'head')
+    {
+        user_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated since Grav 1.6, use dynamic method with [\'loading\' => \'defer\']', E_USER_DEPRECATED);
+
+        return $this->addJs($asset, $priority, $pipeline, 'defer', $group);
+    }
+
+}

system/src/Grav/Common/Assets/Traits/TestingAssetsTrait.php

@@ -0,0 +1,343 @@
+<?php
+
+/**
+ * @package    Grav\Common\Assets\Traits
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Assets\Traits;
+
+use Grav\Common\Grav;
+
+trait TestingAssetsTrait
+{
+    /**
+     * Determines if an asset exists as a collection, CSS or JS reference
+     *
+     * @param string $asset
+     *
+     * @return bool
+     */
+    public function exists($asset)
+    {
+        return isset($this->collections[$asset]) || isset($this->assets_css[$asset]) || isset($this->assets_js[$asset]);
+    }
+
+    /**
+     * Return the array of all the registered collections
+     *
+     * @return array
+     */
+    public function getCollections()
+    {
+        return $this->collections;
+    }
+
+    /**
+     * Set the array of collections explicitly
+     *
+     * @param array $collections
+     *
+     * @return $this
+     */
+    public function setCollection($collections)
+    {
+        $this->collections = $collections;
+
+        return $this;
+    }
+
+    /**
+     * Return the array of all the registered CSS assets
+     * If a $key is provided, it will try to return only that asset
+     * else it will return null
+     *
+     * @param null|string $key the asset key
+     * @return array
+     */
+    public function getCss($key = null)
+    {
+        if (null !== $key) {
+            $asset_key = md5($key);
+
+            return $this->assets_css[$asset_key] ?? null;
+        }
+
+        return $this->assets_css;
+    }
+
+    /**
+     * Return the array of all the registered JS assets
+     * If a $key is provided, it will try to return only that asset
+     * else it will return null
+     *
+     * @param null|string $key the asset key
+     * @return array
+     */
+    public function getJs($key = null)
+    {
+        if (null !== $key) {
+            $asset_key = md5($key);
+
+            return $this->assets_js[$asset_key] ?? null;
+        }
+
+        return $this->assets_js;
+    }
+
+    /**
+     * Set the whole array of CSS assets
+     *
+     * @param array $css
+     *
+     * @return $this
+     */
+    public function setCss($css)
+    {
+        $this->assets_css = $css;
+
+        return $this;
+    }
+
+    /**
+     * Set the whole array of JS assets
+     *
+     * @param array $js
+     *
+     * @return $this
+     */
+    public function setJs($js)
+    {
+        $this->assets_js = $js;
+
+        return $this;
+    }
+
+    /**
+     * Removes an item from the CSS array if set
+     *
+     * @param string $key  The asset key
+     *
+     * @return $this
+     */
+    public function removeCss($key)
+    {
+        $asset_key = md5($key);
+        if (isset($this->assets_css[$asset_key])) {
+            unset($this->assets_css[$asset_key]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes an item from the JS array if set
+     *
+     * @param string $key  The asset key
+     *
+     * @return $this
+     */
+    public function removeJs($key)
+    {
+        $asset_key = md5($key);
+        if (isset($this->assets_js[$asset_key])) {
+            unset($this->assets_js[$asset_key]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets the state of CSS Pipeline
+     *
+     * @param bool $value
+     *
+     * @return $this
+     */
+    public function setCssPipeline($value)
+    {
+        $this->css_pipeline = (bool)$value;
+
+        return $this;
+    }
+
+    /**
+     * Sets the state of JS Pipeline
+     *
+     * @param bool $value
+     *
+     * @return $this
+     */
+    public function setJsPipeline($value)
+    {
+        $this->js_pipeline = (bool)$value;
+
+        return $this;
+    }
+
+    /**
+     * Reset all assets.
+     *
+     * @return $this
+     */
+    public function reset()
+    {
+        $this->resetCss();
+        $this->resetJs();
+        $this->setCssPipeline(false);
+        $this->setJsPipeline(false);
+
+        return $this;
+    }
+
+    /**
+     * Reset JavaScript assets.
+     *
+     * @return $this
+     */
+    public function resetJs()
+    {
+        $this->assets_js = [];
+
+        return $this;
+    }
+
+    /**
+     * Reset CSS assets.
+     *
+     * @return $this
+     */
+    public function resetCss()
+    {
+        $this->assets_css = [];
+
+        return $this;
+    }
+
+    /**
+     * Explicitly set's a timestamp for assets
+     *
+     * @param string|int $value
+     */
+    public function setTimestamp($value)
+    {
+        $this->timestamp = $value;
+    }
+
+    /**
+     * Get the timestamp for assets
+     *
+     * @param  bool  $include_join
+     * @return string
+     */
+    public function getTimestamp($include_join = true)
+    {
+        if ($this->timestamp) {
+            return $include_join ? '?' . $this->timestamp : $this->timestamp;
+        }
+
+        return null;
+    }
+
+    /**
+     * Add all assets matching $pattern within $directory.
+     *
+     * @param  string $directory Relative to the Grav root path, or a stream identifier
+     * @param  string $pattern   (regex)
+     *
+     * @return $this
+     */
+    public function addDir($directory, $pattern = self::DEFAULT_REGEX)
+    {
+        $root_dir = rtrim(ROOT_DIR, '/');
+
+        // Check if $directory is a stream.
+        if (strpos($directory, '://')) {
+            $directory = Grav::instance()['locator']->findResource($directory, null);
+        }
+
+        // Get files
+        $files = $this->rglob($root_dir . DIRECTORY_SEPARATOR . $directory, $pattern, $root_dir . '/');
+
+        // No luck? Nothing to do
+        if (!$files) {
+            return $this;
+        }
+
+        // Add CSS files
+        if ($pattern === self::CSS_REGEX) {
+            foreach ($files as $file) {
+                $this->addCss($file);
+            }
+
+            return $this;
+        }
+
+        // Add JavaScript files
+        if ($pattern === self::JS_REGEX) {
+            foreach ($files as $file) {
+                $this->addJs($file);
+            }
+
+            return $this;
+        }
+
+        // Unknown pattern.
+        foreach ($files as $asset) {
+            $this->add($asset);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add all JavaScript assets within $directory
+     *
+     * @param  string $directory Relative to the Grav root path, or a stream identifier
+     *
+     * @return $this
+     */
+    public function addDirJs($directory)
+    {
+        return $this->addDir($directory, self::JS_REGEX);
+    }
+
+    /**
+     * Add all CSS assets within $directory
+     *
+     * @param  string $directory Relative to the Grav root path, or a stream identifier
+     *
+     * @return $this
+     */
+    public function addDirCss($directory)
+    {
+        return $this->addDir($directory, self::CSS_REGEX);
+    }
+
+    /**
+     * Recursively get files matching $pattern within $directory.
+     *
+     * @param  string $directory
+     * @param  string $pattern (regex)
+     * @param  string $ltrim   Will be trimmed from the left of the file path
+     *
+     * @return array
+     */
+    protected function rglob($directory, $pattern, $ltrim = null)
+    {
+        $iterator = new \RegexIterator(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory,
+            \FilesystemIterator::SKIP_DOTS)), $pattern);
+        $offset = \strlen($ltrim);
+        $files = [];
+
+        foreach ($iterator as $file) {
+            $files[] = substr($file->getPathname(), $offset);
+        }
+
+        return $files;
+    }
+
+
+}

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

@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * @package    Grav\Common\Backup
+ *
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Backup;
+
+use Grav\Common\Filesystem\Archiver;
+use Grav\Common\Filesystem\Folder;
+use Grav\Common\Inflector;
+use Grav\Common\Scheduler\Job;
+use Grav\Common\Scheduler\Scheduler;
+use Grav\Common\Utils;
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\Event\EventDispatcher;
+use RocketTheme\Toolbox\File\JsonFile;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+class Backups
+{
+    protected const BACKUP_FILENAME_REGEXZ = "#(.*)--(\d*).zip#";
+
+    protected const BACKUP_DATE_FORMAT = 'YmdHis';
+
+    protected static $backup_dir;
+
+    protected static $backups = null;
+
+    public function init()
+    {
+        /** @var EventDispatcher $dispatcher */
+        $dispatcher = Grav::instance()['events'];
+        $dispatcher->addListener('onSchedulerInitialized', [$this, 'onSchedulerInitialized']);
+        Grav::instance()->fireEvent('onBackupsInitialized', new Event(['backups' => $this]));
+    }
+
+    public function setup()
+    {
+        if (null === static::$backup_dir) {
+            static::$backup_dir = Grav::instance()['locator']->findResource('backup://', true, true);
+            Folder::create(static::$backup_dir);
+        }
+    }
+
+    public function onSchedulerInitialized(Event $event)
+    {
+        /** @var Scheduler $scheduler */
+        $scheduler = $event['scheduler'];
+
+        /** @var Inflector $inflector */
+        $inflector = Grav::instance()['inflector'];
+
+        foreach (static::getBackupProfiles() as $id => $profile) {
+            $at = $profile['schedule_at'];
+            $name = $inflector::hyphenize($profile['name']);
+            $logs = 'logs/backup-' . $name . '.out';
+            /** @var Job $job */
+            $job = $scheduler->addFunction('Grav\Common\Backup\Backups::backup', [$id], $name );
+            $job->at($at);
+            $job->output($logs);
+            $job->backlink('/tools/backups');
+        }
+    }
+
+    public function getBackupDownloadUrl($backup, $base_url)
+    {
+        $param_sep = $param_sep = Grav::instance()['config']->get('system.param_sep', ':');
+        $download = urlencode(base64_encode($backup));
+        $url      = rtrim(Grav::instance()['uri']->rootUrl(true), '/') . '/' . trim($base_url,
+                '/') . '/task' . $param_sep . 'backup/download' . $param_sep . $download . '/admin-nonce' . $param_sep . Utils::getNonce('admin-form');
+
+        return $url;
+    }
+
+    public static function getBackupProfiles()
+    {
+        return Grav::instance()['config']->get('backups.profiles');
+    }
+
+    public static function getPurgeConfig()
+    {
+        return Grav::instance()['config']->get('backups.purge');
+    }
+
+    public function getBackupNames()
+    {
+        return array_column(static::getBackupProfiles(), 'name');
+    }
+
+    public static function getTotalBackupsSize()
+    {
+        $backups = static::getAvailableBackups();
+        $size = array_sum(array_column($backups, 'size'));
+
+        return $size ?? 0;
+    }
+
+    public static function getAvailableBackups($force = false)
+    {
+        if ($force || null === static::$backups) {
+            static::$backups = [];
+            $backups_itr = new \GlobIterator(static::$backup_dir . '/*.zip', \FilesystemIterator::KEY_AS_FILENAME);
+            $inflector = Grav::instance()['inflector'];
+            $long_date_format = DATE_RFC2822;
+
+            /**
+             * @var string $name
+             * @var \SplFileInfo $file
+             */
+            foreach ($backups_itr as $name => $file) {
+
+                if (preg_match(static::BACKUP_FILENAME_REGEXZ, $name, $matches)) {
+                    $date = \DateTime::createFromFormat(static::BACKUP_DATE_FORMAT, $matches[2]);
+                    $timestamp = $date->getTimestamp();
+                    $backup = new \stdClass();
+                    $backup->title = $inflector->titleize($matches[1]);
+                    $backup->time = $date;
+                    $backup->date = $date->format($long_date_format);
+                    $backup->filename = $name;
+                    $backup->path = $file->getPathname();
+                    $backup->size = $file->getSize();
+                    static::$backups[$timestamp] = $backup;
+                }
+            }
+            // Reverse Key Sort to get in reverse date order
+            krsort(static::$backups);
+        }
+
+        return static::$backups;
+    }
+
+    /**
+     * Backup
+     *
+     * @param int   $id
+     * @param callable|null $status
+     *
+     * @return null|string
+     */
+    public static function backup($id = 0, callable $status = null)
+    {
+        $profiles = static::getBackupProfiles();
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+
+        if (isset($profiles[$id])) {
+            $backup = (object) $profiles[$id];
+        } else {
+            throw new \RuntimeException('No backups defined...');
+        }
+
+        $name = Grav::instance()['inflector']->underscorize($backup->name);
+        $date = date(static::BACKUP_DATE_FORMAT, time());
+        $filename = trim($name, '_') . '--' . $date . '.zip';
+        $destination = static::$backup_dir . DS . $filename;
+        $max_execution_time = ini_set('max_execution_time', 600);
+        $backup_root = $backup->root;
+
+        if ($locator->isStream($backup_root)) {
+            $backup_root = $locator->findResource($backup_root);
+        } else {
+            $backup_root = rtrim(GRAV_ROOT . $backup_root, '/');
+        }
+
+        if (!file_exists($backup_root)) {
+            throw new \RuntimeException("Backup location: {$backup_root} does not exist...");
+        }
+
+        $options = [
+            'exclude_files' => static::convertExclude($backup->exclude_files ?? ''),
+            'exclude_paths' => static::convertExclude($backup->exclude_paths ?? ''),
+        ];
+
+        /** @var Archiver $archiver */
+        $archiver = Archiver::create('zip');
+        $archiver->setArchive($destination)->setOptions($options)->compress($backup_root, $status)->addEmptyFolders($options['exclude_paths'], $status);
+
+        $status && $status([
+            'type' => 'message',
+            'message' => 'Done...',
+        ]);
+
+        $status && $status([
+            'type' => 'progress',
+            'complete' => true
+        ]);
+
+        if ($max_execution_time !== false) {
+            ini_set('max_execution_time', $max_execution_time);
+        }
+
+        // Log the backup
+        Grav::instance()['log']->notice('Backup Created: ' . $destination);
+
+        // Fire Finished event
+        Grav::instance()->fireEvent('onBackupFinished', new Event(['backup' => $destination]));
+
+        // Purge anything required
+        static::purge();
+
+        // Log
+        $log = JsonFile::instance(Grav::instance()['locator']->findResource("log://backup.log", true, true));
+        $log->content([
+            'time'     => time(),
+            'location' => $destination
+        ]);
+        $log->save();
+
+        return $destination;
+    }
+
+    public static function purge()
+    {
+        $purge_config = static::getPurgeConfig();
+        $trigger = $purge_config['trigger'];
+        $backups = static::getAvailableBackups(true);
+
+        switch ($trigger)
+        {
+            case 'number':
+                $backups_count = count($backups);
+                if ($backups_count > $purge_config['max_backups_count']) {
+                    $last = end($backups);
+                    unlink ($last->path);
+                    static::purge();
+                }
+                break;
+
+            case 'time':
+                $last = end($backups);
+                $now = new \DateTime();
+                $interval = $now->diff($last->time);
+                if ($interval->days > $purge_config['max_backups_time']) {
+                    unlink($last->path);
+                    static::purge();
+                }
+                break;
+
+            default:
+                $used_space = static::getTotalBackupsSize();
+                $max_space = $purge_config['max_backups_space'] * 1024 * 1024 *  1024;
+                if ($used_space > $max_space) {
+                    $last = end($backups);
+                    unlink($last->path);
+                    static::purge();
+                }
+                break;
+        }
+    }
+
+    protected static function convertExclude($exclude)
+    {
+        $lines = preg_split("/[\s,]+/", $exclude);
+        return array_map('trim', $lines, array_fill(0, \count($lines), '/'));
+    }
+}

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

@@ -1,143 +0,0 @@
-<?php
-/**
- * @package    Grav.Common.Backup
- *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
- * @license    MIT License; see LICENSE file for details.
- */
-
-namespace Grav\Common\Backup;
-
-use Grav\Common\Grav;
-use Grav\Common\Inflector;
-
-class ZipBackup
-{
-    protected static $ignorePaths = [
-        'backup',
-        'cache',
-        'images',
-        'logs',
-        'tmp'
-    ];
-
-    protected static $ignoreFolders = [
-        '.git',
-        '.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 = Grav::instance()['locator']->findResource('backup://', true);
-
-            if (!$destination) {
-                throw new \RuntimeException('The backup folder is missing.');
-            }
-        }
-
-        $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 = trim($inflector->hyphenize($name), '-') . '-' . $date . '.zip';
-            $destination = rtrim($destination, DS) . DS . $filename;
-        }
-
-        $messager && $messager([
-            'type' => 'message',
-            'level' => 'info',
-            'message' => 'Creating new Backup "' . $destination . '"'
-        ]);
-        $messager && $messager([
-            'type' => 'message',
-            'level' => 'info',
-            'message' => ''
-        ]);
-
-        $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([
-            'type' => 'progress',
-            'percentage' => false,
-            'complete' => true
-        ]);
-
-        $messager && $messager([
-            'type' => 'message',
-            'level' => 'info',
-            'message' => ''
-        ]);
-        $messager && $messager([
-            'type' => 'message',
-            'level' => 'info',
-            'message' => 'Saving and compressing archive...'
-        ]);
-
-        $zip->close();
-
-        if ($max_execution_time !== false) {
-            ini_set('max_execution_time', $max_execution_time);
-        }
-
-        return $destination;
-    }
-
-    /**
-     * @param $folder
-     * @param $zipFile
-     * @param $exclusiveLength
-     * @param $messager
-     */
-    private static function folderToZip($folder, \ZipArchive &$zipFile, $exclusiveLength, callable $messager = null)
-    {
-        $handle = opendir($folder);
-        while (false !== $f = readdir($handle)) {
-            if ($f != '.' && $f != '..') {
-                $filePath = "$folder/$f";
-                // Remove prefix from file path before add to zip.
-                $localPath = substr($filePath, $exclusiveLength);
-
-                if (in_array($f, static::$ignoreFolders)) {
-                    continue;
-                } elseif (in_array($localPath, static::$ignorePaths)) {
-                    $zipFile->addEmptyDir($f);
-                    continue;
-                }
-
-                if (is_file($filePath)) {
-                    $zipFile->addFile($filePath, $localPath);
-
-                    $messager && $messager([
-                        'type' => 'progress',
-                        'percentage' => false,
-                        'complete' => false
-                    ]);
-                } elseif (is_dir($filePath)) {
-                    // Add sub-directory.
-                    $zipFile->addEmptyDir($localPath);
-                    static::folderToZip($filePath, $zipFile, $exclusiveLength, $messager);
-                }
-            }
-        }
-        closedir($handle);
-    }
-}

system/src/Grav/Common/Browser.php

@@ -1,13 +1,16 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav\Common;
 
+use function donatj\UserAgent\parse_user_agent;
+
 /**
  * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
  */
@@ -113,7 +116,7 @@ class Browser
     {
         $version = explode('.', $this->getLongVersion());
 
-        return intval($version[0]);
+        return (int)$version[0];
     }
 
     /**
@@ -134,4 +137,15 @@ class Browser
 
         return true;
     }
+    
+    /**
+     * Determine if “Do Not Track” is set by browser
+     * @see https://www.w3.org/TR/tracking-dnt/
+     *
+     * @return bool
+     */
+    public function isTrackable(): bool
+    {
+        return !(isset($_SERVER['HTTP_DNT']) && $_SERVER['HTTP_DNT'] === '1');
+    }
 }

system/src/Grav/Common/Cache.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,15 +12,16 @@ namespace Grav\Common;
 use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
+use Grav\Common\Scheduler\Scheduler;
+use Psr\SimpleCache\CacheInterface;
 use RocketTheme\Toolbox\Event\Event;
+use RocketTheme\Toolbox\Event\EventDispatcher;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
  * It uses DoctrineCache library and supports a variety of caching mechanisms. Those include:
  *
  * APCu
- * APC
- * XCache
  * RedisCache
  * MemCache
  * MemCacheD
@@ -43,6 +45,11 @@ class Cache extends Getters
      */
     protected $driver;
 
+    /**
+     * @var CacheInterface
+     */
+    protected $simpleCache;
+
     protected $driver_name;
 
     protected $driver_setting;
@@ -117,37 +124,77 @@ class Cache extends Getters
         $this->config = $grav['config'];
         $this->now = time();
 
-        $this->cache_dir = $grav['locator']->findResource('cache://doctrine', true, true);
+        if (null === $this->enabled) {
+            $this->enabled = (bool)$this->config->get('system.cache.enabled');
+        }
 
         /** @var Uri $uri */
         $uri = $grav['uri'];
 
         $prefix = $this->config->get('system.cache.prefix');
-
-        if (is_null($this->enabled)) {
-            $this->enabled = (bool)$this->config->get('system.cache.enabled');
-        }
+        $uniqueness = substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
 
         // Cache key allows us to invalidate all cache on configuration changes.
-        $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION),
-                2, 8);
-
+        $this->key = ($prefix ? $prefix : 'g') . '-' . $uniqueness;
+        $this->cache_dir = $grav['locator']->findResource('cache://doctrine/' . $uniqueness, true, true);
         $this->driver_setting = $this->config->get('system.cache.driver');
-
         $this->driver = $this->getCacheDriver();
-
-        // Set the cache namespace to our unique key
         $this->driver->setNamespace($this->key);
+
+        /** @var EventDispatcher $dispatcher */
+        $dispatcher = Grav::instance()['events'];
+        $dispatcher->addListener('onSchedulerInitialized', [$this, 'onSchedulerInitialized']);
+    }
+
+    /**
+     * @return CacheInterface
+     */
+    public function getSimpleCache()
+    {
+        if (null === $this->simpleCache) {
+            $cache = new \Grav\Framework\Cache\Adapter\DoctrineCache($this->driver, '', $this->getLifetime());
+
+            // Disable cache key validation.
+            $cache->setValidation(false);
+
+            $this->simpleCache = $cache;
+        }
+
+        return $this->simpleCache;
+    }
+
+    /**
+     * Deletes the old out of date file-based caches
+     *
+     * @return int
+     */
+    public function purgeOldCache()
+    {
+        $cache_dir = dirname($this->cache_dir);
+        $current = basename($this->cache_dir);
+        $count = 0;
+
+        foreach (new \DirectoryIterator($cache_dir) as $file) {
+            $dir = $file->getBasename();
+            if ($dir === $current || $file->isDot() || $file->isFile()) {
+                continue;
+            }
+
+            Folder::delete($file->getPathname());
+            $count++;
+        }
+
+        return $count;
     }
 
     /**
      * Public accessor to set the enabled state of the cache
      *
-     * @param $enabled
+     * @param bool|int $enabled
      */
     public function setEnabled($enabled)
     {
-        $this->enabled = (bool) $enabled;
+        $this->enabled = (bool)$enabled;
     }
 
     /**
@@ -184,19 +231,15 @@ class Cache extends Getters
 
         // CLI compatibility requires a non-volatile cache driver
         if ($this->config->get('system.cache.cli_compatibility') && (
-            $setting == 'auto' || $this->isVolatileDriver($setting))) {
+            $setting === 'auto' || $this->isVolatileDriver($setting))) {
             $setting = $driver_name;
         }
 
-        if (!$setting || $setting == 'auto') {
+        if (!$setting || $setting === 'auto') {
             if (extension_loaded('apcu')) {
                 $driver_name = 'apcu';
-            } elseif (extension_loaded('apc')) {
-                $driver_name = 'apc';
             } elseif (extension_loaded('wincache')) {
                 $driver_name = 'wincache';
-            } elseif (extension_loaded('xcache')) {
-                $driver_name = 'xcache';
             }
         } else {
             $driver_name = $setting;
@@ -206,9 +249,6 @@ class Cache extends Getters
 
         switch ($driver_name) {
             case 'apc':
-                $driver = new DoctrineCache\ApcCache();
-                break;
-
             case 'apcu':
                 $driver = new DoctrineCache\ApcuCache();
                 break;
@@ -217,45 +257,53 @@ class Cache extends Getters
                 $driver = new DoctrineCache\WinCacheCache();
                 break;
 
-            case 'xcache':
-                $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 DoctrineCache\MemcacheCache();
-                $driver->setMemcache($memcache);
+                if (extension_loaded('memcache')) {
+                    $memcache = new \Memcache();
+                    $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);
+                } else {
+                    throw new \LogicException('Memcache PHP extension has not been installed');
+                }
                 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);
+                if (extension_loaded('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);
+                } else {
+                    throw new \LogicException('Memcached PHP extension has not been installed');
+                }
                 break;
 
             case 'redis':
-                $redis = new \Redis();
-                $socket = $this->config->get('system.cache.redis.socket', false);
-                $password = $this->config->get('system.cache.redis.password', false);
+                if (extension_loaded('redis')) {
+                    $redis = new \Redis();
+                    $socket = $this->config->get('system.cache.redis.socket', false);
+                    $password = $this->config->get('system.cache.redis.password', false);
 
-                if ($socket) {
-                    $redis->connect($socket);
+                    if ($socket) {
+                        $redis->connect($socket);
+                    } else {
+                        $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
+                            $this->config->get('system.cache.redis.port', 6379));
+                    }
+
+                    // Authenticate with password if set
+                    if ($password && !$redis->auth($password)) {
+                        throw new \RedisException('Redis authentication failed');
+                    }
+
+                    $driver = new DoctrineCache\RedisCache();
+                    $driver->setRedis($redis);
                 } else {
-                    $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
-                    $this->config->get('system.cache.redis.port', 6379));
+                    throw new \LogicException('Redis PHP extension has not been installed');
                 }
-
-                // Authenticate with password if set
-                if ($password && !$redis->auth($password)) {
-                    throw new \RedisException('Redis authentication failed');
-                }
-
-                $driver = new DoctrineCache\RedisCache();
-                $driver->setRedis($redis);
                 break;
 
             default:
@@ -277,9 +325,9 @@ class Cache extends Getters
     {
         if ($this->enabled) {
             return $this->driver->fetch($id);
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -310,6 +358,21 @@ class Cache extends Getters
         if ($this->enabled) {
             return $this->driver->delete($id);
         }
+
+        return false;
+    }
+
+    /**
+     * Deletes all cache
+     *
+     * @return bool
+     */
+    public function deleteAll()
+    {
+        if ($this->enabled) {
+            return $this->driver->deleteAll();
+        }
+
         return false;
     }
 
@@ -324,6 +387,7 @@ class Cache extends Getters
         if ($this->enabled) {
             return $this->driver->contains(($id));
         }
+
         return false;
     }
 
@@ -373,6 +437,9 @@ class Cache extends Getters
             case 'tmp-only':
                 $remove_paths = self::$tmp_remove;
                 break;
+            case 'invalidate':
+                $remove_paths = [];
+                break;
             default:
                 if (Grav::instance()['config']->get('system.cache.clear_images_by_default')) {
                     $remove_paths = self::$standard_remove;
@@ -382,6 +449,12 @@ class Cache extends Getters
 
         }
 
+        // Delete entries in the doctrine cache if required
+        if (in_array($remove, ['all', 'standard'])) {
+            $cache = Grav::instance()['cache'];
+            $cache->driver->deleteAll();
+        }
+
         // Clearing cache event to add paths to clear
         Grav::instance()->fireEvent('onBeforeCacheClear', new Event(['remove' => $remove, 'paths' => &$remove_paths]));
 
@@ -390,6 +463,7 @@ class Cache extends Getters
             // Convert stream to a real path
             try {
                 $path = $locator->findResource($stream, true, true);
+                if($path === false) continue;
 
                 $anything = false;
                 $files = glob($path . '/*');
@@ -421,16 +495,41 @@ class Cache extends Getters
 
         $output[] = '';
 
-        if (($remove == 'all' || $remove == 'standard') && file_exists($user_config)) {
+        if (($remove === 'all' || $remove === 'standard') && file_exists($user_config)) {
             touch($user_config);
 
             $output[] = '<red>Touched: </red>' . $user_config;
             $output[] = '';
         }
 
+        // Clear stat cache
+        @clearstatcache();
+
+        // Clear opcache
+        if (function_exists('opcache_reset')) {
+            @opcache_reset();
+        }
+
         return $output;
     }
 
+    public static function invalidateCache()
+    {
+        $user_config = USER_DIR . 'config/system.yaml';
+
+        if (file_exists($user_config)) {
+            touch($user_config);
+        }
+
+        // Clear stat cache
+        @clearstatcache();
+
+        // Clear opcache
+        if (function_exists('opcache_reset')) {
+            @opcache_reset();
+        }
+
+    }
 
     /**
      * Set the cache lifetime programmatically
@@ -443,7 +542,7 @@ class Cache extends Getters
             return;
         }
 
-        $interval = $future - $this->now;
+        $interval = (int)($future - $this->now);
         if ($interval > 0 && $interval < $this->getLifetime()) {
             $this->lifetime = $interval;
         }
@@ -458,7 +557,7 @@ class Cache extends Getters
     public function getLifetime()
     {
         if ($this->lifetime === null) {
-            $this->lifetime = $this->config->get('system.cache.lifetime') ?: 604800; // 1 week default
+            $this->lifetime = (int)($this->config->get('system.cache.lifetime') ?: 604800); // 1 week default
         }
 
         return $this->lifetime;
@@ -487,15 +586,71 @@ class Cache extends Getters
     /**
      * is this driver a volatile driver in that it resides in PHP process memory
      *
-     * @param $setting
+     * @param string $setting
      * @return bool
      */
     public function isVolatileDriver($setting)
     {
         if (in_array($setting, ['apc', 'apcu', 'xcache', 'wincache'])) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
+
+    /**
+     * Static function to call as a scheduled Job to purge old Doctrine files
+     */
+    public static function purgeJob()
+    {
+        /** @var Cache $cache */
+        $cache = Grav::instance()['cache'];
+        $deleted_folders = $cache->purgeOldCache();
+
+        echo 'Purged ' . $deleted_folders . ' old cache folders...';
+    }
+
+    /**
+     * Static function to call as a scheduled Job to clear Grav cache
+     *
+     * @param string $type
+     */
+    public static function clearJob($type)
+    {
+        $result = static::clearCache($type);
+        static::invalidateCache();
+
+        echo strip_tags(implode("\n", $result));
+    }
+
+    public function onSchedulerInitialized(Event $event)
+    {
+        /** @var Scheduler $scheduler */
+        $scheduler = $event['scheduler'];
+        $config = Grav::instance()['config'];
+
+        // File Cache Purge
+        $at = $config->get('system.cache.purge_at');
+        $name = 'cache-purge';
+        $logs = 'logs/' . $name . '.out';
+
+        $job = $scheduler->addFunction('Grav\Common\Cache::purgeJob', [], $name );
+        $job->at($at);
+        $job->output($logs);
+        $job->backlink('/config/system#caching');
+
+        // Cache Clear
+        $at = $config->get('system.cache.clear_at');
+        $clear_type = $config->get('system.cache.clear_job_type');
+        $name = 'cache-clear';
+        $logs = 'logs/' . $name . '.out';
+
+        $job = $scheduler->addFunction('Grav\Common\Cache::clearJob', [$clear_type], $name );
+        $job->at($at);
+        $job->output($logs);
+        $job->backlink('/config/system#caching');
+
+    }
+
+
 }

system/src/Grav/Common/Composer.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common
+ * @package    Grav\Common
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -11,7 +12,7 @@ namespace Grav\Common;
 class Composer
 {
     /** @const Default composer location */
-    const DEFAULT_PATH = "bin/composer.phar";
+    const DEFAULT_PATH = 'bin/composer.phar';
 
     /**
      * Returns the location of composer.
@@ -20,12 +21,12 @@ class Composer
      */
     public static function getComposerLocation()
     {
-        if (!function_exists('shell_exec') || strtolower(substr(PHP_OS, 0, 3)) === 'win') {
+        if (!\function_exists('shell_exec') || stripos(PHP_OS, 'win') === 0) {
             return self::DEFAULT_PATH;
         }
 
         // check for global composer install
-        $path = trim(shell_exec("command -v composer"));
+        $path = trim(shell_exec('command -v composer'));
 
         // fall back to grav bundled composer
         if (!$path || !preg_match('/(composer|composer\.phar)$/', $path)) {
@@ -46,7 +47,7 @@ class Composer
         $composer = static::getComposerLocation();
 
         if ($composer !== static::DEFAULT_PATH && is_executable($composer)) {
-            $file = fopen($composer, 'r');
+            $file = fopen($composer, 'rb');
             $firstLine = fgets($file);
             fclose($file);
 

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -128,7 +129,7 @@ abstract class CompiledBase
      */
     public function checksum()
     {
-        if (!isset($this->checksum)) {
+        if (null === $this->checksum) {
             $this->checksum = md5(json_encode($this->files) . $this->version);
         }
 
@@ -197,11 +198,9 @@ abstract class CompiledBase
 
         $cache = include $filename;
         if (
-            !is_array($cache)
-            || !isset($cache['checksum'])
-            || !isset($cache['data'])
-            || !isset($cache['@class'])
-            || $cache['@class'] != get_class($this)
+            !\is_array($cache)
+            || !isset($cache['checksum'], $cache['data'], $cache['@class'])
+            || $cache['@class'] !== \get_class($this)
         ) {
             return false;
         }
@@ -212,7 +211,7 @@ abstract class CompiledBase
         }
 
         $this->createObject($cache['data']);
-        $this->timestamp = isset($cache['timestamp']) ? $cache['timestamp'] : 0;
+        $this->timestamp = $cache['timestamp'] ?? 0;
 
         $this->finalizeObject();
 
@@ -243,7 +242,7 @@ abstract class CompiledBase
         }
 
         $cache = [
-            '@class' => get_class($this),
+            '@class' => \get_class($this),
             'timestamp' => time(),
             'checksum' => $this->checksum(),
             'files' => $this->files,

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

@@ -1,27 +1,30 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, 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
+ * @package Grav\Common\Config
+ */
 class CompiledBlueprints extends CompiledBase
 {
-    /**
-     * @var int Version number for the compiled file.
-     */
-    public $version = 2;
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        parent::__construct($cacheFolder, $files, $path);
 
-    /**
-     * @var BlueprintSchema  Blueprints object.
-     */
-    protected $object;
+        $this->version = 2;
+    }
 
     /**
      * Returns checksum from the configuration files.
@@ -32,7 +35,7 @@ class CompiledBlueprints extends CompiledBase
      */
     public function checksum()
     {
-        if (!isset($this->checksum)) {
+        if (null === $this->checksum) {
             $this->checksum = md5(json_encode($this->files) . json_encode($this->getTypes()) . $this->version);
         }
 
@@ -92,6 +95,7 @@ class CompiledBlueprints extends CompiledBase
 
         // Convert file list into parent list.
         $list = [];
+        /** @var array $files */
         foreach ($this->files as $files) {
             foreach ($files as $name => $item) {
                 $list[$name][] = $this->path . $item['file'];

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

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * @package    Grav.Common.Config
+ * @package    Grav\Common\Config
  *
- * @copyright  Copyright (C) 2014 - 2017 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,16 +13,6 @@ 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.
      */
@@ -32,6 +23,13 @@ class CompiledConfig extends CompiledBase
      */
     protected $withDefaults;
 
+    public function __construct($cacheFolder, array $files, $path)
+    {
+        parent::__construct($cacheFolder, $files, $path);
+
+        $this->version = 1;
+    }
+
     /**
      * Set blueprints for the configuration.
      *
@@ -63,7 +61,7 @@ class CompiledConfig extends CompiledBase
      */
     protected function createObject(array $data = [])
     {
-        if ($this->withDefaults && empty($data) && is_callable($this->callable)) {
+        if ($this->withDefaults && empty($data) && \is_callable($this->callable)) {
             $blueprints = $this->callable;
             $data = $blueprints()->getDefaults();
         }