Author: ornicar2
Date: 2010-01-21 16:09:55 +0100 (Thu, 21 Jan 2010)
New Revision: 27001
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmTransliterationTest.php
Log:
[Diem]
- fixed transliteration loading
- improved transliteration unit tests
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php 2010-01-21
14:54:03 UTC (rev 27000)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php 2010-01-21
15:09:55 UTC (rev 27001)
@@ -142,20 +142,20 @@
$this->culture = sfConfig::get('sf_default_culture');
}
- $this->loadTransliterationStrings();
+ $this->loadTransliterationStrings($this->getCultures());
}
- protected function loadTransliterationStrings()
+ public function loadTransliterationStrings(array $cultures)
{
$filePattern = dmOs::join(sfConfig::get('dm_core_dir'),
'data/dm/transliteration/%s.php');
$transliterationMap = include(sprintf($filePattern, 'default'));
- foreach($this->getCultures() as $culture)
+ foreach($cultures as $culture)
{
if(file_exists(sprintf($filePattern, $culture)))
{
- $transliterationMap = array_merge($transliterationMap,
include(sprintf($filePattern, $this->getCulture())));
+ $transliterationMap = array_merge($transliterationMap,
include(sprintf($filePattern, $culture)));
}
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmTransliterationTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmTransliterationTest.php
2010-01-21 14:54:03 UTC (rev 27000)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmTransliterationTest.php
2010-01-21 15:09:55 UTC (rev 27001)
@@ -6,6 +6,8 @@
$t = new lime_test(21);
+$helper->get('i18n')->loadTransliterationStrings(array('en', 'ru'));
+
$tests = array(
'en' => array(
'test' => 'test',
@@ -17,7 +19,7 @@
'Ï' => 'I',
'Ð' => 'D',
'œÐú' => 'oeDu',
- 'ж'=>'ж',
+ 'ж'=>'zh',
),
'ru' => array(
'test' => 'test',
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
