0chan
/
instant-0chan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update date formatting

This commit is contained in:
Juribiyan 2022-01-06 17:27:21 +05:00
parent 6b2997d441
commit a5a48bd167
5 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dwoo/templates/banned.tpl
View File

@ -1,6 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>{t}YOU ARE BANNED{/t}!</title>
<link rel="stylesheet" type="text/css" href="{%KU_BOARDSPATH}/css/site_futaba.css" title="Futaba">
<link rel="shortcut icon" href="{%KU_WEBPATH}/favicon.ico">
@ -22,12 +23,12 @@
{/if}
<strong>{if $ban.globalban eq 1}{t}All boards{/t}{else}/{implode('/</strong>, <strong>/', explode('|', $ban.boards))}/{/if}</strong> {t}for the following reason{/t}:<br /><br />
<strong>{$ban.reason}</strong><br /><br />
{t}Your ban was placed on{/t} <strong>{$ban.at|date_format:"%B %e, %Y, %I:%M %P %Z"}</strong>, {t}and{/t}
{t}Your ban was placed on{/t} <strong>{$ban.at|date_format:"F j, Y, h:i a T"}</strong>, {t}and{/t}
{if $ban.expired eq 1}
{t}expired on{/t} <strong>{$ban.until|date_format:"%B %e, %Y, %I:%M %P"}</strong><br />
{t}expired on{/t} <strong>{$ban.until|date_format:"F j, Y, h:i a"}</strong><br />
<strong>{t}This ban has already expired, this message is for your information only and will not be displayed again{/t}</strong>
{else}
{if $ban.until > 0}{t}will expire on{/t} <strong>{$ban.until|date_format:"%B %e, %Y, %I:%M %P"}</strong>{else}{t}will not expire{/t}</strong>{/if}
{if $ban.until > 0}{t}will expire on{/t} <strong>{$ban.until|date_format:"F j, Y, h:i a"}</strong>{else}{t}will not expire{/t}</strong>{/if}
{/if}
<br /><br />
{if %KU_APPEAL neq '' && $ban.expired eq 0}

2
dwoo/templates/news.tpl
View File

@ -50,7 +50,7 @@ line-height: 40px;
<div id="entries">
{foreach item=entry from=$entries}
<div class="content">
<h2><span class="newssub">{$entry.subject|stripslashes}{if $dwoo.get.p eq ''} by {if $entry.email neq ''}<a href="mailto:{$entry.email|stripslashes}">{/if}{$entry.poster|stripslashes}{if $entry.email neq ''}</a>{/if} - {$entry.timestamp|date_format:"%D @ %I:%M %p %Z"}{/if}</span>
<h2><span class="newssub">{$entry.subject|stripslashes}{if $dwoo.get.p eq ''} by {if $entry.email neq ''}<a href="mailto:{$entry.email|stripslashes}">{/if}{$entry.poster|stripslashes}{if $entry.email neq ''}</a>{/if} - {$entry.timestamp|date_format:"m/d/y @ h:i A T"}{/if}</span>
<span class="permalink"><a href="#{$entry.id}">#</a></span></h2>
<div style="margin:5px; padding-bottom: 5px;">{$entry.message|stripslashes}</div>
</div><br />

2
dwoo/templates/rss_mod.tpl
View File

@ -7,7 +7,7 @@
<language>{%KU_LOCALE}</language>
{foreach from=$entries item=item}
<item>
<title>{$item.timestamp|date_format:"%a %m/%d %H:%M"}</title>
<title>{$item.timestamp|date_format:"D m/d H:i"}</title>
<description><![CDATA[{$item.user} - {$item.entry}]]></description>
</item>
{/foreach}

5
inc/func/stringformatting.php
View File

@ -24,9 +24,8 @@ function formatDate($timestamp, $type = 'post', $locale = 'en', $email = '') {
}
if ($locale == 'ja') {
/* Format the timestamp japanese style */
$fulldate = strftime ("%Yy%mm%dd(DAYOFWEEK) %HH%MM%SS", $timestamp);
$dayofweek = strftime('%a', $timestamp);
$fulldate = date('$Y\ym\md\d(\D\A\Y\O\F\W\E\E\K) H\Hi\Ms\S', $timestamp);
$dayofweek = date('D', $timestamp);
/* I don't like this method, but I can't rely on PHP's locale settings to do it for me... */
switch ($dayofweek) {

20
lib/dwoo/plugins/builtin/functions/date_format.php
View File

@ -18,7 +18,7 @@
* @date 2008-12-24
* @package Dwoo
*/
function Dwoo_Plugin_date_format(Dwoo_Core $dwoo, $value, $format='%b %e, %Y', $default=null)
function Dwoo_Plugin_date_format(Dwoo_Core $dwoo, $value, $format='M j, o', $default=null)
{
if (!empty($value)) {
// convert if it's not a valid unix timestamp
@ -35,20 +35,6 @@ function Dwoo_Plugin_date_format(Dwoo_Core $dwoo, $value, $format='%b %e, %Y', $
} else {
return '';
}
// Credits for that windows compat block to Monte Ohrt who made smarty's date_format plugin
if (DIRECTORY_SEPARATOR == '\\') {
$_win_from = array('%D', '%h', '%n', '%r', '%R', '%t', '%T');
$_win_to = array('%m/%d/%y', '%b', "\n", '%I:%M:%S %p', '%H:%M', "\t", '%H:%M:%S');
if (strpos($format, '%e') !== false) {
$_win_from[] = '%e';
$_win_to[] = sprintf('%\' 2d', date('j', $value));
}
if (strpos($format, '%l') !== false) {
$_win_from[] = '%l';
$_win_to[] = sprintf('%\' 2d', date('h', $value));
}
$format = str_replace($_win_from, $_win_to, $format);
}
return strftime($format, $value);
return date($format, $value);
}