diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/functions.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index 0661becd7..a1aeb7135 100755 --- a/include/functions.php +++ b/include/functions.php @@ -81,7 +81,7 @@ */ function get_translations() { $tr = array( - "auto" => "Detect automatically", + "auto" => __("Detect automatically"), "ar_SA" => "العربيّة (Arabic)", "bg_BG" => "Bulgarian", "da_DA" => "Dansk", @@ -105,7 +105,7 @@ "pt_PT" => "Portuguese/Portugal", "zh_CN" => "Simplified Chinese", "zh_TW" => "Traditional Chinese", - "uk_UA" => "Украинский", + "uk_UA" => "Українська", "sv_SE" => "Svenska", "fi_FI" => "Suomi", "tr_TR" => "Türkçe"); @@ -951,7 +951,11 @@ if ($eta_min && time() + $tz_offset - $timestamp < 3600) { return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp)); } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) { - return date("G:i", $timestamp); + $format = get_pref('SHORT_DATE_FORMAT', $owner_uid); + if (strpos((strtolower($format)), "a") === false) + return date("G:i", $timestamp); + else + return date("g:i a", $timestamp); } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) { $format = get_pref('SHORT_DATE_FORMAT', $owner_uid); return date($format, $timestamp); |