From f426017a9ece7d6e621fd3f46f16df594aca1d76 Mon Sep 17 00:00:00 2001 From: jperras Date: Sun, 2 Aug 2009 19:00:30 +0000 Subject: [PATCH] Changing l10n language name from 'Slovack' to 'Slovak', as per ISO 693-1 guidelines. Thanks to savant for the patch. Fixes #5870. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8272 3807eeeb-6ff5-0310-8944-8be069107fe0 --- cake/libs/l10n.php | 6 +++--- cake/tests/cases/libs/l10n.test.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php index 0df50204a..95f66c257 100644 --- a/cake/libs/l10n.php +++ b/cake/libs/l10n.php @@ -150,8 +150,8 @@ class L10n extends Object { /* Sami (Lappish) */ 'smi' => 'sz', /* Serbian */ 'scc' => 'sr', /* Serbian */ 'srp' => 'sr', - /* Slovack */ 'slo' => 'sk', - /* Slovack */ 'slk' => 'sk', + /* Slovak */ 'slo' => 'sk', + /* Slovak */ 'slk' => 'sk', /* Slovenian */ 'slv' => 'sl', /* Sorbian */ 'wen' => 'sb', /* Spanish (Spain - Traditional) */ 'spa' => 'es', @@ -290,7 +290,7 @@ class L10n extends Object { 'ro-mo' => array('language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'rum', 'charset' => 'utf-8'), 'ru-mo' => array('language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8'), 'sb' => array('language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8'), - 'sk' => array('language' => 'Slovack', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8'), + 'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8'), 'sl' => array('language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8'), 'sq' => array('language' => 'Albanian', 'locale' => 'alb', 'localeFallback' => 'alb', 'charset' => 'utf-8'), 'sr' => array('language' => 'Serbian', 'locale' => 'scc', 'localeFallback' => 'scc', 'charset' => 'utf-8'), diff --git a/cake/tests/cases/libs/l10n.test.php b/cake/tests/cases/libs/l10n.test.php index f3aaea211..48df8fa3c 100644 --- a/cake/tests/cases/libs/l10n.test.php +++ b/cake/tests/cases/libs/l10n.test.php @@ -848,7 +848,7 @@ class L10nTest extends CakeTestCase { $result = $l10n->catalog(array('sk')); $expected = array( - 'sk' => array('language' => 'Slovack', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8') + 'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8') ); $this->assertEqual($result, $expected);