*\r
* @license http://nucleuscms.org/license.txt GNU General Public License\r
* @copyright Copyright (C) 2002-2009 The Nucleus Group\r
- * @version $Id: SKIN.php 1784 2012-04-22 04:28:30Z sakamocchi $\r
+ * @version $Id: SKIN.php 1813 2012-05-02 14:41:57Z sakamocchi $\r
*/\r
\r
-if ( !function_exists('requestVar') ) \r
+if ( !function_exists('requestVar') )\r
{\r
exit;\r
}\r
$manager->notify("Init{$this->event_identifier}Parse", array('skin' => &$this, 'type' => $type));\r
\r
// include skin locale file for <%text%> tag if useable\r
- $this->includeLocaleFile(i18n::get_current_locale());\r
+ $this->includeTranslation();\r
\r
// set output type\r
sendContentType($this->getContentType(), 'skin');\r
}\r
\r
/**\r
- * Skin::includeLocaleFile()\r
+ * Skin::includeTranslation()\r
* \r
- * @param string $locale locale name\r
+ * @param void\r
* @return void\r
*/\r
- private function includeLocaleFile($locale)\r
+ private function includeTranslation()\r
{\r
global $DIR_SKINS;\r
\r
+ $locale = i18n::get_current_locale() . '.' . i18n::get_current_charset();\r
+ \r
if( $this->includeMode == "normal" )\r
{\r
- $filename = "./locale/{$locale}.php";\r
+ $filename = "./locales/{$locale}.php";\r
}\r
- elseif( $this->includeMode == "skindir" )\r
+ else if( $this->includeMode == "skindir" )\r
{\r
if ( $this->includePrefix == '' )\r
{\r
- $filename = "{$DIR_SKINS}locale/{$locale}.php";\r
+ $filename = "{$DIR_SKINS}locales/{$locale}.php";\r
}\r
else\r
{\r
- $filename = "{$DIR_SKINS}{$this->includePrefix}locale/{$locale}.php";\r
+ $filename = "{$DIR_SKINS}{$this->includePrefix}locales/{$locale}.php";\r
}\r
}\r
else\r