Dates which are more than 6 days in the past no longer show the time
authorAlexander Ebert <ebert@woltlab.com>
Fri, 19 Jul 2013 14:46:49 +0000 (16:46 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 19 Jul 2013 14:46:49 +0000 (16:46 +0200)
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index b043f85534e093f7e417f4aac83c945c52c59024..9f3d21d699dde5127c43489d7748edf295ad464f 100644 (file)
@@ -1419,7 +1419,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getAllowedExtensions()
        <category name="wcf.date">
                <item name="wcf.date.dateFormat"><![CDATA[j. F Y]]></item>
                <item name="wcf.date.timeFormat"><![CDATA[H:i]]></item>
-               <item name="wcf.date.dateTimeFormat"><![CDATA[%date%, %time%]]></item>
+               <item name="wcf.date.dateTimeFormat"><![CDATA[%date%]]></item>
                
                <item name="wcf.date.interval.days.past"><![CDATA[Vor {if $days > 1}{#$days} Tagen{else}einem Tag{/if}]]></item>
                <item name="wcf.date.interval.full.past"><![CDATA[Vor {if $years}{if $years > 1}{#$years} Jahren{else}einem Jahr{/if}{/if}{if $months}{if $firstElement != 'months'}{if $lastElement == 'months'} und {else}, {/if}{/if}{if $months > 1}{#$months} Monaten{else}einem Monat{/if}{/if}{if $weeks}{if $firstElement != 'weeks'}{if $lastElement == 'weeks'} und {else}, {/if}{/if}{if $weeks > 1}{#$weeks} Wochen{else}einer Woche{/if}{/if}{if $days}{if $firstElement != 'days'}{if $lastElement == 'days'} und {else}, {/if}{/if}{if $days > 1}{#$days} Tagen{else}einem Tag{/if}{/if}{if $hours}{if $firstElement != 'hours'}{if $lastElement == 'hours'} und {else}, {/if}{/if}{if $hours > 1}{#$hours} Stunden{else}einer Stunde{/if}{/if}{if $minutes}{if $firstElement != 'minutes' && $lastElement == 'minutes'} und {/if}{if $minutes > 1}{#$minutes} Minuten{else}einer Minute{/if}{/if}]]></item>
index 5c09bbb3447f3d7dded3d3f3a3f85ab733a214f5..934773db4e894a6978029f29c0283b99b0d5df16 100644 (file)
@@ -1417,7 +1417,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getAllowedExtensions()}]]>
        <category name="wcf.date">
                <item name="wcf.date.dateFormat"><![CDATA[M jS Y]]></item>
                <item name="wcf.date.timeFormat"><![CDATA[g:ia]]></item>
-               <item name="wcf.date.dateTimeFormat"><![CDATA[%date%, %time%]]></item>
+               <item name="wcf.date.dateTimeFormat"><![CDATA[%date%]]></item>
                
                <item name="wcf.date.interval.days.past"><![CDATA[{if $days > 1}{#$days} days{else}A day{/if} ago]]></item>
                <item name="wcf.date.interval.full.past"><![CDATA[{if $years}{if $years > 1}{#$years} years{else}A year{/if}{/if}{if $months}{if $firstElement != 'months'}{if $firstElement != 'months'}{if $lastElement == 'months'} and {else}, {/if}{/if}{#$months} months{else}{if $firstElement == 'months'}A{else}a{/if} month{/if}{/if}{if $weeks}{if $firstElement != 'weeks'}{if $lastElement == 'weeks'} and {else}, {/if}{/if}{if $weeks > 1}{#$weeks} weeks{else}{if $firstElement == 'weeks'}A{else}a{/if} week{/if}{/if}{if $days}{if $firstElement != 'days'}{if $lastElement == 'days'} and {else}, {/if}{/if}{if $days > 1}{#$days} days{else}{if $firstElement == 'days'}A{else}a{/if} day{/if}{/if}{if $hours}{if $firstElement != 'hours'}{if $lastElement == 'hours'} and {else}, {/if}{/if}{if $hours > 1}{#$hours} hours{else}{if $firstElement == 'hours'}An{else}an{/if} hour{/if}{/if}{if $minutes}{if $firstElement != 'minutes' && $lastElement == 'minutes'} and {/if}{if $minutes > 1}{#$minutes} minutes{else}{if $firstElement == 'minutes'}A{else}a{/if} minute{/if}{/if} ago]]></item>