Author: ornicar2
Date: 2010-01-20 17:03:35 +0100 (Wed, 20 Jan 2010)
New Revision: 26948
Added:
plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/
plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/default.php
plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/ru.php
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/basic/dmString.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php
Log:
[Diem]
- fixed transliteration on dm:setup
- moved transliteration arrays to separate files
Added: plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/default.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/default.php
(rev 0)
+++ plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/default.php
2010-01-20 16:03:35 UTC (rev 26948)
@@ -0,0 +1,20 @@
+<?php
+
+return array(
+ '¥' => 'Y', 'µ' => 'u', 'À' => 'A', 'Á' => 'A',
+ 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
+ 'Æ' => 'A', 'Ç' => 'C', 'È' => 'E', 'É' => 'E',
+ 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I',
+ 'Î' => 'I', 'Ï' => 'I', 'Ð' => 'D', 'Ñ' => 'N',
+ 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O',
+ 'Ö' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U',
+ 'Û' => 'U', 'Ü' => 'U', 'Ý' => 'Y', 'ß' => 'ss',
+ 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a',
+ 'ä' => 'a', 'å' => 'a', 'æ' => 'a', 'ç' => 'c',
+ 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+ 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
+ 'ð' => 'o', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o',
+ 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o',
+ 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
+ 'ý' => 'y', 'ÿ' => 'y', 'œ' => 'oe'
+);
\ No newline at end of file
Added: plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/ru.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/ru.php
(rev 0)
+++ plugins/diemPlugin/trunk/dmCorePlugin/data/dm/transliteration/ru.php
2010-01-20 16:03:35 UTC (rev 26948)
@@ -0,0 +1,19 @@
+<?php
+
+return array(
+ 'Г'=>'G','Ё'=>'YO','Е'=>'E','Й'=>'YI','И'=>'I',
+ 'и'=>'i','г'=>'g','ё'=>'yo','№'=>'#','е'=>'e',
+ 'й'=>'yi','А'=>'A','Б'=>'B','В'=>'V','Г'=>'G',
+ 'Д'=>'D','Е'=>'E','Ж'=>'ZH','З'=>'Z','И'=>'I',
+ 'Й'=>'Y','К'=>'K','Л'=>'L','М'=>'M','Н'=>'N',
+ 'О'=>'O','П'=>'P','Р'=>'R','С'=>'S','Т'=>'T',
+ 'У'=>'U','Ф'=>'F','Х'=>'H','Ц'=>'TS','Ч'=>'CH',
+ 'Ш'=>'SH','Щ'=>'SCH','Ъ'=>'','Ы'=>'YI','Ь'=>'',
+ 'Э'=>'E','Ю'=>'YU','Я'=>'YA','а'=>'a','б'=>'b',
+ 'в'=>'v','г'=>'g','д'=>'d','е'=>'e','ж'=>'zh',
+ 'з'=>'z','и'=>'i','й'=>'y','к'=>'k','л'=>'l',
+ 'м'=>'m','н'=>'n','о'=>'o','п'=>'p','р'=>'r',
+ 'с'=>'s','т'=>'t','у'=>'u','ф'=>'f','х'=>'h',
+ 'ц'=>'ts','ч'=>'ch','ш'=>'sh','щ'=>'sch','ъ'=>'',
+ 'ы'=>'yi','ь'=>'','э'=>'e','ю'=>'yu','я'=>'ya'
+);
\ No newline at end of file
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/basic/dmString.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/basic/dmString.php
2010-01-20 15:45:50 UTC (rev 26947)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/basic/dmString.php
2010-01-20 16:03:35 UTC (rev 26948)
@@ -152,6 +152,11 @@
{
return $text;
}
+
+ if(!sfConfig::get('dm_string_transliteration'))
+ {
+ sfConfig::set('dm_string_transliteration',
include(dmOs::join(sfConfig::get('dm_core_dir'),
'data/dm/transliteration/default.php')));
+ }
$text = strtr($text, sfConfig::get('dm_string_transliteration'));
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php 2010-01-20
15:45:50 UTC (rev 26947)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/i18n/dmI18n.php 2010-01-20
16:03:35 UTC (rev 26948)
@@ -158,45 +158,13 @@
protected function loadTransliterationStrings()
{
- $transliterationMap = array(
- '¥' => 'Y', 'µ' => 'u', 'À' => 'A', 'Á' => 'A',
- 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A',
- 'Æ' => 'A', 'Ç' => 'C', 'È' => 'E', 'É' => 'E',
- 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I',
- 'Î' => 'I', 'Ï' => 'I', 'Ð' => 'D', 'Ñ' => 'N',
- 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O',
- 'Ö' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U',
- 'Û' => 'U', 'Ü' => 'U', 'Ý' => 'Y', 'ß' => 'ss',
- 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a',
- 'ä' => 'a', 'å' => 'a', 'æ' => 'a', 'ç' => 'c',
- 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
- 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
- 'ð' => 'o', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o',
- 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ø' => 'o',
- 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
- 'ý' => 'y', 'ÿ' => 'y', 'œ' => 'oe'
- );
+ $filePattern = dmOs::join(sfConfig::get('dm_core_dir'),
'data/dm/transliteration/%s.php');
+
+ $transliterationMap = include(sprintf($filePattern, 'default'));
- switch($this->getCulture())
+ if(file_exists(sprintf($filePattern, $this->getCulture())))
{
- case 'ru':
- $transliterationMap = array_merge($transliterationMap, array(
- 'Г'=>'G','Ё'=>'YO','Е'=>'E','Й'=>'YI','И'=>'I',
- 'и'=>'i','г'=>'g','ё'=>'yo','№'=>'#','е'=>'e',
- 'й'=>'yi','А'=>'A','Б'=>'B','В'=>'V','Г'=>'G',
- 'Д'=>'D','Е'=>'E','Ж'=>'ZH','З'=>'Z','И'=>'I',
- 'Й'=>'Y','К'=>'K','Л'=>'L','М'=>'M','Н'=>'N',
- 'О'=>'O','П'=>'P','Р'=>'R','С'=>'S','Т'=>'T',
- 'У'=>'U','Ф'=>'F','Х'=>'H','Ц'=>'TS','Ч'=>'CH',
- 'Ш'=>'SH','Щ'=>'SCH','Ъ'=>'','Ы'=>'YI','Ь'=>'',
- 'Э'=>'E','Ю'=>'YU','Я'=>'YA','а'=>'a','б'=>'b',
- 'в'=>'v','г'=>'g','д'=>'d','е'=>'e','ж'=>'zh',
- 'з'=>'z','и'=>'i','й'=>'y','к'=>'k','л'=>'l',
- 'м'=>'m','н'=>'n','о'=>'o','п'=>'p','р'=>'r',
- 'с'=>'s','т'=>'t','у'=>'u','ф'=>'f','х'=>'h',
- 'ц'=>'ts','ч'=>'ch','ш'=>'sh','щ'=>'sch','ъ'=>'',
- 'ы'=>'yi','ь'=>'','э'=>'e','ю'=>'yu','я'=>'ya'
- ));
+ $transliterationMap = array_merge($transliterationMap,
include(sprintf($filePattern, $this->getCulture())));
}
sfConfig::set('dm_string_transliteration', $transliterationMap);
--
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.
