From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 9 Jul 2014 16:14:42 +0000 (+0200)
Subject: Make upload button language item globally available in JavaScript
X-Git-Tag: 2.1.0_Alpha_1~594
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e172c40dbc0609e6100702e6684d1155514e4d21;p=GitHub%2FWoltLab%2FWCF.git

Make upload button language item globally available in JavaScript
---

diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index 606ee6fe2f..638300f9be 100644
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -126,8 +126,7 @@
 				'wcf.user.avatar.upload.error.tooLarge': '{lang}wcf.user.avatar.upload.error.tooLarge{/lang}',
 				'wcf.user.avatar.upload.error.uploadFailed': '{lang}wcf.user.avatar.upload.error.uploadFailed{/lang}',
 				'wcf.user.avatar.upload.error.badImage': '{lang}wcf.user.avatar.upload.error.badImage{/lang}',
-				'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}',
-				'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}'
+				'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}'
 			});
 			
 			{if !$__wcf->user->disableAvatar}
diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 738b595ced..72b175bf5e 100644
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -79,6 +79,7 @@
 		'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
 		'wcf.global.button.search': '{lang}wcf.global.button.search{/lang}',
 		'wcf.global.button.submit': '{lang}wcf.global.button.submit{/lang}',
+		'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
 		'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
 		'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
 		'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index 07e5105a4a..e528b71ec2 100644
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -43,7 +43,6 @@
 			'wcf.attachment.upload.error.reachedLimit': '{lang}wcf.attachment.upload.error.reachedLimit{/lang}',
 			'wcf.attachment.upload.error.reachedRemainingLimit': '{lang}wcf.attachment.upload.error.reachedRemainingLimit{/lang}',
 			'wcf.attachment.upload.error.uploadFailed': '{lang}wcf.attachment.upload.error.uploadFailed{/lang}',
-			'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
 			'wcf.attachment.insert': '{lang}wcf.attachment.insert{/lang}',
 			'wcf.attachment.insertAll': '{lang}wcf.attachment.insertAll{/lang}',
 			'wcf.attachment.delete.sure': '{lang}wcf.attachment.delete.sure{/lang}'
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index d384bf9988..5893424dd3 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -77,6 +77,7 @@
 				'wcf.global.button.save': '{lang}wcf.global.button.save{/lang}',
 				'wcf.global.button.search': '{lang}wcf.global.button.search{/lang}',
 				'wcf.global.button.submit': '{lang}wcf.global.button.submit{/lang}',
+				'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
 				'wcf.global.confirmation.cancel': '{lang}wcf.global.confirmation.cancel{/lang}',
 				'wcf.global.confirmation.confirm': '{lang}wcf.global.confirmation.confirm{/lang}',
 				'wcf.global.confirmation.title': '{lang}wcf.global.confirmation.title{/lang}',
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index bddd0cad16..463faf3b8f 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -28,7 +28,6 @@
 		useFluidLayout();
 		
 		WCF.Language.addObject({
-			'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}',
 			'wcf.style.colorPicker': '{lang}wcf.style.colorPicker{/lang}',
 			'wcf.style.colorPicker.new': '{lang}wcf.style.colorPicker.new{/lang}',
 			'wcf.style.colorPicker.current': '{lang}wcf.style.colorPicker.current{/lang}',
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 9365f03ee5..a24e7510be 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -503,8 +503,7 @@
 							'wcf.user.avatar.upload.error.tooLarge': '{lang}wcf.user.avatar.upload.error.tooLarge{/lang}',
 							'wcf.user.avatar.upload.error.uploadFailed': '{lang}wcf.user.avatar.upload.error.uploadFailed{/lang}',
 							'wcf.user.avatar.upload.error.badImage': '{lang}wcf.user.avatar.upload.error.badImage{/lang}',
-							'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}',
-							'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}'
+							'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}'
 						});
 						
 						new WCF.User.Avatar.Upload({@$user->userID});