From ef1c3727e909fcc26b2ee6f7517d458f41ca8ef4 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Wed, 1 Jun 2011 07:20:38 +0000
Subject: backported r2935 to branch/3.1

---
 framework/I18N/TGlobalization.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/framework/I18N/TGlobalization.php b/framework/I18N/TGlobalization.php
index 6e00dd48..6c044db0 100644
--- a/framework/I18N/TGlobalization.php
+++ b/framework/I18N/TGlobalization.php
@@ -56,6 +56,10 @@ class TGlobalization extends TModule
 	 */
 	private $_translation;
 
+	/**
+	 * @var boolean whether we should translate the default culture
+	 */
+	private $_translateDefaultCulture=true;
 
 	/**
 	 * Initialize the Culture and Charset for this application.
@@ -80,6 +84,22 @@ class TGlobalization extends TModule
 		$this->getApplication()->setGlobalization($this);
 	}
 
+	/**
+	 * @return string default culture
+	 */
+	public function getTranslateDefaultCulture()
+	{
+		return $this->_translateDefaultCulture;
+	}
+
+	/**
+	 * @param bool default culture, e.g. <tt>en_US</tt> for American English
+	 */
+	public function setTranslateDefaultCulture($value)
+	{
+		$this->_translateDefaultCulture = TPropertyValue::ensureBoolean($value);
+	}
+
 	/**
 	 * @return string default culture
 	 */
@@ -149,7 +169,7 @@ class TGlobalization extends TModule
 	 */
 	public function getTranslationConfiguration()
 	{
-		return ($this->getDefaultCulture() == $this->getCulture())
+		return (!$this->_translateDefaultCulture && ($this->getDefaultCulture() == $this->getCulture()))
 			? null
 			: $this->_translation;
 	}
-- 
cgit v1.2.3