コミット: 9d6ff8ea87cfcbe0bdc494e257429768d0fa132c - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

コミットメタ情報

• リビジョン: 9d6ff8ea87cfcbe0bdc494e257429768d0fa132c (tree)
• 日時: 2012-08-17 19:03:06
• 作者: HIKAWA Kilica <kilica.hikawa@gmai...>
• コミッター: HIKAWA Kilica

ログメッセージ

Merge pull request #25 from nao-pon/load_lang_trust

legacy: load trust side language file

変更サマリ

• modified: html/modules/legacy/kernel/Legacy_LanguageManager.class.php

差分

--- a/html/modules/legacy/kernel/Legacy_LanguageManager.class.php
+++ b/html/modules/legacy/kernel/Legacy_LanguageManager.class.php
@@ -150,16 +150,33 @@ class Legacy_LanguageManager extends XCube_LanguageManager
 	 */
 	function _loadLanguage($dirname, $fileBodyName)
 	{
-		if (!$this->_loadFile(XOOPS_MODULE_PATH . '/' . $dirname . '/language/' . $this->mLanguageName . '/' . $fileBodyName . '.php')) {
-			$this->_loadFile(XOOPS_MODULE_PATH . '/' . $dirname . '/language/' . $this->getFallbackLanguage() . '/' . $fileBodyName . '.php');
+		static $trust_dirnames = array();
+		if (!isset($trust_dirnames[$dirname])) {
+			$trust_dirnames[$dirname] = Legacy_Utils::getTrustDirnameByDirname($dirname);
 		}
+		(
+			$this->_loadFile(XOOPS_MODULE_PATH . '/' . $dirname . '/language/' . $this->mLanguageName . '/' . $fileBodyName . '.php')
+			||
+			$this->_loadFile(XOOPS_MODULE_PATH . '/' . $dirname . '/language/' . $this->getFallbackLanguage() . '/' . $fileBodyName . '.php')
+			||
+			(
+				$trust_dirnames[$dirname] &&
+				(
+					$this->_loadFile(XOOPS_TRUST_PATH . '/modules/' . $trust_dirnames[$dirname] . '/language/' . $this->mLanguageName . '/' . $fileBodyName . '.php', $dirname)
+					||
+					$this->_loadFile(XOOPS_TRUST_PATH . '/modules/' . $trust_dirnames[$dirname] . '/language/' . $this->getFallbackLanguage() . '/' . $fileBodyName . '.php', $dirname)
+				)
+			)
+		);
 	}
 
 
 	/**
 	 * @access protected
+	 * @param $filename A filename.
+	 * @param $dirname A dirname of module. (for D3 module)
 	 */
-	function _loadFile($filename)
+	function _loadFile($filename, $mydirname = null)
 	{
 		if (file_exists($filename)) {
 			require_once $filename;