fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Do not convert date format automatically

Browse source
This commit is contained in:
Kijin Sung 2016-02-07 22:39:27 +09:00
parent e55504e1f4
commit 005d507bfa
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/legacy.php
View file

@ -543,7 +543,7 @@ function ztime($str)
* @param bool $conversion If true, convert automatically for the current language.
* @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 = false)
{
if(!$str)
{
@ -551,7 +551,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = true)
}
// convert the date format according to the language
if($conversion == TRUE)
if($conversion)
{
static $convtable = array(
'en' => array(
@ -596,7 +596,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = true)
$unit_week = (Array)Context::getLang('unit_week');
$unit_meridiem = (Array)Context::getLang('unit_meridiem');
$result = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $string);
$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $result);
}
return $result;
}