From 3a18378eb829052093f6030fbe8d26c50a3812cb Mon Sep 17 00:00:00 2001
From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Sat, 5 May 2012 13:04:40 +0900
Subject: [PATCH] =?utf8?q?MERGE:=20=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7?=
 =?utf8?q?=E3=83=B31827=E3=80=82=E3=82=BF=E3=82=B0<%locale%>=E3=81=A8<%cha?=
 =?utf8?q?rset%>=E3=81=8C=E3=81=A9=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=86?=
 =?utf8?q?=E3=82=AF=E3=82=B9=E3=83=88=E3=81=A7=E3=82=82=E4=BD=BF=E7=94=A8?=
 =?utf8?q?=E5=8F=AF=E8=83=BD=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

BaseActions::parse_locale()とBaseActions::parse_charset()を追加。これによりActions::parse_charset()を削除した。

Revision 1827:
ADD: BaseActions::parse_locale() and BaseActions::parse_charset() and
remove Actions::parse_charset()
<%locale%> and <%charset%> is available for whole context.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1827
---
 nucleus/libs/ACTIONS.php     | 14 --------------
 nucleus/libs/BaseActions.php | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index d13813e..1bd9987 100644
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -50,7 +50,6 @@ class Actions extends BaseActions
 		'archivelink',
 		'bloglist',
 		'category',
-		'charset',
 		'loginform',
 		'member',
 		'nucleusbutton',
@@ -1129,19 +1128,6 @@ class Actions extends BaseActions
 	}
 	
 	/**
-	 * Actions::parse_charset()
-	 * Parse skinvar charset
-	 * 
-	 * @param	void
-	 * @return	void
-	 */
-	public function parse_charset()
-	{
-		echo i18n::get_current_charset();
-		return;
-	}
-	
-	/**
 	 * Actions::parse_commentform()
 	 * Parse skinvar commentform
 	 * 
diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index a949f82..7261ff3 100644
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -54,6 +54,7 @@ class BaseActions
 	
 	/* NOTE: defined actions for this base class */
 	static private $defined_actions = array(
+		'charset',
 		'else',
 		'elseif',
 		'elseifnot',
@@ -61,6 +62,7 @@ class BaseActions
 		'if',
 		'ifnot',
 		'include',
+		'locale',
 		'parsedinclude',
 		'phpinclude',
 		'set',
@@ -112,6 +114,42 @@ class BaseActions
 	}
 	
 	/**
+	 * BaseActions::parse_charset()
+	 * Parse charset to appropriate character set name registered to IANA
+	 * 
+	 * @param	void
+	 * @return	void
+	 */
+	public function parse_charset()
+	{
+		global $member;
+		
+		if ( i18n::get_forced_charset() !== '' )
+		{
+			echo i18n::get_forced_charset();
+		}
+		else
+		{
+			echo i18n::get_current_charset();
+		}
+		
+		return;
+	}
+	
+	/**
+	 * BaseActions::parse_locale()
+	 * Parse locale to language-script-region according to RFC 4646
+	 * 
+	 * @param	void
+	 * @return	void
+	 */
+	public function parse_locale()
+	{
+		echo preg_replace('#_#', '-', i18n::get_current_locale());
+		return;
+	}
+	
+	/**
 	 * BaseActions::parse_include()
 	 * include file (no parsing of php)
 	 * 
-- 
2.11.0