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 606ee6fe2f97b0a926f1cdd9da391ef4de627327..638300f9beb83912a5d40252aa7df44681cf7136 100644 (file)
--- 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 738b595ced2e6fad2595ffcf4102bb9ee915583d..72b175bf5ea7cf0f2b02518ee9b444a0ae38333e 100644 (file)
--- 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 07e5105a4a7b49d442906aff3b04b52b988bd278..e528b71ec2837b7de38632f38ab8e954f041ee5c 100644 (file)
--- 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 d384bf9988e7cb8a232d366c0e5d546ede75a02b..5893424dd3afa241d49a9dea8bd3ff206acf33d4 100644 (file)
--- 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 bddd0cad16d95d61c54b90ac3713a951be2c8a1d..463faf3b8f09ca640009d3843b4c7d9b0659b259 100644 (file)
--- 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 9365f03ee515bc36b81ad5caba631be1ca31cd6b..a24e7510bec88b751e7fcce2e84b40430906b0db 100644 (file)
--- 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});