Use `{time}`

diff --git a/language/de.xml b/language/de.xml
index 0733164546cdc6d2ce370452772e666cb4b05826..6c2293fc66472cd1043c86ce5db4a338bfcfecae 100644 (file)
--- a/language/de.xml
+++ b/language/de.xml
@@ -129,7 +129,7 @@
                <item name="wcf.conversation.participants.other"><![CDATA[und {if $conversation->participants - $participantSummaryCount == 1}ein weiterer{else}{#$conversation->participants-$participantSummaryCount} weitere{/if}]]></item>
                <item name="wcf.conversation.attachments"><![CDATA[Diese Konversation enthält {if $conversation->attachments == 1}einen Dateianhang{else}{#$conversation->attachments} Dateianhänge{/if}.]]></item>
                <item name="wcf.conversation.error.mailboxIsFull"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} das zulässige Limit für Konversationen bereits erreicht und {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if} keine neuen Konversationen starten.]]></item>
-               <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} hat diese Nachricht {#$message->editCount} Mal editiert, zuletzt: {@$message->lastEditTime|time}.]]></item>
+               <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} hat diese Nachricht {#$message->editCount} Mal editiert, zuletzt: {time time=$message->lastEditTime}.]]></item>
                <item name="wcf.conversation.noParticipantsWarning"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du bist{else}Sie sind{/if} dabei, auf eine Konversation ohne weitere Teilnehmer zu antworten. Alle anderen Teilnehmer haben diese Konversation verlassen. Niemand wird {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Nachricht lesen!]]></item>
                <item name="wcf.conversation.message.permalink"><![CDATA[Permalink zur {#$startIndex}. Nachricht]]></item>
                <item name="wcf.conversation.markAsRead.doubleClick"><![CDATA[Konversation durch Doppelklick als gelesen markieren]]></item>
@@ -142,7 +142,7 @@
                <item name="wcf.conversation.visibility.previousMessages"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du wurdest{else}Sie wurden{/if} einer laufenden Konversation hinzugefügt, vorherige Nachrichten werden {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} nicht angezeigt.]]></item>
                <item name="wcf.conversation.time"><![CDATA[Erstellung]]></item>
                <item name="wcf.conversation.username"><![CDATA[Autor]]></item>
-               <item name="wcf.conversation.error.floodControl"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} innerhalb der letzten 24 Stunden bereits {if $limit == 1}eine Konversation{else}{#$limit} Konversationen{/if} gestartet. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}warte{else}warten Sie{/if} bis zum <strong>{@$notBefore|time}</strong>, bevor {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} eine neue Konversation {if LANGUAGE_USE_INFORMAL_VARIANT}startest{else}starten{/if}.]]></item>
+               <item name="wcf.conversation.error.floodControl"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} innerhalb der letzten 24 Stunden bereits {if $limit == 1}eine Konversation{else}{#$limit} Konversationen{/if} gestartet. Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}warte{else}warten Sie{/if} bis zum <strong>{time time=$notBefore type='plainTime'}</strong>, bevor {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} eine neue Konversation {if LANGUAGE_USE_INFORMAL_VARIANT}startest{else}starten{/if}.]]></item>
                <item name="wcf.conversation.message.error.floodControl"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} bereits eine Nachricht innerhalb der letzten {plural value=$__wcf->getSession()->getPermission('user.conversation.floodControlTime') 1='Sekunde' other='# Sekunden'} versendet. {if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} erst in {plural value=$waitTime 1='einer Sekunde' other='# Sekunden'} eine neue Nachricht verfassen.]]></item>
        </category>
        <category name="wcf.conversation.edit">

diff --git a/language/en.xml b/language/en.xml
index 5ea4a0166c11ba3f9d2d2c3ea974bf851e497054..7551709573442f0e7207fa2259aa0786b027f1c6 100644 (file)
--- a/language/en.xml
+++ b/language/en.xml
@@ -129,7 +129,7 @@
                <item name="wcf.conversation.participants.other"><![CDATA[and {if $conversation->participants - $participantSummaryCount == 1}one other{else}{#$conversation->participants-$participantSummaryCount} others{/if}]]></item>
                <item name="wcf.conversation.attachments"><![CDATA[Conversation contains {#$conversation->attachments} attachment{if $conversation->attachments != 1}s{/if}]]></item>
                <item name="wcf.conversation.error.mailboxIsFull"><![CDATA[You have reached your maximum conversations limit and cannot create new conversations.]]></item>
-               <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} edited this message {#$message->editCount} times, last: {@$message->lastEditTime|time}.]]></item>
+               <item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} edited this message {#$message->editCount} times, last: {time time=$message->lastEditTime}.]]></item>
                <item name="wcf.conversation.noParticipantsWarning"><![CDATA[You are about to reply to a conversation without other participants, nobody is going to read your message!]]></item>
                <item name="wcf.conversation.message.permalink"><![CDATA[Permalink to {#$startIndex}. message]]></item>
                <item name="wcf.conversation.markAsRead.doubleClick"><![CDATA[Double-Click to Mark This Conversation Read]]></item>
@@ -142,7 +142,7 @@
                <item name="wcf.conversation.visibility.previousMessages"><![CDATA[You have been added to an existing conversation, previously written messages are hidden.]]></item>
                <item name="wcf.conversation.time"><![CDATA[Creation]]></item>
                <item name="wcf.conversation.username"><![CDATA[Author]]></item>
-               <item name="wcf.conversation.error.floodControl"><![CDATA[You have already started {if $limit == 1}one conversation{else}{#$limit} conversations{/if} in the past 24 hours. Please wait until <strong>{@$notBefore|time}</strong> before you start a new conversation.]]></item>
+               <item name="wcf.conversation.error.floodControl"><![CDATA[You have already started {if $limit == 1}one conversation{else}{#$limit} conversations{/if} in the past 24 hours. Please wait until <strong>{time time=$notBefore type='plainTime'}</strong> before you start a new conversation.]]></item>
                <item name="wcf.conversation.message.error.floodControl"><![CDATA[You have already sent a message within the last {plural value=$__wcf->getSession()->getPermission('user.conversation.floodControlTime') 1='second' other='# seconds'}. You must wait at least {plural value=$waitTime 1='one second' other='# seconds'} before attempting to write a new message.]]></item>
        </category>
        <category name="wcf.conversation.edit">

diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index e6f03081cb070d101759176b483d2b4629f55a22..0ad06769f7cafa18416d529fc6c8767dfc76f7b0 100644 (file)
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -30,7 +30,7 @@
                                
                                <li>
                                        {icon name='clock'}
-                                       <a href="{$conversation->getLink()}">{@$conversation->time|time}</a>
+                                       <a href="{$conversation->getLink()}">{time time=$conversation->time}</a>
                                </li>
                                
                                {if $conversation->isClosed}
@@ -114,7 +114,7 @@
                                                        </p>
                                                        <dl class="plain inlineDataList small">
                                                                <dt>{lang}wcf.conversation.lastVisitTime{/lang}</dt>
-                                                               <dd>{if $participant->lastVisitTime}{@$participant->lastVisitTime|time}{else}-{/if}</dd>
+                                                               <dd>{if $participant->lastVisitTime}{time time=$participant->lastVisitTime}{else}-{/if}</dd>
                                                        </dl>
                                                </div>
                                        </div>

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index c4b1aaffe6beadf6cf7dbac5484a8e8fd3586a6b..9333eebb1e498b269dae50973b43e5fa352b957f 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -245,14 +245,14 @@
                                                        
                                                        <ul class="inlineList dotSeparated small messageGroupInfo">
                                                                <li class="messageGroupAuthor">{user object=$conversation->getUserProfile()}</li>
-                                                               <li class="messageGroupTime">{@$conversation->time|time}</li>
+                                                               <li class="messageGroupTime">{time time=$conversation->time}</li>
                                                                <li class="messageGroupEditLink jsOnly"><a href="#" class="jsConversationInlineEditor">{lang}wcf.global.button.edit{/lang}</a></li>
                                                                {event name='messageGroupInfo'}
                                                        </ul>
                                                        
                                                        <ul class="messageGroupInfoMobile">
                                                                <li class="messageGroupAuthorMobile">{$conversation->username}</li>
-                                                               <li class="messageGroupLastPostTimeMobile">{@$conversation->lastPostTime|time}</li>
+                                                               <li class="messageGroupLastPostTimeMobile">{time time=$conversation->lastPostTime}</li>
                                                        </ul>
                                                        
                                                        {if $conversation->getParticipantSummary()|count}
@@ -293,7 +293,7 @@
                                                                                <p>
                                                                                        {user object=$conversation->getLastPosterProfile()}
                                                                                </p>
-                                                                               <small>{@$conversation->lastPostTime|time}</small>
+                                                                               <small>{time time=$conversation->lastPostTime}</small>
                                                                        </div>
                                                                </div>
                                                        {/if}

diff --git a/templates/conversationMessageList.tpl b/templates/conversationMessageList.tpl
index 150130996e2df83e33340740b628bead06a3e934..327df013ea191268f34d7b97ede3a1a05093a6c7 100644 (file)
--- a/templates/conversationMessageList.tpl
+++ b/templates/conversationMessageList.tpl
@@ -14,7 +14,7 @@
                                <header class="messageHeader">
                                        <div class="messageHeaderBox">
                                                <ul class="messageHeaderMetaData">
-                                                       <li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{$message->messageID}" class="permalink messagePublicationTime">{@$message->time|time}</a></li>
+                                                       <li><a href="{link controller='Conversation' object=$conversation}messageID={@$message->messageID}{/link}#message{$message->messageID}" class="permalink messagePublicationTime">{time time=$message->time}</a></li>
                                                        
                                                        {event name='messageHeaderMetaData'}
                                                </ul>

diff --git a/templates/conversationMessageListLog.tpl b/templates/conversationMessageListLog.tpl
index a74d1dec0886c0ae6aff10c7a35c2e77497b09f1..3b2a6994801eac461391e1a2c0c798a1aa7cc2f9 100644 (file)
--- a/templates/conversationMessageListLog.tpl
+++ b/templates/conversationMessageListLog.tpl
@@ -11,7 +11,7 @@
                                                        <div class="messageHeaderBox">
                                                                <h2 class="messageTitle">
                                                                        {user object=$modificationLogEntry->getUserProfile() class='username'}
-                                                                       <small class="separatorLeft">{@$modificationLogEntry->time|time}</small>
+                                                                       <small class="separatorLeft">{time time=$modificationLogEntry->time}</small>
                                                                </h2>
                                                                <div>{@$modificationLogEntry}</div>
                                                        </div>

diff --git a/templates/conversationMessagePreview.tpl b/templates/conversationMessagePreview.tpl
index 8385544226a372d2782282d7267408df2ab1c3b4..f4d0cefe32ff21a2e2213eaea47bfeeeb23f4510 100644 (file)
--- a/templates/conversationMessagePreview.tpl
+++ b/templates/conversationMessagePreview.tpl
@@ -5,7 +5,7 @@
        
        <div>
                <div class="containerHeadline">
-                       <h3>{user object=$message->getUserProfile()} <small class="separatorLeft">{@$message->time|time}</small></h3>
+                       <h3>{user object=$message->getUserProfile()} <small class="separatorLeft">{time time=$message->time}</small></h3>
                </div>
                
                <div>{@$message->getExcerpt()}</div>

diff --git a/templates/email_notification_conversation.tpl b/templates/email_notification_conversation.tpl
index f6835cc0e9ddfa09e1ed7e817c5ad99fba3f43ae..4262871330440c0db16c045a38f848ebb345f8f7 100644 (file)
--- a/templates/email_notification_conversation.tpl
+++ b/templates/email_notification_conversation.tpl
@@ -23,7 +23,7 @@
                                                        {$message->username}
                                                {/if}
                                                ·
-                                               <a href="{$message->getLink()}"><small>{$message->time|plainTime}</small></a>
+                                               <a href="{$message->getLink()}"><small>{time time=$message->time type='plainTime'}</small></a>
                                        </h3>
                                </div>
                                <div>

diff --git a/templates/email_notification_conversationMessage.tpl b/templates/email_notification_conversationMessage.tpl
index 9ef897b0795fb80eda8094290d5c7235c53325ea..c63ce03fe57dd252d51caccd9acd7b96ab719648 100644 (file)
--- a/templates/email_notification_conversationMessage.tpl
+++ b/templates/email_notification_conversationMessage.tpl
@@ -26,7 +26,7 @@
                                                        {$message->username}
                                                {/if}
                                                ·
-                                               <a href="{$message->getLink()}"><small>{$message->time|plainTime}</small></a>
+                                               <a href="{$message->getLink()}"><small>{time time=$message->time type='plainTime'}</small></a>
                                        </h3>
                                </div>
                                <div>

diff --git a/templates/moderationConversationMessage.tpl b/templates/moderationConversationMessage.tpl
index be4f85ce509c48f53b9f1b74956f15ea7799fd61..b6509feb66d1c6fea757a1b11a416e5c0f9521a7 100644 (file)
--- a/templates/moderationConversationMessage.tpl
+++ b/templates/moderationConversationMessage.tpl
@@ -9,7 +9,7 @@
                                        
                                        <ul class="messageHeaderMetaData">
                                                <li>{user object=$message->getUserProfile() class='username'}</li>
-                                               <li><span class="messagePublicationTime">{@$message->getTime()|time}</span></li>
+                                               <li><span class="messagePublicationTime">{time time=$message->getTime()}</span></li>
                                                
                                                {event name='messageHeaderMetaData'}
                                        </ul>