From 89e74d87ca4fef5222ed7cb7d83d6ebbcbf4c5a4 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Fri, 4 Aug 2017 14:09:14 +0200
Subject: [PATCH] [TASK] Fixing some language labels
---
Resources/Private/Language/de.locallang.xlf | 12 +++----
Resources/Private/Language/locallang.xlf | 6 ++--
Resources/Private/Templates/Queue/Index.html | 38 ++++++--------------
3 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index bf337391..568c5bcf 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -194,8 +194,8 @@
<target>Sprache (lädt die Seite neu):</target>
</trans-unit>
<trans-unit id="backend.send_again" approved="yes">
- <source>Send again</source>
- <target>Erneut senden</target>
+ <source>Send</source>
+ <target>Senden</target>
</trans-unit>
<trans-unit id="backend.send_mail_again" approved="yes">
<source>Send this email again?</source>
@@ -206,8 +206,8 @@
<target>Diese E-Mail jetzt versenden?</target>
</trans-unit>
<trans-unit id="backend.send_now" approved="yes">
- <source>Send now</source>
- <target>Jetzt senden</target>
+ <source>Send</source>
+ <target>Senden</target>
</trans-unit>
<trans-unit id="backend.send_test" approved="yes">
<source>Save and send preview mails</source>
@@ -222,8 +222,8 @@
<target>Versendet</target>
</trans-unit>
<trans-unit id="backend.showBody" approved="yes">
- <source>Show Mail</source>
- <target>Mail anzeigen</target>
+ <source>Show</source>
+ <target>Anzeigen</target>
</trans-unit>
<trans-unit id="backend.subject" approved="yes">
<source>Subject</source>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index fdf58b8d..ea7044a9 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -148,7 +148,7 @@
<source>Language (reloads the page):</source>
</trans-unit>
<trans-unit id="backend.send_again">
- <source>Send again</source>
+ <source>Send</source>
</trans-unit>
<trans-unit id="backend.send_mail_again">
<source>Send this email again?</source>
@@ -157,7 +157,7 @@
<source>Send this email now?</source>
</trans-unit>
<trans-unit id="backend.send_now">
- <source>Send now</source>
+ <source>Send</source>
</trans-unit>
<trans-unit id="backend.send_test">
<source>Save and send preview mails</source>
@@ -169,7 +169,7 @@
<source>Sent</source>
</trans-unit>
<trans-unit id="backend.showBody">
- <source>Show Mail</source>
+ <source>Show</source>
</trans-unit>
<trans-unit id="backend.subject">
<source>Subject</source>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index 014fbbc0..bdeabefa 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -19,8 +19,8 @@
<th></th>
<th><f:translate key="backend.from" /> <br> <f:translate key="backend.to" /></th>
<th><f:translate key="backend.subject" /></th>
- <th><f:translate key="backend.entry_date" /> <br> <f:translate key="backend.last_sent" /></th>
- <th></th>
+ <th><f:translate key="backend.entry_date" /> <br>
+ <f:translate key="backend.last_sent" /></th>
<th></th>
<th></th>
</tr>
@@ -45,7 +45,7 @@
<td>
<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span>
<br>
- <span><f:format.date format="d.m.Y h:i">{mail.tstamp}</f:format.date></span>
+ <span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span>
</td>
<td nowrap="nowrap" class="col-control">
<f:format.raw>
@@ -53,36 +53,20 @@
</f:format.raw>
</td>
<td>
- <f:if condition="{mail.sent} == '0'">
- <f:then>
- <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
+ <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
<span class="t3js-icon icon icon-size-small icon-state-default actions-document-import-t3d">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-import-t3d.svg" width="16" height="16">
</span>
</span>
- <f:translate key="backend.send_now" />
- </f:link.action>
- </f:then>
- <f:else>
- <f:link.action class="btn btn-default btn-resend" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
- <span class="t3js-icon icon icon-size-small icon-state-default icon-actions-insert-reference">
- <span class="icon-markup">
- <img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-insert-reference.svg" width="16" height="16">
- </span>
- </span>
- <f:translate key="backend.send_again" />
- </f:link.action>
- </f:else>
- </f:if>
- </td>
- <td>
+ <f:translate key="backend.send_now" />
+ </f:link.action>
<a class="btn btn-default btn-toggle" data-uid="{mail.uid}">
- <span class="t3js-icon icon icon-size-small icon-state-default actions-document-view">
- <span class="icon-markup">
- <img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-view.svg" width="16" height="16">
- </span>
- </span>
+ <span class="t3js-icon icon icon-size-small icon-state-default actions-document-view">
+ <span class="icon-markup">
+ <img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-view.svg" width="16" height="16">
+ </span>
+ </span>
<f:translate key="backend.showBody" />
</a>
</td>
--
GitLab