diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index 4f8b5c067..303f95403 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = 'month'; $lang->unit_year = 'year'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // Descriptions $lang->about_tag = 'You may submit multiple tags by inserting commas(,) between each tag'; $lang->about_layout = 'Layouts decorate the appearance of your modules. you can configure them from Layout menu on the top'; diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php index 77aec53b2..68193c5a5 100644 --- a/common/lang/es.lang.php +++ b/common/lang/es.lang.php @@ -170,6 +170,16 @@ $lang->unit_month = 'mes'; $lang->unit_year = 'año'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // Relacionado a la Descripción $lang->about_tag = 'Tú puedes agregar múltiples etiquetas colocando una coma(,) entre cada etiqueta'; $lang->about_layout = 'El diseño decora la apariencia de tus módulos, lo cual podrás configurar en el menú de Diseño en la parte superior'; diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php index 6270104db..531d8bee3 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = 'mois'; $lang->unit_year = 'année';; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // Descriptions et information $lang->about_tag = 'Vous pouvez enrégistrer plusieurs balises en utilisant ,(virgule) entre chaque balise'; $lang->about_layout = 'Le Mise en Page décore l\'apparence des modules. Vous pouvez les configurer avec le menu de Mise en Page en haut'; diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php index f5872c6b8..be6b252f0 100644 --- a/common/lang/ge.lang.php +++ b/common/lang/ge.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = 'Monat'; $lang->unit_year = 'Jahr'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // Beschreibungen $lang->about_tag = 'Sie können mehrere Tags, indem Sie ein Komma (,) zwischen den einzelnen Tag'; $lang->about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand '; diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php index 3a69b6537..d7004080d 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = '月'; $lang->unit_year = '年'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // 説明関連 $lang->about_tag = 'タグを入力する時、「,」(半角コンマ)を使うと複数登録できます。'; $lang->about_layout = 'レイアウトでモジュールの枠をデザインします。上段のレイアウトメニューで管理できます。'; diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index 52a5117db..9e11829e8 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = '월'; $lang->unit_year = '년'; + $lang->unit_week = array( + 'Monday' => '월', + 'Tuesday' => '화', + 'Wednesday' => '수', + 'Thursday' => '목', + 'Friday' => '금', + 'Saturday' => '토', + 'Sunday' => '일', + ); + // 설명 관련 $lang->about_tag = '태그 입력시 , (쉼표)를 이용하시면 복수 등록이 가능합니다'; $lang->about_layout = '레이아웃은 모듈의 껍데기를 꾸며줍니다. 상단 레이아웃 메뉴에서 관리하실 수 있습니다'; diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php index 96335fd3f..c1809dd63 100644 --- a/common/lang/ru.lang.php +++ b/common/lang/ru.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = 'мес.'; $lang->unit_year = 'г.'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // Описания $lang->about_tag = 'Вы можете применить несколько тегов, разделенных запятыми (,)'; $lang->about_layout = 'Лейауты украшают внешний вид Ваших модулей. Вы можете сконфигирировать их с помощью меню Лейаут сверху'; diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php index 0839a2308..6ba6e730c 100644 --- a/common/lang/zh-CN.lang.php +++ b/common/lang/zh-CN.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = '月'; $lang->unit_year = '年'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // 说明 $lang->about_tag = '用逗号分隔多个标签'; $lang->about_layout = '布局是布置模块的外观,在上端布局菜里单可以进行管理'; diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php index a97360033..0a26c93af 100644 --- a/common/lang/zh-TW.lang.php +++ b/common/lang/zh-TW.lang.php @@ -171,6 +171,16 @@ $lang->unit_month = '月'; $lang->unit_year = '年'; + $lang->unit_week = array( + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + ); + // 說明 $lang->about_tag = '用逗號分隔多個標籤'; $lang->about_layout = '佈局是佈置模組的外觀,在頂端佈局選單中,可以進行管理'; diff --git a/config/func.inc.php b/config/func.inc.php index 5a81b6c01..dc141bb13 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -318,15 +318,19 @@ $year = (int)substr($str,0,4); $month = (int)substr($str,4,2); $day = (int)substr($str,6,2); - return str_replace( + $string = 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)), $format ); + } else { + // 1970년 이후라면 ztime()함수로 unixtime을 구하고 date함수로 처리 + $string = date($format, ztime($str)); } - // 1970년 이후라면 ztime()함수로 unixtime을 구하고 date함수로 처리 - return date($format, ztime($str)); + // 요일, 월을 각 언어에 맞게 변경 + $unit_week = Context::getLang('unit_week'); + return str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),$unit_week, $string); } /**