diff --git a/common/lang/en.lang.php b/common/lang/en.lang.php index fcd926905..2243658c6 100644 --- a/common/lang/en.lang.php +++ b/common/lang/en.lang.php @@ -188,6 +188,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => '%d minute ago', + 'mins' => '%d minutes ago', + 'hour' => '%d hour ago', + 'hours' => '%d hours ago', + ); + // 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 2feb8a7b4..010b65403 100644 --- a/common/lang/es.lang.php +++ b/common/lang/es.lang.php @@ -171,13 +171,13 @@ $lang->unit_year = 'año'; $lang->unit_week = array( - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', + 'Monday' => 'Lunes', + 'Tuesday' => 'Martes', + 'Wednesday' => 'Miércoles ', + 'Thursday' => 'Jueves', + 'Friday' => 'Viernes', + 'Saturday' => 'Sábado', + 'Sunday' => 'Domingo', ); $lang->unit_meridiem = array( @@ -187,6 +187,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => 'Hace %d minuto', + 'mins' => '%d minutos', + 'hour' => '%d día', + 'hours' => '%d días', + ); + // 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 29a2b53b4..742a4e1c0 100644 --- a/common/lang/fr.lang.php +++ b/common/lang/fr.lang.php @@ -172,13 +172,13 @@ $lang->unit_year = 'année';; $lang->unit_week = array( - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', + 'Monday' => 'Lundi', + 'Tuesday' => 'Mardi', + 'Wednesday' => 'Mer.', + 'Thursday' => 'Jeu.', + 'Friday' => 'Vendredi', + 'Saturday' => 'Samedi', + 'Sunday' => 'Dimanche', ); $lang->unit_meridiem = array( @@ -188,6 +188,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => '%d heure', + 'mins' => 'Il ya %d minutes', + 'hour' => 'Il ya %d jour', + 'hours' => 'Il ya %d jours', + ); + // 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 b2eaf466a..cfec5a280 100644 --- a/common/lang/ge.lang.php +++ b/common/lang/ge.lang.php @@ -172,13 +172,13 @@ $lang->unit_year = 'Jahr'; $lang->unit_week = array( - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - 'Sunday' => 'Sunday', + 'Monday' => 'Montag', + 'Tuesday' => 'Dienstag', + 'Wednesday' => 'Mittwoch', + 'Thursday' => 'Donnerstag', + 'Friday' => 'Freitag', + 'Saturday' => 'Samstag', + 'Sunday' => 'Sonntag', ); $lang->unit_meridiem = array( @@ -188,6 +188,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => 'Vor %d Minute', + 'mins' => '%d Stunden', + 'hour' => '%d Tag', + 'hours' => '%d Tage', + ); + // 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 ee552c650..75226455e 100644 --- a/common/lang/jp.lang.php +++ b/common/lang/jp.lang.php @@ -188,6 +188,13 @@ 'PM' => '午後', ); + $lang->time_gap = array( + 'min' => '%d minute ago', + 'mins' => '%d minutes ago', + 'hour' => '%d hour ago', + 'hours' => '%d hours ago', + ); + // 説明関連 $lang->about_tag = 'タグを入力する時、「,」(半角コンマ)を使うと複数登録できます。'; $lang->about_layout = 'レイアウトでモジュールの枠をデザインします。上段のレイアウトメニューで管理できます。'; diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index 1c8b44f2f..d0a92c2f4 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -188,6 +188,13 @@ 'PM' => '오후', ); + $lang->time_gap = array( + 'min' => '%d 분전', + 'mins' => '%d 분전', + 'hour' => '%d 시간전', + 'hours' => '%d 시간전', + ); + // 설명 관련 $lang->about_tag = '태그 입력시 , (쉼표)를 이용하시면 복수 등록이 가능합니다'; $lang->about_layout = '레이아웃은 모듈의 껍데기를 꾸며줍니다. 상단 레이아웃 메뉴에서 관리하실 수 있습니다'; diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php index 75fc22d6b..3025c0d7e 100644 --- a/common/lang/ru.lang.php +++ b/common/lang/ru.lang.php @@ -188,6 +188,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => '%d minute ago', + 'mins' => '%d minutes ago', + 'hour' => '%d hour ago', + 'hours' => '%d hours ago', + ); + // Описания $lang->about_tag = 'Вы можете применить несколько тегов, разделенных запятыми (,)'; $lang->about_layout = 'Лейауты украшают внешний вид Ваших модулей. Вы можете сконфигирировать их с помощью меню Лейаут сверху'; diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php index a78f172d7..b311a2b71 100644 --- a/common/lang/zh-CN.lang.php +++ b/common/lang/zh-CN.lang.php @@ -188,6 +188,13 @@ 'PM' => '下午', ); + $lang->time_gap = array( + 'min' => '%d minute ago', + 'mins' => '%d minutes ago', + 'hour' => '%d hour ago', + 'hours' => '%d hours ago', + ); + // 说明 $lang->about_tag = '用逗号分隔多个标签'; $lang->about_layout = '布局是布置模块的外观,在上端布局菜里单可以进行管理'; diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php index bac9f7261..41f9bbedd 100644 --- a/common/lang/zh-TW.lang.php +++ b/common/lang/zh-TW.lang.php @@ -188,6 +188,13 @@ 'PM' => 'PM', ); + $lang->time_gap = array( + 'min' => '%d minute ago', + 'mins' => '%d minutes ago', + 'hour' => '%d hour ago', + 'hours' => '%d hours ago', + ); + // 說明 $lang->about_tag = '用逗號分隔多個標籤'; $lang->about_layout = '排版是佈置模組的外觀,在頂端排版選單中,可以進行管理'; diff --git a/config/func.inc.php b/config/func.inc.php index 280896b45..b28884774 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -277,6 +277,21 @@ return mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)+$gap; } + /** + * @brief YmdHis의 시간 형식을 지금으로 부터 몇분/몇시간전, 1일 이상 차이나면 format string return + **/ + function getTimeGap($date, $format = 'Y.m.d') { + $gap = time() - ztime($date); + + $lang_time_gap = Context::getLang('time_gap'); + if($gap<60) $buff = sprintf($lang_time_gap['min'], (int)($gap / 60)+1); + elseif($gap<60*60) $buff = sprintf($lang_time_gap['mins'], (int)($gap / 60)+1); + elseif($gap<60*60*2) $buff = sprintf($lang_time_gap['hour'], (int)($gap / 60 /60)+1); + elseif($gap<60*60*24) $buff = sprintf($lang_time_gap['hours'], (int)($gap / 60 /60)+1); + else $buff = zdate($date, $format); + return $buff; + } + /** * @brief 월이름을 return **/