- Made sure dates can be translated nicely. Patch by Gobar.
parent
9a0573a8e1
commit
d80140b442
|
@ -907,15 +907,19 @@ function format_date($timestamp, $type = "medium", $format = "") {
|
||||||
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case "small":
|
case "small":
|
||||||
$date = date(variable_get("date_format_short", "m/d/Y - H:i"), $timestamp);
|
$format = variable_get("date_format_short", "m/d/Y - H:i");
|
||||||
break;
|
|
||||||
case "medium":
|
|
||||||
$date = date(variable_get("date_format_medium", "D, m/d/Y - H:i"), $timestamp);
|
|
||||||
break;
|
break;
|
||||||
case "large":
|
case "large":
|
||||||
$date = date(variable_get("date_format_long", "l, F j, Y - H:i"), $timestamp);
|
$format = variable_get("date_format_long", "l, F j, Y - H:i");
|
||||||
break;
|
break;
|
||||||
case "custom":
|
case "custom":
|
||||||
|
// No change to format
|
||||||
|
break;
|
||||||
|
case "medium":
|
||||||
|
default:
|
||||||
|
$format = variable_get("date_format_medium", "D, m/d/Y - H:i");
|
||||||
|
}
|
||||||
|
|
||||||
for ($i = strlen($format); $i >= 0; $c = $format[--$i]) {
|
for ($i = strlen($format); $i >= 0; $c = $format[--$i]) {
|
||||||
if (strstr("DFlMSw", $c)) {
|
if (strstr("DFlMSw", $c)) {
|
||||||
$date = t(date($c, $timestamp)) . $date;
|
$date = t(date($c, $timestamp)) . $date;
|
||||||
|
@ -927,10 +931,6 @@ function format_date($timestamp, $type = "medium", $format = "") {
|
||||||
$date = $c.$date;
|
$date = $c.$date;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$date = date(variable_get("date_format_medium", "l, m/d/Y - H:i"), $timestamp);
|
|
||||||
}
|
|
||||||
return $date;
|
return $date;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue