diff --git a/module/action/model.php b/module/action/model.php index 998dd55c7b..27394bd8dd 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1052,7 +1052,7 @@ class actionModel extends model foreach($actions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = common::checkNotCN() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp); + $date = date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 80a53f3a8d..2c10f0e03e 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -557,7 +557,7 @@ if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n/d H:i'); if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d'); -if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j'); +if(!defined('DT_DATE4')) define('DT_DATE4', 'M d'); if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 1379d0ee7f..49952cdf56 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -557,7 +557,7 @@ if(!defined('DT_MONTHTIME2'))define('DT_MONTHTIME2', 'n/d H:i'); if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d'); if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd'); if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d'); -if(!defined('DT_DATE4')) define('DT_DATE4', 'n/j'); +if(!defined('DT_DATE4')) define('DT_DATE4', 'M d'); if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s'); if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i'); diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index b9c9aa75ce..99084a2dac 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -39,16 +39,7 @@
$actions):?> - +
diff --git a/module/product/view/dynamic.html.php b/module/product/view/dynamic.html.php index 8b57b300fe..7389de796f 100755 --- a/module/product/view/dynamic.html.php +++ b/module/product/view/dynamic.html.php @@ -65,16 +65,7 @@ $actions):?> - +
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php index 66cf4d87b1..d541d925ad 100755 --- a/module/project/view/dynamic.html.php +++ b/module/project/view/dynamic.html.php @@ -66,16 +66,7 @@
$actions):?> - +