diff --git a/system/languages/hr.yaml b/system/languages/hr.yaml index 0d84281c5..3dbd80218 100644 --- a/system/languages/hr.yaml +++ b/system/languages/hr.yaml @@ -26,12 +26,18 @@ NICETIME: YR: g DEC: des SECOND_PLURAL: sekundi + SECOND_PLURAL_MORE_THAN_TWO: sekunde MINUTE_PLURAL: minuta + MINUTE_PLURAL_MORE_THAN_TWO: minute HOUR_PLURAL: sati + HOUR_PLURAL_MORE_THAN_TWO: sata DAY_PLURAL: dana WEEK_PLURAL: tjedana + WEEK_PLURAL_MORE_THAN_TWO: tjedna MONTH_PLURAL: mjeseci + MONTH_PLURAL_MORE_THAN_TWO: mjeseca YEAR_PLURAL: godina + YEAR_PLURAL_MORE_THAN_TWO: godine DECADE_PLURAL: desetljeća SEC_PLURAL: sek MIN_PLURAL: min diff --git a/system/src/Grav/Common/Data/Blueprint.php b/system/src/Grav/Common/Data/Blueprint.php index 8598d8436..3e1dc1f09 100644 --- a/system/src/Grav/Common/Data/Blueprint.php +++ b/system/src/Grav/Common/Data/Blueprint.php @@ -242,9 +242,6 @@ class Blueprint implements \ArrayAccess, ExportInterface if ($rule) { // Item has been defined in blueprints. - if (is_array($field) && count($field) == 1 && reset($field) == '') { - continue; - } $field = Validation::filter($field, $rule); } elseif (is_array($field) && is_array($val)) { // Array has been defined in blueprints. @@ -338,7 +335,7 @@ class Blueprint implements \ArrayAccess, ExportInterface } else if ($field['type'] !== 'ignore') { $this->rules[$prefix . $key] = &$field; $this->addProperty($prefix . $key); - + if ($field['type'] === 'list') { // we loop through list to get the actual field foreach($field['fields'] as $subName => &$subField) { @@ -347,7 +344,7 @@ class Blueprint implements \ArrayAccess, ExportInterface } else { $this->parseFormField($field); } - + if (isset($field['validate']['rule']) && $field['type'] !== 'ignore') { $field['validate'] += $this->getRule($field['validate']['rule']); } diff --git a/system/src/Grav/Common/Language/LanguageCodes.php b/system/src/Grav/Common/Language/LanguageCodes.php index 2683c8b0a..86b130a90 100644 --- a/system/src/Grav/Common/Language/LanguageCodes.php +++ b/system/src/Grav/Common/Language/LanguageCodes.php @@ -193,7 +193,7 @@ class LanguageCodes ], "fr" => [ "name" => "French", - "nativeName" => "français" + "nativeName" => "Français" ], "ff" => [ "name" => "Fula", diff --git a/web.config b/web.config index c3dd31424..e09e94fb5 100644 --- a/web.config +++ b/web.config @@ -46,7 +46,7 @@ - +