From b18bb1d5060b855fd95e8637f87ac30e75f3d9d2 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 8 Aug 2012 14:06:27 +0200
Subject: [PATCH] Fixed some attachment-relevant issues

---
 com.woltlab.wcf/template/headInclude.tpl | 4 +++-
 wcfsetup/install/files/js/WCF.js         | 2 +-
 wcfsetup/install/lang/de.xml             | 1 +
 wcfsetup/install/lang/en.xml             | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index 2a69ea8c87..86938767f8 100644
--- 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 f181afdbbf..5fe3a86ef1 100755
--- 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 bb2f4634dc..2b29fa40e3 100644
--- 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 2057381927..83d761fab2 100644
--- 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>
-- 
2.20.1