X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FI18n.php;fp=DataObjects%2FI18n.php;h=fce1fc41173dee92c93d7f85780b6e7a39c0cb93;hp=ce1619ad523467b7712713a8ad4402af2a6d86f6;hb=fab418ff161d2ca5b290937bf8af221b9cf7b2ce;hpb=ea476e40e3e0cc3dba56578c61e4d1902838d425

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index ce1619ad..fce1fc41 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -224,6 +224,13 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
     function translate($inlang,$ltype,$kval)
     {
         
+        
+        static $cache = array();
+        $cache_key = implode(' ', array($inlang,$ltime,$kval));
+        if (isset($cache[$cache_key ])) {
+            return $cache[$cache_key];
+        }
+        
         $x = DB_DataObject::factory('i18n');
         $x->ltype = $ltype;
         $x->lkey = $kval;
@@ -232,12 +239,15 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         
         $x->limit(1);
         if ($x->find(true) && !empty($x->lval)) {
+            $cache[$cache_key] = $x->lval;
             return $x->lval;
         }
         $fallback->inlang = 'en';
         if ($fallback->find(true) && !empty($fallback->lval)) {
-           return $fallback->lval;
+            $cache[$cache_key] = $fallback->lval;
+            return $fallback->lval;
         }
+         $cache[$cache_key] = $kval;
         return $kval;
     }