Revert "Update Grav."

This reverts commit 51db272a.

system/assets/debugger.css

@@ -30,25 +30,9 @@ 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/blueprints/config/security.yaml

@@ -41,14 +41,6 @@ form:
             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

system/blueprints/config/site.yaml

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

system/blueprints/user/account.yaml

@@ -100,14 +100,13 @@ form:
 
 
             security:
-            security@: admin.super
                 title: PLUGIN_ADMIN.ACCESS_LEVELS
                 type: section
+                security: admin.super
                 underline: true
 
                 fields:
                     groups:
-                    security@: admin.super
                         type: select
                         multiple: true
                         size: large
@@ -119,7 +118,6 @@ form:
                             type: commalist
 
                     access:
-                    security@: admin.super
                         type: permissions
                         label: PLUGIN_ADMIN.PERMISSIONS
                         ignore_empty: true

system/blueprints/user/account_new.yaml

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

system/config/security.yaml

@@ -5,13 +5,6 @@ xss_enabled:
     moz_binding: true
     html_inline_styles: true
     dangerous_tags: true
-xss_invalid_protocols:
-    - javascript
-    - livescript
-    - vbscript
-    - mocha
-    - feed
-    - data
 xss_dangerous_tags:
     - applet
     - meta

system/config/site.yaml

@@ -27,7 +27,7 @@ routes:
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)
 
-#menu:                                      # Menu Example
+#menu:                                      # Sample Menu Example
 #    - text: Source
 #      icon: github
 #      url: https://github.com/getgrav/grav

system/config/streams.yaml

 schemes:
   image:
-    type: Stream
+    type: ReadOnlyStream
     paths:
       - user://images
       - system://images

system/config/system.yaml

@@ -13,9 +13,7 @@ intl_enabled: true                               # Special logic for PHP Interna
 
 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
@@ -54,7 +52,7 @@ pages:
     special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [html,htm,xml,txt,json,rss,atom]        # list of valid page types
+  types: [txt,xml,html,htm,json,rss,atom]        # list of valid page types
   append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
   expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
   cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
@@ -67,7 +65,6 @@ 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?
@@ -77,11 +74,8 @@ 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|apcu|memcache|wincache
+  driver: auto                                   # One of: auto|file|apc|xcache|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)
@@ -118,11 +112,6 @@ 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:
@@ -134,7 +123,6 @@ 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
@@ -147,7 +135,6 @@ session:
   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)
@@ -160,10 +147,6 @@ gpm:
   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

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

system/languages/ar.yaml

 ---
-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:
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  العنوان: %1$s
+  ---
+  # خطأ: مادة أمامية غير صحيحة
+  
+  مسار: '%2$s'
+  
+  **%3$s**
+  
+  , , ,
+  
+  %4$s
+  , , ,
+NICETIME:
   NO_DATE_PROVIDED: لم يتم تقديم التاريخ
   BAD_DATE: تاريخ خاطئ
   AGO: من قبل
@@ -22,7 +34,7 @@ GRAV:
   YR: سنة
   DEC: عقد
   SECOND_PLURAL: ثواني
-    MINUTE_PLURAL: '‮دقائق'
+  MINUTE_PLURAL: ‮دقائق
   HOUR_PLURAL: ساعات
   DAY_PLURAL: أيام
   WEEK_PLURAL: أسابيع
@@ -36,28 +48,28 @@ GRAV:
   MO_PLURAL: أشهر
   YR_PLURAL: سنوات
   DEC_PLURAL: عقود
-  FORM:
-    VALIDATION_FAIL: <b>فشل التحقق من صحة:</b>
+FORM:
+  VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
   INVALID_INPUT: إدخال غير صحيح في
   MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
-  MONTHS_OF_THE_YEAR:
-    - 'كانون الثاني'
-    - 'شباط'
-    - 'آذار/ مارس'
-    - 'نيسان'
-    - 'أيار'
-    - 'حزيران'
-    - 'تموز'
-    - 'آب'
-    - 'أيلول'
-    - 'تشرين الأول'
-    - 'تشرين الثاني'
-    - 'كانون الأول'
-  DAYS_OF_THE_WEEK:
-    - 'الاثنين'
-    - 'الثلاثاء'
-    - 'الأربعاء'
-    - 'الخميس'
-    - 'الجمعة'
-    - 'السبت'
-    - 'الأحد'
+MONTHS_OF_THE_YEAR:
+  - كانون الثاني
+  - شباط
+  - آذار/ مارس
+  - نيسان
+  - أيار
+  - حزيران
+  - تموز
+  - آب
+  - أيلول
+  - تشرين الأول
+  - تشرين الثاني
+  - كانون الأول
+DAYS_OF_THE_WEEK:
+  - الاثنين
+  - الثلاثاء
+  - الأربعاء
+  - الخميس
+  - الجمعة
+  - السبت
+  - الأحد

system/languages/ca.yaml

 ---
-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
+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
+  FROM_NOW: "des d'ara"
   SECOND: segon
   MINUTE: minut
   HOUR: hora
@@ -15,6 +27,7 @@ GRAV:
   YEAR: any
   DECADE: dècada
   SEC: s
+  MIN: min
   HR: h
   WK: setm.
   MO: m.
@@ -35,28 +48,28 @@ GRAV:
   MO_PLURAL: mesos
   YR_PLURAL: anys
   DEC_PLURAL: dèc.
-  FORM:
-    VALIDATION_FAIL: <b>Ha fallat la validació:</b>
+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'
+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

 ---
-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:
+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
@@ -100,45 +54,28 @@ GRAV:
   MO_PLURAL: m
   YR_PLURAL: r
   DEC_PLURAL: dek
-  FORM:
-    VALIDATION_FAIL: <b>Ověření se nezdařilo:</b>
+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
+MONTHS_OF_THE_YEAR:
+  - ledna
+  - února
+  - března
+  - dubna
+  - května
+  - června
+  - července
+  - srpna
+  - září
+  - října
+  - listopadu
+  - prosince
+DAYS_OF_THE_WEEK:
+  - Pondělí
+  - Úterý
+  - Středa
+  - Čtvrtek
+  - Pátek
+  - Sobota
+  - Neděle

system/languages/da.yaml

 ---
-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:
+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
@@ -15,6 +27,7 @@ GRAV:
   YEAR: år
   DECADE: årti
   SEC: sek
+  MIN: min
   HR: t
   WK: u
   MO: md
@@ -35,28 +48,28 @@ GRAV:
   MO_PLURAL: mdr
   YR_PLURAL: år
   DEC_PLURAL: årtier
-  FORM:
-    VALIDATION_FAIL: <b>Validering mislykkedes:</b>
+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'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - Marts
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Mandag
+  - Tirsdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lørdag
+  - Søndag

system/languages/de.yaml

 ---
-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:
+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
-    JUST_NOW: jetzt gerade
   SECOND: Sekunde
   MINUTE: Minute
   HOUR: Stunde
@@ -84,7 +46,7 @@ GRAV:
   WK: Wo.
   MO: Mo.
   YR: J.
-    DEC: Dez
+  DEC: Dek.
   SECOND_PLURAL: Sekunden
   MINUTE_PLURAL: Minuten
   HOUR_PLURAL: Stunden
@@ -100,45 +62,28 @@ GRAV:
   MO_PLURAL: Monate
   YR_PLURAL: Jahre
   DEC_PLURAL: Jahrzehnten
-  FORM:
-    VALIDATION_FAIL: <b>Überprüfung fehlgeschlagen:</b>
+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
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - März
+  - April
+  - Mai
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - Dezember
+DAYS_OF_THE_WEEK:
+  - Montag
+  - Dienstag
+  - Mittwoch
+  - Donnerstag
+  - Freitag
+  - Samstag
+  - Sonntag

system/languages/el.yaml

 ---
-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:
-    - 'Δευτέρα'
-    - 'Τρίτη'
-    - 'Τετάρτη'
-    - 'Πέμπτη'
-    - 'Παρασκευή'
-    - 'Σάββατο'
-    - 'Κυριακή'
+MONTHS_OF_THE_YEAR:
+  - Ιανουάριος
+  - Φεβρουάριος
+  - Μάρτιος
+  - Απρίλιος
+  - Μάιος
+  - Ιούνιος
+  - Ιούλιος
+  - Αύγουστος
+  - Σεπτέμβριος
+  - Οκτώβριος
+  - Νοέμβριος
+  - Δεκέμβριος
+DAYS_OF_THE_WEEK:
+  - Δευτέρα
+  - Τρίτη
+  - Τετάρτη
+  - Πέμπτη
+  - Παρασκευή
+  - Σάββατο
+  - Κυριακή

system/languages/en.yaml

----
-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:
+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'
@@ -20,7 +18,7 @@ GRAV:
     '/(ax|test)is$/i': '\1es'
     '/s$/i': 's'
     '/$/': 's'
-    INFLECTOR_SINGULAR:
+INFLECTOR_SINGULAR:
     '/(quiz)zes$/i': '\1'
     '/(matr)ices$/i': '\1ix'
     '/(vert|ind)ices$/i': '\1ex'
@@ -45,19 +43,19 @@ GRAV:
     '/([ti])a$/i': '\1um'
     '/(n)ews$/i': '\1ews'
     '/s$/i': ''
-    INFLECTOR_UNCOUNTABLE: ['equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep']
-    INFLECTOR_IRREGULAR:
+INFLECTOR_UNCOUNTABLE: ['equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep']
+INFLECTOR_IRREGULAR:
     'person': 'people'
     'man': 'men'
     'child': 'children'
     'sex': 'sexes'
     'move': 'moves'
-    INFLECTOR_ORDINALS:
+INFLECTOR_ORDINALS:
     'default': 'th'
     'first': 'st'
     'second': 'nd'
     'third': 'rd'
-    NICETIME:
+NICETIME:
     NO_DATE_PROVIDED: No date provided
     BAD_DATE: Bad date
     AGO: ago
@@ -93,28 +91,9 @@ GRAV:
     MO_PLURAL: mos
     YR_PLURAL: yrs
     DEC_PLURAL: decs
-    FORM:
+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
+MONTHS_OF_THE_YEAR: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+DAYS_OF_THE_WEEK: ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']

system/languages/es.yaml

 ---
-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:
+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 errónea
+  BAD_DATE: Fecha erronea
   AGO: antes
   FROM_NOW: desde ahora
-    JUST_NOW: hace un momento
   SECOND: segundo
   MINUTE: minuto
   HOUR: hora
@@ -33,10 +42,12 @@ GRAV:
   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
@@ -46,50 +57,34 @@ GRAV:
   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>'
+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
+MONTHS_OF_THE_YEAR:
+  - Enero
+  - Febrero
+  - Marzo
+  - Abril
+  - Mayo
+  - Junio
+  - Julio
+  - Agosto
+  - Septiembre
+  - Octubre
+  - Noviembre
+  - Diciembre
+DAYS_OF_THE_WEEK:
+  - Lunes
+  - Martes
+  - Miércoles
+  - Jueves
+  - Viernes
+  - Sábado
+  - Domingo

system/languages/fi.yaml

 ---
-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:
+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
+  SECOND: sekunti
   MINUTE: minuutti
   HOUR: tunti
   DAY: päivä
@@ -99,36 +34,27 @@ GRAV:
   MO_PLURAL: kk
   YR_PLURAL: v
   DEC_PLURAL: vuosikymmentä
-  FORM:
-    VALIDATION_FAIL: <b>Vahvistus epäonnistui:</b>
-    INVALID_INPUT: Syöte ei kelpaa
+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'
-  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 />
+MONTHS_OF_THE_YEAR:
+  - Tammikuu
+  - Helmikuu
+  - Maaliskuu
+  - Huhtikuu
+  - Toukokuu
+  - Kesäkuuta
+  - Heinäkuu
+  - Elokuu
+  - Syyskuu
+  - Lokakuu
+  - Marraskuu
+  - Joulukuu
+DAYS_OF_THE_WEEK:
+  - Maanantai
+  - Tiistai
+  - Keskiviikko
+  - Torstai
+  - Perjantai
+  - Lauantai
+  - Sunnuntai

system/languages/fr.yaml

 ---
-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:
+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
-    JUST_NOW: à l'instant
   SECOND: seconde
   MINUTE: minute
   HOUR: heure
@@ -79,45 +111,28 @@ GRAV:
   MO_PLURAL: mois
   YR_PLURAL: a
   DEC_PLURAL: décs
-  FORM:
-    VALIDATION_FAIL: <b>La validation a échoué :</b>
+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
+MONTHS_OF_THE_YEAR:
+  - Janvier
+  - Février
+  - Mars
+  - Avril
+  - Mai
+  - Juin
+  - Juillet
+  - Août
+  - Septembre
+  - Octobre
+  - Novembre
+  - Décembre
+DAYS_OF_THE_WEEK:
+  - Lundi
+  - Mardi
+  - Mercredi
+  - Jeudi
+  - Vendredi
+  - Samedi
+  - Dimanche

system/languages/hr.yaml

 ---
-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:
+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
@@ -49,28 +48,28 @@ GRAV:
   MO_PLURAL: m
   YR_PLURAL: g
   DEC_PLURAL: des
-  FORM:
-    VALIDATION_FAIL: <b>Validacija nije uspjela:</b>
+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'
+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

 ---
-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:
+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
-    JUST_NOW: épp most
   SECOND: másodperc
   MINUTE: perc
   HOUR: óra
@@ -57,41 +111,28 @@ GRAV:
   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:'
+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'
-  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
+MONTHS_OF_THE_YEAR:
+  - január
+  - február
+  - március
+  - április
+  - május
+  - június
+  - július
+  - augusztus
+  - szeptember
+  - október
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - hétfő
+  - kedd
+  - szerda
+  - csütörtök
+  - péntek
+  - szombat
+  - vasárnap

system/languages/it.yaml

 ---
-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:
+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
-    JUST_NOW: ora
   SECOND: secondo
   MINUTE: minuto
   HOUR: ora
@@ -57,45 +35,28 @@ GRAV:
   MO_PLURAL: mesi
   YR_PLURAL: anni
   DEC_PLURAL: decenni
-  FORM:
-    VALIDATION_FAIL: <b>Validazione fallita:</b>
+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
+MONTHS_OF_THE_YEAR:
+  - Gennaio
+  - Febbraio
+  - Marzo
+  - Aprile
+  - Maggio
+  - Giugno
+  - Luglio
+  - Agosto
+  - Settembre
+  - Ottobre
+  - Novembre
+  - Dicembre
+DAYS_OF_THE_WEEK:
+  - Lunedì
+  - Martedì
+  - Mercoledì
+  - Giovedì
+  - Venerdì
+  - Sabato
+  - Domenica

system/languages/ja.yaml

----
-GRAV:
-  INFLECTOR_IRREGULAR:
+FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Invalid Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+INFLECTOR_PLURALS: []
+
+INFLECTOR_SINGULAR: []
+
+INFLECTOR_UNCOUNTABLE: []
+
+INFLECTOR_IRREGULAR:
     'person': 'みんな'
     'man': '人'
     'child': '子供'
     'sex': '性別'
     'move': '移動'
-  NICETIME:
+    
+INFLECTOR_ORDINALS: []
+
+NICETIME:
     NO_DATE_PROVIDED: 日付が設定されていません
     BAD_DATE: 不正な日付
     AGO: 前
+    FROM_NOW: from now
     SECOND: 秒
     MINUTE: 分
     HOUR: 時
@@ -24,6 +33,7 @@ GRAV:
     WK: 週
     MO: 月
     YR: 年
+    DEC: dec
     SECOND_PLURAL: 秒
     MINUTE_PLURAL: 分
     HOUR_PLURAL: 時
@@ -39,28 +49,9 @@ GRAV:
     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/lt.yaml

 ---
-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:
+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š
@@ -29,14 +25,12 @@ GRAV:
   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
+  SEC: sek
+  MIN: min
+  HR: val
+  WK: sav
+  MO: mėn
+  YR: m
   MINUTE_PLURAL: minutės
   HOUR_PLURAL: valandos
   DAY_PLURAL: dienos
@@ -44,35 +38,32 @@ GRAV:
   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 į
+  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'
+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

----
-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']
+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

 ---
-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:
+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
-    JUST_NOW: zojuist
   SECOND: seconde
   MINUTE: minuut
   HOUR: uur
@@ -77,14 +17,12 @@ GRAV:
   WEEK: week
   MONTH: maand
   YEAR: jaar
-    DECADE: decennium
+  DECADE: decenium
   SEC: s
   MIN: min
   HR: u
-    WK: week
   MO: ma
   YR: j
-    DEC: decennia
   SECOND_PLURAL: seconden
   MINUTE_PLURAL: minuten
   HOUR_PLURAL: uren
@@ -99,46 +37,28 @@ GRAV:
   WK_PLURAL: weken
   MO_PLURAL: maanden
   YR_PLURAL: jaren
-    DEC_PLURAL: decennia
-  FORM:
-    VALIDATION_FAIL: <b>Validatie mislukt:</b>
+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
+  MISSING_REQUIRED_FIELD: 'Verplicht veld ontbreekt:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februari
+  - Maart
+  - april
+  - Mei
+  - Juni
+  - Juli
+  - Augustus
+  - september
+  - Oktober
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - Maandag
+  - Dinsdag
+  - Woensdag
+  - Donderdag
+  - Vrijdag
+  - Zaterdag
+  - Zondag

system/languages/no.yaml

 ---
-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:
+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: Ugyldig dato
+  BAD_DATE: Dårlig dato
   AGO: siden
   FROM_NOW: fra nå
   SECOND: sekund
@@ -30,11 +45,12 @@ GRAV:
   YEAR: år
   DECADE: tiår
   SEC: sek
+  MIN: min
   HR: t
   WK: uke
   MO: må
   YR: år
-    DEC: tiår
+  DEC: des
   SECOND_PLURAL: sekunder
   MINUTE_PLURAL: minutter
   HOUR_PLURAL: timer
@@ -47,31 +63,31 @@ GRAV:
   MIN_PLURAL: min
   HR_PLURAL: timer
   WK_PLURAL: uker
-    MO_PLURAL: md
+  MO_PLURAL: mdr
   YR_PLURAL: år
   DEC_PLURAL: årtier
-  FORM:
-    VALIDATION_FAIL: <b>Godkjenning mislyktes:</b>
+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'
+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

 ---
-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:
+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
@@ -15,6 +27,7 @@ GRAV:
   YEAR: rok
   DECADE: dekada
   SEC: sek
+  MIN: min
   HR: godz
   WK: tydz
   MO: m-c
@@ -35,28 +48,28 @@ GRAV:
   MO_PLURAL: m-ce
   YR_PLURAL: lat
   DEC_PLURAL: dekad
-  FORM:
-    VALIDATION_FAIL: <b>Weryfikacja nie powiodła się:</b>
+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'
+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

 ---
-GRAV:
-  NICETIME:
-    NO_DATE_PROVIDED: Nenhuma data fornecida
+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
@@ -11,36 +33,47 @@ GRAV:
   MONTH: mês
   YEAR: ano
   DECADE: década
-    SEC: segundos
-    MIN: minutos
+  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: 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'
+  DECADE_PLURAL: décadas
+  SEC_PLURAL: seg
+  MIN_PLURAL: mins
+  HR_PLURAL: hrs
+  WK_PLURAL: sems
+  YR_PLURAL: anos
+FORM:
+  VALIDATION_FAIL: '<b>Validação falhada: </b>'
+  MISSING_REQUIRED_FIELD: 'Campo obrigatório ausente:'
+MONTHS_OF_THE_YEAR:
+  - Janeiro
+  - Fevereiro
+  - Março
+  - Abril
+  - Maio
+  - Junho
+  - Julho
+  - Agosto
+  - Setembro
+  - Outubro
+  - Novembro
+  - Dezembro
+DAYS_OF_THE_WEEK:
+  - Segunda
+  - Terça
+  - Quarta
+  - Quinta
+  - Sexta
+  - Sábado
+  - Domingo

system/languages/ro.yaml

 ---
-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:
+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
-    JUST_NOW: chiar acum
   SECOND: secundă
   MINUTE: minut
   HOUR: oră
@@ -30,8 +52,8 @@ GRAV:
   MONTH: lună
   YEAR: an
   DECADE: decadă
-    SEC: secunde
-    MIN: minute
+  SEC: sec
+  MIN: min
   HR: oră
   WK: săpt
   MO: lună
@@ -52,45 +74,28 @@ GRAV:
   MO_PLURAL: luni
   YR_PLURAL: ani
   DEC_PLURAL: decenii
-  FORM:
-    VALIDATION_FAIL: <b>Validare nereușită</b>
+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ă
+MONTHS_OF_THE_YEAR:
+  - Ianuarie
+  - Februarie
+  - Martie
+  - Aprilie
+  - Mai
+  - Iunie
+  - Iulie
+  - August
+  - Septembrie
+  - Octombrie
+  - Noiembrie
+  - Decembrie
+DAYS_OF_THE_WEEK:
+  - Luni
+  - Marți
+  - Miercuri
+  - Joi
+  - Vineri
+  - Sâmbătă
+  - Duminică

system/languages/ru.yaml

 ---
-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:
+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: теперь
-    JUST_NOW: только что
   SECOND: секунда
   MINUTE: минута
   HOUR: час
-    DAY: день
+  DAY: д
   WEEK: неделя
   MONTH: месяц
   YEAR: год
   DECADE: десятилетие
-    SEC: сек
+  SEC: с
   MIN: мин
   HR: ч
-    WK: нед
-    MO: мес
-    YR: г
-    DEC: дстлт
-    SECOND_PLURAL: сек
-    MINUTE_PLURAL: мин
-    HOUR_PLURAL: ч
+  WK: нед.
+  MO: мес.
+  YR: г.
+  DEC: гг.
+  SECOND_PLURAL: секунды
+  MINUTE_PLURAL: минуты
+  HOUR_PLURAL: часы
   DAY_PLURAL: д
-    WEEK_PLURAL: нед
-    MONTH_PLURAL: мес
-    YEAR_PLURAL: г
-    DECADE_PLURAL: дстлт
-    SEC_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>
+  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: Выражение не распознано
+MONTHS_OF_THE_YEAR:
+  - Январь
+  - Февраль
+  - Март
+  - Апрель
+  - Май
+  - Июнь
+  - Июль
+  - Август
+  - Сентябрь
+  - Октябрь
+  - Ноябрь
+  - Декабрь
+DAYS_OF_THE_WEEK:
+  - Понедельник
+  - Вторник
+  - Среда
+  - Четверг
+  - Пятница
+  - Суббота
+  - Воскресенье

system/languages/sk.yaml

 ---
-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:
+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
@@ -81,64 +15,28 @@ GRAV:
   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>
+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
+MONTHS_OF_THE_YEAR:
+  - Január
+  - Február
+  - Marec
+  - Apríl
+  - Máj
+  - Jún
+  - Júl
+  - August
+  - September
+  - Október
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Pondelok
+  - Utorok
+  - Streda
+  - Štvrtok
+  - Piatok
+  - Sobota
+  - Nedeľa

system/languages/sv.yaml

 ---
-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:
+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.o.m nu
+  FROM_NOW: från nu
   SECOND: sekund
   MINUTE: minut
   HOUR: timme
@@ -26,10 +14,12 @@ GRAV:
   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
@@ -45,28 +35,28 @@ GRAV:
   MO_PLURAL: må
   YR_PLURAL: år
   DEC_PLURAL: dec
-  FORM:
-    VALIDATION_FAIL: <b>Kontrollen misslyckades:</b>
+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'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februrari
+  - Mars
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - Augusti
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Måndag
+  - Tisdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lördag
+  - Söndag

system/languages/th.yaml

 ---
-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:
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  ชื่อเรื่อง: %1$s
+  ---
+  
+  # ข้อผิดพลาด: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
   NO_DATE_PROVIDED: ไม่มีวันที่ให้
   BAD_DATE: รูปแบบวันที่ผิด
   AGO: ที่ผ่านมา
@@ -17,6 +29,10 @@ GRAV:
   SEC: วิ
   MIN: นาที
   HR: ชม.
+  WK: wk
+  MO: mo
+  YR: yr
+  DEC: dec
   SECOND_PLURAL: วินาที
   MINUTE_PLURAL: นาที
   HOUR_PLURAL: ชั่วโมง
@@ -28,29 +44,32 @@ GRAV:
   SEC_PLURAL: วินาที
   MIN_PLURAL: นาที
   HR_PLURAL: ชั่วโมง
+  WK_PLURAL: wks
+  MO_PLURAL: mos
   YR_PLURAL: ปี
-  FORM:
+  DEC_PLURAL: decs
+FORM:
   VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
   INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
   MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
-  MONTHS_OF_THE_YEAR:
-    - 'มกราคม'
-    - 'กุมภาพันธ์'
-    - 'มีนาคม'
-    - 'เมษายน'
-    - 'พฤษภาคม'
-    - 'มิถุนายน'
-    - 'กรกฏาคม'
-    - 'สิงหาคม'
-    - 'กันยายน'
-    - 'ตุลาคม'
-    - 'พฤศจิกายน'
-    - 'ธันวาคม'
-  DAYS_OF_THE_WEEK:
-    - 'จันทร์'
-    - 'อังคาร'
-    - 'พุธ'
-    - 'พฤหัสบดี'
-    - 'ศุกร์'
-    - 'เสาร์'
-    - 'อาทิตย์'
+MONTHS_OF_THE_YEAR:
+  - มกราคม
+  - กุมภาพันธ์
+  - มีนาคม
+  - เมษายน
+  - พฤษภาคม
+  - มิถุนายน
+  - กรกฏาคม
+  - สิงหาคม
+  - กันยายน
+  - ตุลาคม
+  - พฤศจิกายน
+  - ธันวาคม
+DAYS_OF_THE_WEEK:
+  - จันทร์
+  - อังคาร
+  - พุธ
+  - พฤหัสบดี
+  - ศุกร์
+  - เสาร์
+  - อาทิตย์

system/languages/tr.yaml

 ---
-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
+NICETIME:
+  NO_DATE_PROVIDED: Tarih yok
   BAD_DATE: Yanlış tarih
   AGO: önce
-    FROM_NOW: şu andan itibaren
+  FROM_NOW: (şimdiden)
   SECOND: saniye
   MINUTE: dakika
   HOUR: saat
@@ -34,30 +32,28 @@ GRAV:
   HR_PLURAL: sa
   WK_PLURAL: hft
   MO_PLURAL: ay
-    YR_PLURAL: yıl
+  YR_PLURAL: yl
   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'
+FORM:
+  VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+MONTHS_OF_THE_YEAR:
+  - Ocak
+  - Şubat
+  - Mart
+  - Nisan
+  - Mayıs
+  - Haziran
+  - Temmuz
+  - Ağustos
+  - Eylül
+  - Ekim
+  - Kasım
+  - Aralık
+DAYS_OF_THE_WEEK:
+  - Pazartesi
+  - Salı
+  - Çarşamba
+  - Perşembe
+  - Cuma
+  - Cumartesi
+  - Pazar

system/languages/uk.yaml

 ---
-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:
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Помилка: Недопустимий вміст
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
   NO_DATE_PROVIDED: Не вказана дата
   BAD_DATE: Невірна дата
   AGO: назад
@@ -36,28 +48,28 @@ GRAV:
   MO_PLURAL: міс.
   YR_PLURAL: рр.
   DEC_PLURAL: рр.
-  FORM:
-    VALIDATION_FAIL: <b>Перевірка не вдалася:</b>
+FORM:
+  VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
   INVALID_INPUT: Невірне введення в
-    MISSING_REQUIRED_FIELD: 'Відсутнє обов''язкове поле:'
-  MONTHS_OF_THE_YEAR:
-    - 'Січень'
-    - 'Лютий'
-    - 'Березень'
-    - 'Квітень'
-    - 'Травень'
-    - 'Червень'
-    - 'Липень'
-    - 'Серпень'
-    - 'Вересень'
-    - 'Жовтень'
-    - 'Листопад'
-    - 'Грудень'
-  DAYS_OF_THE_WEEK:
-    - 'Понеділок'
-    - 'Вівторок'
-    - 'Середа'
-    - 'Четвер'
-    - 'П''ятниця'
-    - 'Субота'
-    - 'Неділя'
+  MISSING_REQUIRED_FIELD: 'Відсутнє необхідне поле:'
+MONTHS_OF_THE_YEAR:
+  - Січень
+  - Лютий
+  - Березень
+  - Квітень
+  - Травень
+  - Червень
+  - Липень
+  - Серпень
+  - Вересень
+  - Жовтень
+  - Листопад
+  - Грудень
+DAYS_OF_THE_WEEK:
+  - Понеділок
+  - Вівторок
+  - Середа
+  - Четвер
+  - "П'ятниця"
+  - Субота
+  - Неділя

system/languages/vi.yaml

 ---
-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:
+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
@@ -36,28 +48,28 @@ GRAV:
   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>
+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'
+MONTHS_OF_THE_YEAR:
+  - Tháng 1
+  - Tháng 2
+  - Tháng 3
+  - Tháng 4
+  - Tháng 5
+  - Tháng 6
+  - Tháng 7
+  - Tháng 8
+  - Tháng 9
+  - Tháng 10
+  - Tháng Mười 11
+  - Tháng 12
+DAYS_OF_THE_WEEK:
+  - Thứ 2
+  - Thứ 3
+  - Thứ 4
+  - Thứ 5
+  - Thứ 6
+  - Thứ 7
+  - Chủ Nhật

system/router.php

 <?php
-
 /**
- * @package    Grav\Core
+ * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 if (PHP_SAPI !== 'cli-server') {
-    die('This script cannot be run from browser. Run it from a CLI.');
+    exit('This script cannot be run from browser. Run it from a CLI.');
 }
 
 $_SERVER['PHP_CLI_ROUTER'] = true;
@@ -17,21 +16,11 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N
     return false;
 }
 
-$grav_index = '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';
+$_SERVER['SCRIPT_FILENAME'] = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['SCRIPT_NAME'] = DIRECTORY_SEPARATOR . 'index.php';
+$_SERVER['PHP_SELF'] = 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 'index.php';
 
-require $grav_index;
+error_log(sprintf('%s:%d [%d]: %s', $_SERVER['REMOTE_ADDR'], $_SERVER['REMOTE_PORT'], http_response_code(), $_SERVER['REQUEST_URI']), 4);

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

+<?php
+/**
+ * @package    Grav.Common.Backup
+ *
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, 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 string|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;
+                }
+                if (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

 <?php
-
 /**
- * @package    Grav\Common
+ * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -114,7 +113,7 @@ class Browser
     {
         $version = explode('.', $this->getLongVersion());
 
-        return (int)$version[0];
+        return intval($version[0]);
     }
 
     /**
@@ -135,15 +134,4 @@ 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/Composer.php

 <?php
-
 /**
- * @package    Grav\Common
+ * @package    Grav.Common
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -12,7 +11,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.
@@ -21,12 +20,12 @@ class Composer
      */
     public static function getComposerLocation()
     {
-        if (!\function_exists('shell_exec') || stripos(PHP_OS, 'win') === 0) {
+        if (!function_exists('shell_exec') || strtolower(substr(PHP_OS, 0, 3)) === 'win') {
             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)) {
@@ -47,7 +46,7 @@ class Composer
         $composer = static::getComposerLocation();
 
         if ($composer !== static::DEFAULT_PATH && is_executable($composer)) {
-            $file = fopen($composer, 'rb');
+            $file = fopen($composer, 'r');
             $firstLine = fgets($file);
             fclose($file);
 

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

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, 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\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
 {
-    public function __construct($cacheFolder, array $files, $path)
-    {
-        parent::__construct($cacheFolder, $files, $path);
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 2;
 
-        $this->version = 2;
-    }
+    /**
+     * @var BlueprintSchema  Blueprints object.
+     */
+    protected $object;
 
     /**
      * Returns checksum from the configuration files.

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,6 +12,16 @@ 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.
      */
@@ -23,13 +32,6 @@ 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.
      *
@@ -61,7 +63,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();
         }

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,12 +12,15 @@ use Grav\Common\File\CompiledYamlFile;
 
 class CompiledLanguages extends CompiledBase
 {
-    public function __construct($cacheFolder, array $files, $path)
-    {
-        parent::__construct($cacheFolder, $files, $path);
+    /**
+     * @var int Version number for the compiled file.
+     */
+    public $version = 1;
 
-        $this->version = 1;
-    }
+    /**
+     * @var Languages  Configuration object.
+     */
+    protected $object;
 
     /**
      * Create configuration object.

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -17,24 +16,14 @@ use Grav\Common\Utils;
 
 class Config extends Data
 {
-    public $environment;
-
-    /** @var string */
-    protected $key;
     /** @var string */
     protected $checksum;
-    /** @var int */
-    protected $timestamp = 0;
-    /** @var bool */
     protected $modified = false;
+    protected $timestamp = 0;
 
     public function key()
     {
-        if (null === $this->key) {
-            $this->key = md5($this->checksum . $this->timestamp);
-        }
-
-        return $this->key;
+        return $this->checksum();
     }
 
     public function checksum($checksum = null)
@@ -101,7 +90,7 @@ class Config extends Data
     {
         $setup = Grav::instance()['setup']->toArray();
         foreach ($setup as $key => $value) {
-            if ($key === 'streams' || !\is_array($value)) {
+            if ($key === 'streams' || !is_array($value)) {
                 // Optimized as streams and simple values are fully defined in setup.
                 $this->items[$key] = $value;
             } else {
@@ -109,13 +98,14 @@ class Config extends Data
             }
         }
 
-        // Legacy value - Override the media.upload_limit based on PHP values
-        $this->items['system']['media']['upload_limit'] = Utils::getUploadLimit();
+        // Override the media.upload_limit based on PHP values
+        $upload_limit = Utils::getUploadLimit();
+        $this->items['system']['media']['upload_limit'] = $upload_limit > 0 ? $upload_limit : 1024*1024*1024;
     }
 
     /**
      * @return mixed
-     * @deprecated 1.5 Use Grav::instance()['languages'] instead.
+     * @deprecated
      */
     public function getLanguages()
     {

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,22 +13,6 @@ use Grav\Common\Utils;
 
 class Languages extends Data
 {
-    /**
-     * @var string|null
-     */
-    protected $checksum;
-
-    /**
-     * @var string|null
-     */
-    protected $modified;
-
-    /**
-     * @var string|null
-     */
-    protected $timestamp;
-
-
     public function checksum($checksum = null)
     {
         if ($checksum !== null) {
@@ -69,15 +52,4 @@ class Languages extends Data
     {
         $this->items = Utils::arrayMergeRecursiveUnique($this->items, $data);
     }
-
-    public function flattenByLang($lang)
-    {
-        $language = $this->items[$lang];
-        return Utils::arrayFlattenDotNotation($language);
-    }
-
-    public function unflatten($array)
-    {
-        return Utils::arrayUnflattenDotNotation($array);
-    }
 }

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

 <?php
-
 /**
- * @package    Grav\Common\Config
+ * @package    Grav.Common.Config
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -13,23 +12,11 @@ use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Data\Data;
 use Grav\Common\Utils;
 use Pimple\Container;
-use Psr\Http\Message\ServerRequestInterface;
+use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class Setup extends Data
 {
-    /**
-     * @var array Environment aliases normalized to lower case.
-     */
-    public static $environments = [
-        '' => 'unknown',
-        '127.0.0.1' => 'localhost',
-        '::1' => 'localhost'
-    ];
-
-    /**
-     * @var string Current environment normalized to lower case.
-     */
     public static $environment;
 
     protected $streams = [
@@ -51,7 +38,7 @@ class Setup extends Data
             // If not defined, environment will be set up in the constructor.
         ],
         'asset' => [
-            'type' => 'Stream',
+            'type' => 'ReadOnlyStream',
             'prefixes' => [
                 '' => ['assets'],
             ]
@@ -122,7 +109,7 @@ class Setup extends Data
             ]
         ],
         'image' => [
-            'type' => 'Stream',
+            'type' => 'ReadOnlyStream',
             'prefixes' => [
                 '' => ['user://images', 'system://images']
             ]
@@ -133,13 +120,6 @@ class Setup extends Data
                 '' => ['user://pages']
             ]
         ],
-        'user-data' => [
-            'type' => 'Stream',
-            'force' => true,
-            'prefixes' => [
-                '' => ['user://data']
-            ]
-        ],
         'account' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
@@ -153,26 +133,12 @@ class Setup extends Data
      */
     public function __construct($container)
     {
-        // If no environment is set, make sure we get one (CLI or hostname).
-        if (!static::$environment) {
-            if (\defined('GRAV_CLI')) {
-                static::$environment = 'cli';
-            } else {
-                /** @var ServerRequestInterface $request */
-                $request = $container['request'];
-                $host = $request->getUri()->getHost();
-
-                static::$environment = Utils::substrToString($host, ':');
-            }
-        }
-
-        // Resolve server aliases to the proper environment.
-        $environment = $this->environments[static::$environment] ?? static::$environment;
+        $environment = null !== static::$environment ? static::$environment : ($container['uri']->environment() ?: 'localhost');
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
-        // If "GRAV_SETUP_PATH" has been defined, use it, otherwise use defaults.
-        $file = \defined('GRAV_SETUP_PATH') ? GRAV_SETUP_PATH :  GRAV_ROOT . '/setup.php';
+        // If "GRAVE_SETUP_PATH" has been defined, use it, otherwise use defaults.
+        $file = defined('GRAV_SETUP_PATH') ? GRAV_SETUP_PATH :  GRAV_ROOT . '/setup.php';
         $setup = is_file($file) ? (array) include $file : [];
 
         // Add default streams defined in beginning of the class.
@@ -185,8 +151,8 @@ class Setup extends Data
         parent::__construct($setup);
 
         // Set up environment.
-        $this->def('environment', $environment);
-        $this->def('streams.schemes.environment.prefixes', ['' => ["user://{$this->get('environment')}"]]);
+        $this->def('environment', $environment ?: 'cli');
+        $this->def('streams.schemes.environment.prefixes', ['' => $environment ? ["user://{$this->environment}"] : []]);
     }
 
     /**
@@ -246,8 +212,8 @@ class Setup extends Data
                 $locator->addPath($scheme, '', $config['paths']);
             }
 
-            $override = $config['override'] ?? false;
-            $force = $config['force'] ?? false;
+            $override = isset($config['override']) ? $config['override'] : false;
+            $force = isset($config['force']) ? $config['force'] : false;
 
             if (isset($config['prefixes'])) {
                 foreach ((array)$config['prefixes'] as $prefix => $paths) {
@@ -266,7 +232,7 @@ class Setup extends Data
     {
         $schemes = [];
         foreach ((array) $this->get('streams.schemes') as $scheme => $config) {
-            $type = $config['type'] ?? 'ReadOnlyStream';
+            $type = !empty($config['type']) ? $config['type'] : 'ReadOnlyStream';
             if ($type[0] !== '\\') {
                 $type = '\\RocketTheme\\Toolbox\\StreamWrapper\\' . $type;
             }
@@ -285,8 +251,8 @@ class Setup extends Data
      */
     protected function check(UniformResourceLocator $locator)
     {
-        $streams = $this->items['streams']['schemes'] ?? null;
-        if (!\is_array($streams)) {
+        $streams = isset($this->items['streams']['schemes']) ? $this->items['streams']['schemes'] : null;
+        if (!is_array($streams)) {
             throw new \InvalidArgumentException('Configuration is missing streams.schemes!');
         }
         $diff = array_keys(array_diff_key($this->streams, $streams));
@@ -305,14 +271,10 @@ class Setup extends Data
 
             // Create security.yaml if it doesn't exist.
             $filename = $locator->findResource('config://security.yaml', true, true);
-            $security_file = CompiledYamlFile::instance($filename);
-            $security_content = (array)$security_file->content();
-
-            if (!isset($security_content['salt'])) {
-                $security_content = array_merge($security_content, ['salt' => Utils::generateRandomString(14)]);
-                $security_file->content($security_content);
-                $security_file->save();
-                $security_file->free();
+            $file = YamlFile::instance($filename);
+            if (!$file->exists()) {
+                $file->save(['salt' => Utils::generateRandomString(14)]);
+                $file->free();
             }
         } catch (\RuntimeException $e) {
             throw new \RuntimeException(sprintf('Grav failed to initialize: %s', $e->getMessage()), 500, $e);

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

 <?php
-
 /**
- * @package    Grav\Common\Data
+ * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -14,11 +13,8 @@ use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class Blueprints
 {
-    /** @var array|string */
     protected $search;
-    /** @var array */
     protected $types;
-    /** @var array */
     protected $instances = [];
 
     /**
@@ -39,8 +35,7 @@ class Blueprints
     public function get($type)
     {
         if (!isset($this->instances[$type])) {
-            $blueprint = $this->loadFile($type);
-            $this->instances[$type] = $blueprint;
+            $this->instances[$type] = $this->loadFile($type);
         }
 
         return $this->instances[$type];
@@ -54,7 +49,7 @@ class Blueprints
     public function types()
     {
         if ($this->types === null) {
-            $this->types = [];
+            $this->types = array();
 
             $grav = Grav::instance();
 
@@ -92,7 +87,7 @@ class Blueprints
     {
         $blueprint = new Blueprint($name);
 
-        if (\is_array($this->search) || \is_object($this->search)) {
+        if (is_array($this->search) || is_object($this->search)) {
             // Page types.
             $blueprint->setOverrides($this->search);
             $blueprint->setContext('blueprints://pages');
@@ -100,15 +95,6 @@ class Blueprints
             $blueprint->setContext($this->search);
         }
 
-        try {
-            $blueprint->load()->init();
-        } catch (\RuntimeException $e) {
-            $log = Grav::instance()['log'];
-            $log->error(sprintf('Blueprint %s cannot be loaded: %s', $name, $e->getMessage()));
-
-            throw $e;
-        }
-
-        return $blueprint;
+        return $blueprint->load()->init();
     }
 }

system/src/Grav/Common/Data/DataInterface.php

 <?php
-
 /**
- * @package    Grav\Common\Data
+ * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Data/ValidationException.php

 <?php
-
 /**
- * @package    Grav\Common\Data
+ * @package    Grav.Common.Data
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -19,7 +18,7 @@ class ValidationException extends \RuntimeException
         $this->messages = $messages;
 
         $language = Grav::instance()['language'];
-        $this->message = $language->translate('GRAV.FORM.VALIDATION_FAIL', null, true) . ' ' . $this->message;
+        $this->message = $language->translate('FORM.VALIDATION_FAIL', null, true) . ' ' . $this->message;
 
         foreach ($messages as $variable => &$list) {
             $list = array_unique($list);

system/src/Grav/Common/Errors/BareHandler.php

 <?php
-
 /**
- * @package    Grav\Common\Errors
+ * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 

system/src/Grav/Common/Errors/Errors.php

 <?php
-
 /**
- * @package    Grav\Common\Errors
+ * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
@@ -18,11 +17,11 @@ class Errors
     {
         $grav = Grav::instance();
         $config = $grav['config']->get('system.errors');
-        $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] === 'application/json';
+        $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] == 'application/json';
 
         // Setup Whoops-based error handler
         $system = new SystemFacade;
-        $whoops = new Whoops\Run($system);
+        $whoops = new \Whoops\Run($system);
 
         $verbosity = 1;
 
@@ -50,9 +49,18 @@ class Errors
                 break;
         }
 
+        if (method_exists('Whoops\Util\Misc', 'isAjaxRequest')) { //Whoops 2.0
             if (Whoops\Util\Misc::isAjaxRequest() || $jsonRequest) {
                 $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
             }
+        } elseif (function_exists('Whoops\isAjaxRequest')) { //Whoops 2.0.0-alpha
+            if (Whoops\isAjaxRequest() || $jsonRequest) {
+                $whoops->pushHandler(new Whoops\Handler\JsonResponseHandler);
+            }
+        } else { //Whoops 1.x
+            $json_page = new Whoops\Handler\JsonResponseHandler;
+            $json_page->onlyForAjaxRequests(true);
+        }
 
         if (isset($config['log']) && $config['log']) {
             $logger = $grav['log'];
@@ -62,7 +70,7 @@ class Errors
                 } catch (\Exception $e) {
                     echo $e;
                 }
-            });
+            }, 'log');
         }
 
         $whoops->register();

system/src/Grav/Common/Errors/SystemFacade.php

 <?php
-
 /**
- * @package    Grav\Common\Errors
+ * @package    Grav.Common.Errors
  *
- * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */