From b7f95ce37ae577e95a81e64aa2aaf3e2e698109d Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 5 Aug 2006 21:34:30 +0000
Subject: merge from 3.0 branch till 1329.

---
 framework/I18N/TGlobalization.php             | 27 ++++++++++++++++++++++++---
 framework/I18N/core/Gettext/MO.php            |  1 +
 framework/I18N/core/Gettext/PO.php            |  1 +
 framework/I18N/core/MessageSource_XLIFF.php   |  7 ++++++-
 framework/I18N/core/MessageSource_gettext.php |  6 +++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'framework/I18N')

diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index aa545d21..1ea7ce2b 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -168,12 +168,33 @@ class TGlobalization extends TModule
 	{
 		if($config['type'] == 'XLIFF' || $config['type'] == 'gettext')
 		{
-			$config['source'] = Prado::getPathOfNamespace($config['source']);
-			if($config['source']===null || !is_dir($config['source']))
-				throw new TException("invalid source dir '{$config['source']}'");
+			if($config['source'])
+			{
+				$config['source'] = Prado::getPathOfNamespace($config['source']);
+				if(!is_dir($config['source']))
+				{
+					if(@mkdir($config['source'])===false)
+					throw new TConfigurationException('globalization_source_path_failed',
+						$config['source']);
+					chmod($config['source'], 0777); //make it deletable									
+				}
+			}
+			else
+			{
+				throw new TConfigurationException("invalid source dir '{$config['source']}'");
+			}
 		}
 		if($config['cache'])
+		{
 			$config['cache'] = $this->getApplication()->getRunTimePath().'/i18n';
+			if(!is_dir($config['cache']))
+			{
+				if(@mkdir($config['cache'])===false)
+					throw new TConfigurationException('globalization_cache_path_failed',
+						$config['cache']);
+				chmod($config['cache'], 0777); //make it deletable				
+			}
+		}
 		$this->_translation = $config;
 	}
 
diff --git a/framework/I18N/core/Gettext/MO.php b/framework/I18N/core/Gettext/MO.php
index 5ee0057f..9f2d5799 100644
--- a/framework/I18N/core/Gettext/MO.php
+++ b/framework/I18N/core/Gettext/MO.php
@@ -349,6 +349,7 @@ class TGettext_MO extends TGettext
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
+        chmod($file,0777);
         return true;
     }
 }
diff --git a/framework/I18N/core/Gettext/PO.php b/framework/I18N/core/Gettext/PO.php
index 015747a0..3a5fda04 100644
--- a/framework/I18N/core/Gettext/PO.php
+++ b/framework/I18N/core/Gettext/PO.php
@@ -154,6 +154,7 @@ class TGettext_PO extends TGettext
         //done
         @flock($fh, LOCK_UN);
         @fclose($fh);
+        chmod($file,0777);
         return true;
     }
 }
diff --git a/framework/I18N/core/MessageSource_XLIFF.php b/framework/I18N/core/MessageSource_XLIFF.php
index 2194ca41..7f2f27c5 100644
--- a/framework/I18N/core/MessageSource_XLIFF.php
+++ b/framework/I18N/core/MessageSource_XLIFF.php
@@ -473,10 +473,15 @@ class MessageSource_XLIFF extends MessageSource
 		$variant = array_shift($variants);
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
-		if(!is_dir($dir)) @mkdir($dir);
+		if(!is_dir($dir)) 
+		{
+			@mkdir($dir);
+			@chmod($dir,0777);
+		}
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 		file_put_contents($file, $this->getTemplate($catalogue));
+		chmod($file, 0777);
 		return array($variant, $file);
 	}
 
diff --git a/framework/I18N/core/MessageSource_gettext.php b/framework/I18N/core/MessageSource_gettext.php
index 78fa5259..c92577d4 100644
--- a/framework/I18N/core/MessageSource_gettext.php
+++ b/framework/I18N/core/MessageSource_gettext.php
@@ -431,7 +431,11 @@ class MessageSource_gettext extends MessageSource
 		$po_file = $this->getPOFile($mo_file);
 
 		$dir = dirname($mo_file);
-		if(!is_dir($dir)) @mkdir($dir);
+		if(!is_dir($dir))
+		{ 
+			@mkdir($dir);
+			@chmod($dir,0777);
+		}
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-- 
cgit v1.2.3