From 85d3fe506fcc1353064027d347b4d28cc01bc756 Mon Sep 17 00:00:00 2001 From: Andriy Chaika Date: Sun, 10 Jul 2011 17:17:13 +0300 Subject: [PATCH 1/3] =?UTF-8?q?[0.4]=20/RU11071017/=20/UA11071016/=20?= =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/NCL.NameCase.ru.php | 4 ++-- Library/NCL.NameCase.ua.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/NCL.NameCase.ru.php b/Library/NCL.NameCase.ru.php index c049fed..db1f81e 100644 --- a/Library/NCL.NameCase.ru.php +++ b/Library/NCL.NameCase.ru.php @@ -26,7 +26,7 @@ class NCLNameCaseRu extends NCLNameCaseCore * Версия языкового файла * @var string */ - protected $languageBuild = '11071015'; + protected $languageBuild = '11071017'; /** * Количество падежей в языке @@ -532,7 +532,7 @@ class NCLNameCaseRu extends NCLNameCaseCore $woman+=0.15; } - if ($this->in($this->Last(3), array('лия', 'ния', 'сия', 'дра', 'лла', 'кла'))) + if ($this->in($this->Last(3), array('лия', 'ния', 'сия', 'дра', 'лла', 'кла', 'опа'))) { $woman+=0.5; } diff --git a/Library/NCL.NameCase.ua.php b/Library/NCL.NameCase.ua.php index 8eb5c65..6f729e6 100644 --- a/Library/NCL.NameCase.ua.php +++ b/Library/NCL.NameCase.ua.php @@ -26,7 +26,7 @@ class NCLNameCaseUa extends NCLNameCaseCore * Версия языкового файла * @var string */ - protected $languageBuild = '11071011'; + protected $languageBuild = '11071016'; /** * Количество падежей в языке @@ -610,7 +610,7 @@ class NCLNameCaseUa extends NCLNameCaseCore $man+=0.9; } - if ($this->inNames($this->workingWord, 'Петро')) + if ($this->inNames($this->workingWord, array('Петро', 'Микола'))) { $man+=30; } From 635820ae501d9aaae6ea1da20a0026f1481c0de1 Mon Sep 17 00:00:00 2001 From: Andriy Chaika Date: Sun, 10 Jul 2011 17:20:21 +0300 Subject: [PATCH 2/3] =?UTF-8?q?[0.4]=20/UA11071017/=20=D0=9E=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/NCL.NameCase.ua.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/NCL.NameCase.ua.php b/Library/NCL.NameCase.ua.php index 6f729e6..4aa5da7 100644 --- a/Library/NCL.NameCase.ua.php +++ b/Library/NCL.NameCase.ua.php @@ -26,7 +26,7 @@ class NCLNameCaseUa extends NCLNameCaseCore * Версия языкового файла * @var string */ - protected $languageBuild = '11071016'; + protected $languageBuild = '11071017'; /** * Количество падежей в языке @@ -620,7 +620,7 @@ class NCLNameCaseUa extends NCLNameCaseCore $man+=0.5; } - if ($this->in($this->Last(3), array('бов', 'нка', 'яра', 'ила'))) + if ($this->in($this->Last(3), array('бов', 'нка', 'яра', 'ила', 'опа'))) { $woman+=0.5; } From d637519c5f79995ecb2498c9ed8afe0812dfd43e Mon Sep 17 00:00:00 2001 From: Andriy Chaika Date: Sun, 10 Jul 2011 17:25:02 +0300 Subject: [PATCH 3/3] =?UTF-8?q?[0.4]=20/UA11071017/=20=D0=9E=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/NCL.NameCase.ru.php | 2 +- Library/NCL.NameCase.ua.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/NCL.NameCase.ru.php b/Library/NCL.NameCase.ru.php index db1f81e..ff3c34e 100644 --- a/Library/NCL.NameCase.ru.php +++ b/Library/NCL.NameCase.ru.php @@ -628,7 +628,7 @@ class NCLNameCaseRu extends NCLNameCaseCore } //похоже на фамилию - if ($this->in($this->Last(2), array('ов', 'ин', 'ев', 'ёв', 'ый', 'ын', 'ой', 'ко', 'ук', 'як', 'ца', 'их', 'ик', 'ун', 'ок', 'ша', 'ая', 'га', 'ёк', 'аш', 'ив', 'юк', 'ус', 'це', 'ак', 'бр', 'яр', 'де', 'ых'))) + if ($this->in($this->Last(2), array('ов', 'ин', 'ев', 'ёв', 'ый', 'ын', 'ой', 'ко', 'ук', 'як', 'ца', 'их', 'ик', 'ун', 'ок', 'ша', 'ая', 'га', 'ёк', 'аш', 'ив', 'юк', 'ус', 'це', 'ак', 'бр', 'яр', 'де', 'ых', 'уз'))) { $second+=0.4; } diff --git a/Library/NCL.NameCase.ua.php b/Library/NCL.NameCase.ua.php index 4aa5da7..ad88415 100644 --- a/Library/NCL.NameCase.ua.php +++ b/Library/NCL.NameCase.ua.php @@ -22,12 +22,12 @@ require_once dirname(__FILE__) . '/NCL/NCLNameCaseCore.php'; */ class NCLNameCaseUa extends NCLNameCaseCore { + /** * Версия языкового файла * @var string */ protected $languageBuild = '11071017'; - /** * Количество падежей в языке * @var int @@ -731,7 +731,7 @@ class NCLNameCaseUa extends NCLNameCaseCore } //похоже на фамилию - if ($this->in($this->Last(2), array('ов', 'ін', 'ев', 'єв', 'ий', 'ин', 'ой', 'ко', 'ук', 'як', 'ца', 'их', 'ик', 'ун', 'ок', 'ша', 'ая', 'га', 'єк', 'аш', 'ив', 'юк', 'ус', 'це', 'ак', 'бр', 'яр', 'іл', 'ів', 'ич', 'сь', 'ей', 'нс', 'яс', 'ер', 'ай', 'ян', 'ах', 'ць', 'ющ', 'іс', 'ач', 'уб', 'ох', 'юх', 'ут', 'ча', 'ул', 'вк', 'зь', 'уц', 'їн', 'де' /* {endings_name2} */))) + if ($this->in($this->Last(2), array('ов', 'ін', 'ев', 'єв', 'ий', 'ин', 'ой', 'ко', 'ук', 'як', 'ца', 'их', 'ик', 'ун', 'ок', 'ша', 'ая', 'га', 'єк', 'аш', 'ив', 'юк', 'ус', 'це', 'ак', 'бр', 'яр', 'іл', 'ів', 'ич', 'сь', 'ей', 'нс', 'яс', 'ер', 'ай', 'ян', 'ах', 'ць', 'ющ', 'іс', 'ач', 'уб', 'ох', 'юх', 'ут', 'ча', 'ул', 'вк', 'зь', 'уц', 'їн', 'де', 'уз' /* {endings_name2} */))) { $second+=0.4; } @@ -746,11 +746,11 @@ class NCLNameCaseUa extends NCLNameCaseCore $second+=0.4; } - if ($this->Last(1)=='і') + if ($this->Last(1) == 'і') { $second+=0.2; } - + $max = max(array($first, $second, $father)); if ($first == $max)