From b39fc72bd2248a5c499c74a30188c733f9ce384c Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 8 May 2019 14:22:47 -0600 Subject: [PATCH] Update languages --- CHANGELOG.md | 21 +++--- system/languages/es.yaml | 2 +- system/languages/et.yaml | 23 ++++++ system/languages/fr.yaml | 2 + system/languages/is.yaml | 11 +++ system/languages/pt.yaml | 9 +++ system/languages/sk.yaml | 84 +++++++++++++++++++++ system/languages/sv.yaml | 11 +++ system/languages/zh-tw.yaml | 28 ++++++- system/languages/zh.yaml | 145 ++++++++++++++++++++++++++++-------- 10 files changed, 289 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba9a42072..5cf7ab0c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,13 @@ 1. [](#new) * Added `Route::withoutParams()` methods * Added `Pages::setCheckMethod()` method to override page configuration in Admin Plugin - * Added `Cache::clearCache('invalidate')` parameter for just invalidating the cache without deleting any cached files + * Added `Cache::clearCache('invalidate')` parameter for just invalidating the cache without deleting any cached files * Made `UserCollectionInderface` to extend `Countable` to get the count of existing users 1. [](#improved) * Flex admin: added default search options for flex objects * Flex collection and object now fall back to the default template if template file doesn't exist * Updated Vendor libraries including Twig 1.40.1 + * Updated language files from `https://crowdin.com/project/grav-core` 1. [](#bugfix) * Fixed `$grav['route']` from being modified when the route instance gets modified * Fixed Assets options array mixed with standalone priority [#2477](https://github.com/getgrav/grav/issues/2477) @@ -50,18 +51,18 @@ ## 04/17/2019 1. [](#new) - * `FormInterface` now implements `RenderInterface` - * Added new `FormInterface::getTask()` method which reads the task from `form.task` in the blueprint + * `FormInterface` now implements `RenderInterface` + * Added new `FormInterface::getTask()` method which reads the task from `form.task` in the blueprint 1. [](#improved) * Updated vendor libraries to latest 1. [](#bugfix) * Rollback `redirect_default_route` logic as it has issues with multi-lang [#2459](https://github.com/getgrav/grav/issues/2459) - * Fix potential issue with `|contains` Twig filter on PHP 7.3 + * Fix potential issue with `|contains` Twig filter on PHP 7.3 * Fixed bug in text field filtering: return empty string if value isn't a string or number [#2460](https://github.com/getgrav/grav/issues/2460) * Force Asset `priority` to be an integer and not throw error if invalid string passed [#2461](https://github.com/getgrav/grav/issues/2461) * Fixed bug in text field filtering: return empty string if value isn't a string or number * Fixed `FlexForm` missing getter methods for defining form variables - + # v1.6.5 ## 04/15/2019 @@ -122,7 +123,7 @@ * Added `Grav\Framework\Object\ObjectIndex` class * Added `Grav\Framework\Flex` classes * Added support for hiding form fields in blueprints by using dynamic property like `security@: admin.foobar`, `scope@: object` or `scope-ignore@: object` to any field - * New experimental **FlexObjects** powered `Users` for increased performance and capability (**disabled** by default) + * New experimental **FlexObjects** powered `Users` for increased performance and capability (**disabled** by default) * Added PSR-7 and PSR-15 classes * Added `Grav\Framework\DI\Container` class * Added `Grav\Framework\RequestHandler\RequestHandler` class @@ -198,7 +199,7 @@ * Added ability to reset `Page::metadata` to allow rebuilding from automatically generated values * Added back missing `page.types` field in system content configuration [admin#1612](https://github.com/getgrav/grav-plugin-admin/issues/1612) * Console commands: add method for invalidating cache - * Updated languages + * Updated languages * Improved `$page->forms()` call, added `$page->addForms()` * Updated languages from crowdin * Fixed `ImageMedium` constructor warning when file does not exist @@ -219,7 +220,7 @@ * Added apcu autoloader optimization * Additional helper methods in `Language`, `Languages`, and `LanguageCodes` classes * Call `onFatalException` event also on internal PHP errors - * Built-in PHP Webserver: log requests before handling them + * Built-in PHP Webserver: log requests before handling them * Added support for syslog and syslog facility logging (default: 'file') * Improved usability of `System` configuration blueprint with side-tabs 1. [](#bugfix) @@ -244,7 +245,7 @@ * Fixed failed login if user attempts to log in with upper case non-english letters * Removed extra authenticated/authorized fields when saving existing user from a form * Fixed `Grav\Framework\Route::__toString()` returning relative URL, not relative route - * Fixed handling of `append_url_extension` inside of `Page::templateFormat()` [#2264](https://github.com/getgrav/grav/issues/2264) + * Fixed handling of `append_url_extension` inside of `Page::templateFormat()` [#2264](https://github.com/getgrav/grav/issues/2264) * Fixed a broken language string [#2261](https://github.com/getgrav/grav/issues/2261) * Fixed clearing cache having no effect on Doctrine cache * Fixed `Medium::relativePath()` for streams @@ -297,7 +298,7 @@ * Updated vendor libraries 1. [](#bugfix) * Support spaces with filenames in responsive images [#2300](https://github.com/getgrav/grav/pull/2300) - + # v1.5.6 ## 12/14/2018 diff --git a/system/languages/es.yaml b/system/languages/es.yaml index ce990eea5..7bacfeb98 100644 --- a/system/languages/es.yaml +++ b/system/languages/es.yaml @@ -23,7 +23,7 @@ GRAV: BAD_DATE: Fecha errónea AGO: antes FROM_NOW: desde ahora - JUST_NOW: justo ahora + JUST_NOW: hace un momento SECOND: segundo MINUTE: minuto HOUR: hora diff --git a/system/languages/et.yaml b/system/languages/et.yaml index fd794ada0..619aa1a73 100644 --- a/system/languages/et.yaml +++ b/system/languages/et.yaml @@ -1,11 +1,30 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_UNCOUNTABLE: + - 'equipment' + - 'informatsioon' + - 'rice' + - 'money' + - 'species' + - 'series' + - 'kala' + - 'lammas' + INFLECTOR_IRREGULAR: + 'person': 'inimesed' + 'man': 'mees' + 'child': 'lapsed' + INFLECTOR_ORDINALS: + 'default': '.' + 'first': '.' + 'second': '.' + 'third': '.' NICETIME: NO_DATE_PROVIDED: Kuupäev määramata BAD_DATE: Vigane kuupäev AGO: tagasi FROM_NOW: praegusest + JUST_NOW: just nüüd SECOND: sekund MINUTE: minut HOUR: tundi @@ -60,3 +79,7 @@ GRAV: - 'reede' - 'laupäev' - 'pühapäev' + CRON: + EVERY: iga + EVERY_MONTH: iga kuu + TEXT_PERIOD: Iga diff --git a/system/languages/fr.yaml b/system/languages/fr.yaml index fe2cbb768..9284f7e6d 100644 --- a/system/languages/fr.yaml +++ b/system/languages/fr.yaml @@ -14,6 +14,8 @@ GRAV: '/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' diff --git a/system/languages/is.yaml b/system/languages/is.yaml index 55384faf7..6f9761ca1 100644 --- a/system/languages/is.yaml +++ b/system/languages/is.yaml @@ -11,6 +11,8 @@ GRAV: - 'fish' - 'sheep' NICETIME: + NO_DATE_PROVIDED: Engin dagsetning gefin + BAD_DATE: Röng dagsetning AGO: síðan JUST_NOW: í þessu SECOND: sekúndu @@ -45,6 +47,7 @@ GRAV: DEC_PLURAL: árat FORM: VALIDATION_FAIL: Sannvottun mistókst: + INVALID_INPUT: Ógilt inntak í MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:' MONTHS_OF_THE_YEAR: - 'janúar' @@ -67,3 +70,11 @@ GRAV: - 'Föstudagur' - 'Laugardagur' - 'Sunnudagur' + CRON: + TEXT_TIME: ' á :' + TEXT_DOW: ' á ' + TEXT_MONTH: ' af ' + TEXT_DOM: ' á ' + ERROR1: Merkið %s er ekki stutt! + ERROR3: Það ætti að setja jquery_element inn í stillingar jqCron + ERROR4: Óþekkt segð diff --git a/system/languages/pt.yaml b/system/languages/pt.yaml index bddd85620..590b5e581 100644 --- a/system/languages/pt.yaml +++ b/system/languages/pt.yaml @@ -35,3 +35,12 @@ GRAV: - 'Outubro' - 'Novembro' - 'Dezembro' + INFLECTOR_UNCOUNTABLE: + - 'equipment' + - 'information' + - 'arroz' + - 'money' + - 'species' + - 'series' + - 'fish' + - 'sheep' diff --git a/system/languages/sk.yaml b/system/languages/sk.yaml index 3defc36ed..89a7f563e 100644 --- a/system/languages/sk.yaml +++ b/system/languages/sk.yaml @@ -1,10 +1,75 @@ --- GRAV: + FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Chyba: Chybný frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - 'vybavenie' + - 'informácie' + - 'ryža' + - 'peniaze' + - 'druhy' + - 'séria' + - 'ryba' + - 'ovce' + INFLECTOR_IRREGULAR: + 'person': 'ľudia' + 'man': 'muži' + 'child': 'deti' + 'sex': 'pohlavia' + 'move': 'pohyby' + INFLECTOR_ORDINALS: + 'default': '.' + 'first': '.' + 'second': '.' + 'third': '.' NICETIME: NO_DATE_PROVIDED: Neposkytnutý žiaden dátum BAD_DATE: Nesprávny dátum AGO: pred FROM_NOW: odteraz + JUST_NOW: práve teraz SECOND: sekunda MINUTE: minúta HOUR: hodina @@ -14,10 +79,12 @@ GRAV: YEAR: rok DECADE: desaťročie SEC: sek + MIN: min HR: hod WK: t MO: m YR: r + DEC: dec SECOND_PLURAL: sekúnd MINUTE_PLURAL: minút HOUR_PLURAL: hodín @@ -58,3 +125,20 @@ GRAV: - '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ý + TEXT_MINS: ' at minute(s) past the hour' + TEXT_TIME: ' at :' + TEXT_DOW: ' on ' + TEXT_MONTH: ' of ' + TEXT_DOM: ' on ' + 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 diff --git a/system/languages/sv.yaml b/system/languages/sv.yaml index e386c8c13..16afa1650 100644 --- a/system/languages/sv.yaml +++ b/system/languages/sv.yaml @@ -1,6 +1,17 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```" + INFLECTOR_UNCOUNTABLE: + - 'utrustning' + - 'information' + - 'ris' + - 'pengar' + - 'arter' + - 'serier' + - 'fisk' + - 'får' + INFLECTOR_IRREGULAR: + 'person': 'personer' NICETIME: NO_DATE_PROVIDED: Inget datum har angivits BAD_DATE: Ogiltigt datum diff --git a/system/languages/zh-tw.yaml b/system/languages/zh-tw.yaml index 6ecfcc375..6cb39c9ad 100644 --- a/system/languages/zh-tw.yaml +++ b/system/languages/zh-tw.yaml @@ -1,24 +1,44 @@ --- GRAV: + FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# 錯誤： 不正確的 Frontmatter\n\n路徑： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" NICETIME: + NO_DATE_PROVIDED: 沒有提供日期 + BAD_DATE: 錯誤日期 + AGO: 之前 + FROM_NOW: 之後 + JUST_NOW: 剛剛 SECOND: 秒 MINUTE: 分 HOUR: 小時 + DAY: 天 + WEEK: 週 + MONTH: 月 + YEAR: 年 + DECADE: 十年 + SEC: 秒 + MIN: 分 + HR: 小時 + WK: 週 + MO: 月 + YR: 年 + DEC: 十年 SECOND_PLURAL: 秒 MINUTE_PLURAL: 分 - HOUR_PLURAL: 時 - DAY_PLURAL: 日 - WEEK_PLURAL: 周 + HOUR_PLURAL: 小時 + DAY_PLURAL: 天 + WEEK_PLURAL: 週 MONTH_PLURAL: 月 YEAR_PLURAL: 年 DECADE_PLURAL: 十年 SEC_PLURAL: 秒 MIN_PLURAL: 分 HR_PLURAL: 時 - WK_PLURAL: 周 + WK_PLURAL: 週 MO_PLURAL: 月 YR_PLURAL: 年 DEC_PLURAL: 十年 + FORM: + MISSING_REQUIRED_FIELD: 遺漏必填欄位： MONTHS_OF_THE_YEAR: - '一月' - '二月' diff --git a/system/languages/zh.yaml b/system/languages/zh.yaml index 9ae1cdb86..4912aa9ed 100644 --- a/system/languages/zh.yaml +++ b/system/languages/zh.yaml @@ -1,57 +1,122 @@ --- 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```" + FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误：无效参数\n\n位置： `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - '装备' + - '信息' + - '大米' + - '钱' + - '物种' + - '系列' + - '鱼' + - '羊' + INFLECTOR_IRREGULAR: + 'person': '人员' + 'man': '男人' + 'child': '儿童' + 'sex': '性别' + 'move': '移动' + INFLECTOR_ORDINALS: + 'default': 'th' + 'first': 'st' + 'second': 'md' + 'third': 'rd' NICETIME: - NO_DATE_PROVIDED: 沒有提供日期 - BAD_DATE: 錯誤日期 - AGO: 之前 - FROM_NOW: 之後 - JUST_NOW: 剛剛 + NO_DATE_PROVIDED: 无日期信息 + BAD_DATE: 无效日期 + AGO: 前 + FROM_NOW: 距今 + JUST_NOW: 刚刚 SECOND: 秒 - MINUTE: 分 - HOUR: 小時 + MINUTE: 分钟 + HOUR: 小时 DAY: 天 - WEEK: 週 + WEEK: 周 MONTH: 月 YEAR: 年 DECADE: 十年 SEC: 秒 - MIN: 分 - HR: 小時 - WK: 週 + MIN: 分钟 + HR: 小时 + WK: 周 MO: 月 YR: 年 - DEC: 十年 + DEC: 年代 SECOND_PLURAL: 秒 MINUTE_PLURAL: 分 - HOUR_PLURAL: 小時 + HOUR_PLURAL: 小时 DAY_PLURAL: 天 - WEEK_PLURAL: 週 + WEEK_PLURAL: 周 MONTH_PLURAL: 月 YEAR_PLURAL: 年 DECADE_PLURAL: 十年 SEC_PLURAL: 秒 MIN_PLURAL: 分 - HR_PLURAL: 時 - WK_PLURAL: 週 + HR_PLURAL: 时 + WK_PLURAL: 周 MO_PLURAL: 月 YR_PLURAL: 年 - DEC_PLURAL: 十年 + DEC_PLURAL: 年代 FORM: - MISSING_REQUIRED_FIELD: 遺漏必填欄位： + VALIDATION_FAIL: 验证失败： + 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: - '星期一' - '星期二' @@ -60,4 +125,20 @@ GRAV: - '星期五' - '星期六' - '星期日' - + CRON: + EVERY: 每隔 + EVERY_HOUR: 每小时 + EVERY_MINUTE: 每分钟 + EVERY_DAY_OF_WEEK: 一周中的每一天 + EVERY_DAY_OF_MONTH: 月份中的每一天 + EVERY_MONTH: 每月 + TEXT_PERIOD: 所有 + TEXT_MINS: ' 在 小时过后的分钟' + TEXT_TIME: ' 在 :' + TEXT_DOW: ' on ' + TEXT_MONTH: ' of ' + TEXT_DOM: ' on ' + ERROR1: 不支持分享类型 %s + ERROR2: 无效数字 + ERROR3: 请在 jqCron 设置中设定 jquery_element + ERROR4: 无法识别表达式