Fixed some attachment-relevant issues

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 2a69ea8c87b54d940cc60fd1cdf660190133eae2..86938767f8ceaa40641bf2a045d643e5d50c9745 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -89,7 +89,9 @@
                        'wcf.icon.arrow.up': '{icon size='S'}arrowUp{/icon}',
                        'wcf.icon.arrow.up.circle': '{icon size='S'}circleArrowUp{/icon}',
                        'wcf.icon.dropdown': '{icon size='S'}dropdown{/icon}',
-                       'wcf.icon.edit': '{icon size='S'}edit{/icon}'
+                       'wcf.icon.edit': '{icon size='S'}edit{/icon}',
+                       'wcf.icon.delete': '{icon size='S'}delete{/icon}',
+                       'wcf.icon.error': '{icon size='L'}errorRed{/icon}'
                        {event name='javascriptIconImport'}
                });
                

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index f181afdbbf2307473d4d9d6edd4e90f0760861cd..5fe3a86ef18f9beada097c50d6d62c038d631430 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -4852,7 +4852,7 @@ WCF.Upload = Class.extend({
                if (this._supportsAJAXUpload) {
                        this._fileUpload = $('<input type="file" name="'+this._name+'" '+(this._options.multiple ? 'multiple="true" ' : '')+'/>');
                        this._fileUpload.change($.proxy(this._upload, this));
-                       var $button = $('<p class="button uploadButton"><span>Upload</span></p>');
+                       var $button = $('<p class="button uploadButton"><span>'+WCF.Language.get('wcf.global.button.upload')+'</span></p>');
                        $button.append(this._fileUpload);
                }
                else {

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index bb2f4634dc29f73dbe0fd887db434dfd70ea11be..2b29fa40e3c011ca75354c5a9192db1872aad6cc 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -618,6 +618,7 @@
                <item name="wcf.global.button.save"><![CDATA[Speichern]]></item>
                <item name="wcf.global.button.search"><![CDATA[Suche]]></item>
                <item name="wcf.global.button.submit"><![CDATA[Absenden]]></item>
+               <item name="wcf.global.button.upload"><![CDATA[Hochladen]]></item>
                <item name="wcf.global.confirmation.cancel"><![CDATA[Abbrechen]]></item>
                <item name="wcf.global.confirmation.confirm"><![CDATA[OK]]></item>
                <item name="wcf.global.confirmation.title"><![CDATA[Bestätigung erforderlich]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2057381927fa943bc0e7dfa09c254a6bc720a859..83d761fab23f79c0af9fa82f6ca53a7aa3626cfc 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -585,6 +585,7 @@
                <item name="wcf.global.button.save"><![CDATA[Save]]></item>
                <item name="wcf.global.button.search"><![CDATA[Search]]></item>
                <item name="wcf.global.button.submit"><![CDATA[Submit]]></item>
+               <item name="wcf.global.button.upload"><![CDATA[Upload]]></item>
                <item name="wcf.global.confirmation.cancel"><![CDATA[Cancel]]></item>
                <item name="wcf.global.confirmation.confirm"><![CDATA[OK]]></item>
                <item name="wcf.global.confirmation.title"><![CDATA[Confirmation required]]></item>