Commit d5e8a94caf620ce6c3d86ef88e40b47c502ca5a5 to tedkulp's cmsmadesimple-2-0

tedkulp / cmsmadesimple-2-0

this repo is viewable by everyone

Description:	Git mirror of the CMS Made Simple 2.0 rewrite
Homepage:	http://cmsmadesimple.org
Clone URL:	git://github.com/tedkulp/cmsmadesimple-2-0.git Give this clone URL to anyone. `git clone git://github.com/tedkulp/cmsmadesimple-2-0.git`

New translation parsing code -- uses UTF-8 xml.  Size is close to the php 
style.
Added quickly modified fr_FR admin translation in tmp/translations for 
demo of xml schema
Made sure old translations still work -- for now

Signed-off-by: Ted Kulp <ted@cmsmadesimple.org>


git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple/trunk@4439 
3d254a34-79dc-0310-9e5f-be208747d8a0

tedkulp (author)

29 days ago

commit d5e8a94caf620ce6c3d86ef88e40b47c502ca5a5
tree 2c7f65c765bbd438b4eed235e9a1b765038b48bb
parent fb6d3e205fb51b37f67afd598e7f8dda4fb27c65

lib/classes/class.cms_language.php
tmp/translations/core.fr_FR.xml

lib/classes/class.cms_language.php

0
@@ -131,11 +131,20 @@ class CmsLanguage extends CmsObject
0
   
0
   private static function load_lang_file($module, $language)
0
   {
0
-    $lang = array();
0
-
0
-    $file = cms_join_path(ROOT_DIR, 'lang', $module . '.' . $language . '.php');
0
-    if (!is_file($file))
0
+    $file = cms_join_path(ROOT_DIR, 'tmp', 'translations', $module . '.' . $language . '.xml');
0
+    if (is_file($file))
0
+    {
0
+      //New parsing code
0
+      $xml = simplexml_load_file($file);
0
+      foreach ($xml as $one_entry)
0
+      {
0
+        self::$lang[$module][$language][(string)$one_entry->st] = (string)$one_entry->tr;
0
+      }
0
+    }
0
+    else
0
     {
0
+      $lang = array();
0
+
0
       if ($module == 'core')
0
       {
0
           $file = cms_join_path(ROOT_DIR, 'admin', 'lang', 'ext', $language, 'admin.inc.php');
0
@@ -156,19 +165,19 @@ class CmsLanguage extends CmsObject
0
           }
0
         }
0
       }
0
-    }
0
+      
0
+        if (is_file($file) && strlen($language) == 5 && strpos($language, ".") === false)
0
+        {
0
+        CmsProfiler::get_instance()->mark('Load:' . $file);
0
+            include ($file);
0
+        if (isset($lang['admin']) && is_array($lang['admin']) && count($lang['admin'] > 1))
0
+        {
0
+          $lang = $lang['admin'];
0
+        }
0
+        }
0
 
0
-      if (is_file($file) && strlen($language) == 5 && strpos($language, ".") === false)
0
-      {
0
-      CmsProfiler::get_instance()->mark('Load:' . $file);
0
-          include ($file);
0
-      if (isset($lang['admin']) && is_array($lang['admin']) && count($lang['admin'] > 1))
0
-      {
0
-        $lang = $lang['admin'];
0
-      }
0
-      }
0
-    
0
-    self::$lang[$module][$language] =& $lang;
0
+      self::$lang[$module][$language] =& $lang;
0
+    }
0
   }
0
   
0
   public static function load_nls_files()

tmp/translations/core.fr_FR.xml