From cb4002b2baac1c8921b8d8a8ab4762529eadd9a9 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 7 Apr 2008 08:06:21 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B0=84=EB=8B=A8=ED=95=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4078 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/func.inc.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config/func.inc.php b/config/func.inc.php index 6e22fb351..a3e9aaafa 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -262,22 +262,23 @@ /** * @brief YYYYMMDDHHIISS 형식의 시간값을 원하는 시간 포맷으로 변형 - * @param str YYYYMMDDHHIISS 형식의 시간값 - * @param format php date()함수의 시간 포맷 + * @param string|int str YYYYMMDDHHIISS 형식의 시간 값 + * @param string format php date()함수의 시간 포맷 + * @param bool conversion 언어에 따라 날짜 포맷의 자동변환 여부 * @return string **/ - function zdate($str, $format = "Y-m-d H:i:s", $conversion=true) { + function zdate($str, $format = 'Y-m-d H:i:s', $conversion=true) { // 대상 시간이 없으면 null return if(!$str) return; // 언어권에 따라서 지정된 날짜 포맷을 변경 if($conversion == true) { switch(Context::getLangType()) { - case "en" : - case "es" : - if($format == "Y-m-d") $format = "M d, Y"; - elseif($format == "Y-m-d H:i:s") $format = "M d, Y H:i:s"; - elseif($format == "Y-m-d H:i") $format = "M d, Y H:i"; + case 'en' : + case 'es' : + if($format == 'Y-m-d') $format = 'M d, Y'; + elseif($format == 'Y-m-d H:i:s') $format = 'M d, Y H:i:s'; + elseif($format == 'Y-m-d H:i') $format = 'M d, Y H:i'; break; } @@ -293,7 +294,7 @@ $day = (int)substr($str,6,2); return str_replace( array('Y','m','d','H','h','i','s','a','M', 'F'), - array($year,$month,$day,$hour,$hour/12,$min,$sec,$hour<=12?'am':'pm',getMonthName($month), getMonthName($month,false)), + array($year,$month,$day,$hour,$hour/12,$min,$sec,($hour <= 12) ? 'am' : 'pm',getMonthName($month), getMonthName($month,false)), $format ); }