From 500c548af49eb60e15fb97d01b4c62a7c919be5f Mon Sep 17 00:00:00 2001 From: Kruno H Date: Thu, 26 Nov 2015 22:48:02 +0100 Subject: [PATCH 1/4] Update hr.yaml added PLURAL_MORE_THAN_TWO translations --- system/languages/hr.yaml | 6 ++++++ 1 file changed, 6 insertions(+) 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 From 2b1a102efa63f0dd128e7e488a2d3536e9fb4b05 Mon Sep 17 00:00:00 2001 From: nazwa Date: Thu, 26 Nov 2015 22:18:27 +0000 Subject: [PATCH 2/4] Web.config update web.config now correctly allows for static files inside vendor folder, just like .htaccess --- web.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web.config b/web.config index c3dd31424..e09e94fb5 100644 --- a/web.config +++ b/web.config @@ -46,7 +46,7 @@ - + From b399d8e3b970ae047f94a103ddfc193b03d1d9d4 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 27 Nov 2015 19:27:58 +0100 Subject: [PATCH 3/4] Drop check used by the array field, introduced by https://github.com/getgrav/grav/commit/57b18edb559ea4dbaff3b89177492bf99ad2a4a3 --- system/src/Grav/Common/Data/Blueprint.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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']); } From 1465c26b1fa203f4d19b26a3fb2771288c50b89a Mon Sep 17 00:00:00 2001 From: AQNOUCH Mohammed Date: Sat, 28 Nov 2015 19:20:59 +0000 Subject: [PATCH 4/4] =?UTF-8?q?Change=20the=20first=20letter=20of=20the=20?= =?UTF-8?q?word=20'fran=C3=A7ais'=20to=20uppercase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- system/src/Grav/Common/Language/LanguageCodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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",