Index: branches/5.2.x/core/ckeditor/ckfinder/plugins/flashupload/Uploader.html =================================================================== diff -u -r15042 -r15316 --- branches/5.2.x/core/ckeditor/ckfinder/plugins/flashupload/Uploader.html (.../Uploader.html) (revision 15042) +++ branches/5.2.x/core/ckeditor/ckfinder/plugins/flashupload/Uploader.html (.../Uploader.html) (revision 15316) @@ -1,4 +1,15 @@ + @@ -56,7 +67,8 @@ totalFilesLabel : encodeURIComponent(lang.UploadTotalFiles), clearButtonLabel : encodeURIComponent(lang.UploadClearFiles), cancelButtonLabel : encodeURIComponent(lang.CancelBtn), - uploadButtonLabel : encodeURIComponent(lang.Upload), + closeButtonLabel : encodeURIComponent(lang.CloseBtn), + uploadButtonLabel : encodeURIComponent(lang.UploadSend), cancelUploadButtonLabel : encodeURIComponent(lang.UploadCancel), removeButtonLabel : encodeURIComponent(lang.UploadRemove), removeTip : encodeURIComponent(lang.UploadRemoveTip), @@ -83,12 +95,15 @@ } function getUploadUrl() { var api = window.parent.api; - return api.getSelectedFolder().getUploadUrl() + "response_type=txt"; + return api.getSelectedFolder().getUploadUrl() + "&response_type=txt"; } function getMaxSize() { var api = window.parent.api; return parseInt(api.getSelectedFolder().getResourceType().maxSize, 10); } +function getLang() { + return window.parent.api.lang; +} // Name of cookies used as session identifiers and the name to be used in the URL. // An unfortunate requirement of flash uploader due to infamous cookie bug in Flash. function getSessionIdentifiers() {