[pLog-svn] r5945 - in plog/trunk: js/ui locale/admin templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Sep 22 04:45:56 EDT 2007
Author: oscar
Date: 2007-09-22 04:45:56 -0400 (Sat, 22 Sep 2007)
New Revision: 5945
Modified:
plog/trunk/js/ui/core.js
plog/trunk/js/ui/upload.js
plog/trunk/locale/admin/locale_en_UK.php
plog/trunk/templates/admin/jslocale.template
Log:
Localized the messages that the flash file uploader can generate
Modified: plog/trunk/js/ui/core.js
===================================================================
--- plog/trunk/js/ui/core.js 2007-09-20 20:21:39 UTC (rev 5944)
+++ plog/trunk/js/ui/core.js 2007-09-22 08:45:56 UTC (rev 5945)
@@ -231,6 +231,20 @@
}
/**
- * Shorthand for Lifetype.Locale.tr
+ * It works like Lifetype.Locale.tr but allows us to perform replacements
+ * on the string via %s
+ *
+ * @param key
+ * @param replace
*/
-var tr = Lifetype.Locale.tr;
\ No newline at end of file
+Lifetype.Locale.pr = function( key, replace )
+{
+ var str = Lifetype.Locale.tr( key );
+ return( str.replace( "%s", replace ));
+}
+
+/**
+ * Shorthands for Lifetype.Locale.tr and Lifetype.Locale.pr
+ */
+var tr = Lifetype.Locale.tr;
+var pr = Lifetype.Locale.pr;
\ No newline at end of file
Modified: plog/trunk/js/ui/upload.js
===================================================================
--- plog/trunk/js/ui/upload.js 2007-09-20 20:21:39 UTC (rev 5944)
+++ plog/trunk/js/ui/upload.js 2007-09-22 08:45:56 UTC (rev 5945)
@@ -180,64 +180,59 @@
*/
Lifetype.UI.Upload.uploadError = function(error_code, fileObj, message)
{
- try {
- // Handle this error separately because we don't want to create a FileProgress element for it.
- switch(error_code) {
- case SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED:
- alert("You have attempted to queue too many files.\n" + (message == 0 ? "You have reached the upload limit." : "You may select " + (message > 1 ? "up to " + message + " files." : "one file.")));
- return;
- break;
- case SWFUpload.ERROR_CODE_MISSING_UPLOAD_TARGET:
- alert("There was a configuration error. You will not be able to upload a resume at this time.");
- this.debugMessage("Error Code: No backend file, File name: " + file.name + ", Message: " + message);
- return;
- break;
- case SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT:
- alert("The file you selected is too big.");
- this.debugMessage("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- return;
- break;
- case SWFUpload.ERROR_CODE_ZERO_BYTE_FILE:
- alert("The file you select is empty. Please select another file.");
- this.debugMessage("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- return;
- break;
- case SWFUpload.ERROR_CODE_UPLOAD_LIMIT_EXCEEDED:
- alert("You may only upload 1 file.");
- this.debugMessage("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- return;
- break;
- case SWFUpload.ERROR_CODE_INVALID_FILETYPE:
- alert("The file you choose is not an allowed file type.");
- this.debugMessage("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- return;
- break;
- default:
- alert("An error occurred in the upload. Try again later.");
- this.debugMessage("Error Code: " + error_code + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- return;
- break;
- }
- switch(error_code) {
- case SWFUpload.ERROR_CODE_HTTP_ERROR:
- progress.SetStatus("Upload Error");
- this.debugMessage("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
- break;
- case SWFUpload.ERROR_CODE_UPLOAD_FAILED:
- progress.SetStatus("Upload Failed.");
- this.debugMessage("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
- break;
- case SWFUpload.ERROR_CODE_IO_ERROR:
- progress.SetStatus("Server (IO) Error");
- this.debugMessage("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
- break;
- case SWFUpload.ERROR_CODE_SECURITY_ERROR:
- progress.SetStatus("Security Error");
- this.debugMessage("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
- break;
- }
- } catch (e) {}
+ switch(error_code) {
+ case SWFUpload.ERROR_CODE_QUEUE_LIMIT_EXCEEDED:
+ alert( tr( 'swfu_error_queue_limit_exceeded' ));
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_MISSING_UPLOAD_TARGET:
+ alert( tr( 'swfu_error_configuration_error' ));
+ this.debugMessage("Error Code: No backend file, File name: " + file.name + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_FILE_EXCEEDS_SIZE_LIMIT:
+ alert( pr( 'swfu_error_file_too_big', Lifetype.UI.Misc.nicerFileSize( Lifetype.UI.Upload.swfu.getSetting( 'file_size_limit' ) * 1024 )));
+ this.debugMessage("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_ZERO_BYTE_FILE:
+ alert( tr( 'swfu_error_empty_file' ));
+ this.debugMessage("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_LIMIT_EXCEEDED:
+ alert( tr( 'swfu_error_upload_limit_exceeded' ));
+ this.debugMessage("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_INVALID_FILETYPE:
+ alert( tr( 'swfu_error_invalid_filetype' ));
+ this.debugMessage("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ case SWFUpload.ERROR_CODE_HTTP_ERROR:
+ alert( pr( 'swfu_error_http_error', file.name ));
+ this.debugMessage("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_UPLOAD_FAILED:
+ alert( pr( 'swfu_error_upload_failed', file.name ));
+ this.debugMessage("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_IO_ERROR:
+ alert( pr( 'swfu_error_server_error', file.name ));
+ this.debugMessage("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+ break;
+ case SWFUpload.ERROR_CODE_SECURITY_ERROR:
+ alert( pr( 'swfu_error_security', file.name ));
+ this.debugMessage("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+ break;
+ default:
+ alert( pr( 'swfu_error_generic', file.name ));
+ this.debugMessage("Error Code: " + error_code + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+ return;
+ break;
+ }
}
/**
Modified: plog/trunk/locale/admin/locale_en_UK.php
===================================================================
--- plog/trunk/locale/admin/locale_en_UK.php 2007-09-20 20:21:39 UTC (rev 5944)
+++ plog/trunk/locale/admin/locale_en_UK.php 2007-09-22 08:45:56 UTC (rev 5945)
@@ -1353,4 +1353,16 @@
$messages['cancel'] = 'Cancel';
$messages['browse'] = 'Browse...';
+
+$messages['swfu_error_file_too_big'] = 'The file you selected is too big. The maximum allowed size is %s';
+$messages['swfu_error_configuration_error'] = 'Configuration error. No files can be uploaded';
+$messages['swfu_error_empty_file'] = 'The file you selected is empty and will not be uploaded';
+$messages['swfu_error_upload_limit_exceeded'] = 'Sorry, you may only upload one file';
+$messages['swfu_error_invalid_filetype'] = 'The file you choose is not an allowed file type';
+$messages['swfu_error_queue_limit_exceeded'] = 'You have exceeded the queue limit';
+$messages['swfu_error_generic'] = 'An error occurred while uploading file %s, please try again later';
+$messages['swfu_error_security'] = 'Security error while uploading file %s';
+$messages['swfu_error_server_error'] = 'Server (I/O) error while uploading file %s';
+$messages['swfu_error_upload_failed'] = 'The upload failed while uploading file %s';
+$messages['swfu_error_http_error'] = 'There was an error while uploading file %s'
?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/jslocale.template
===================================================================
--- plog/trunk/templates/admin/jslocale.template 2007-09-20 20:21:39 UTC (rev 5944)
+++ plog/trunk/templates/admin/jslocale.template 2007-09-22 08:45:56 UTC (rev 5945)
@@ -43,4 +43,16 @@
Lifetype.Locale.add( 'mb', '{$locale->tr("gb")}');
Lifetype.Locale.add( 'gb', '{$locale->tr("mb")}');
Lifetype.Locale.add( 'browse', '{$locale->tr("browse")}');
+// error messages used by the flash uploader
+Lifetype.Locale.add( 'swfu_error_file_too_big', '{$locale->tr("swfu_error_file_too_big")}' );
+Lifetype.Locale.add( 'swfu_error_configuration_error', '{$locale->tr("swfu_error_configuration_error")}' );
+Lifetype.Locale.add( 'swfu_error_empty_file', '{$locale->tr("swfu_error_empty_file")}' );
+Lifetype.Locale.add( 'swfu_error_upload_limit_exceeded', '{$locale->tr("swfu_error_upload_limit_exceeded")}' );
+Lifetype.Locale.add( 'swfu_error_invalid_filetype', '{$locale->tr("swfu_error_invalid_filetype")}' );
+Lifetype.Locale.add( 'swfu_error_queue_limit_exceeded', '{$locale->tr("swfu_error_queue_limit_exceeded")}' );
+Lifetype.Locale.add( 'swfu_error_generic', '{$locale->tr("swfu_error_generic")}' );
+Lifetype.Locale.add( 'swfu_error_security', '{$locale->tr("swfu_error_security")}' );
+Lifetype.Locale.add( 'swfu_error_server_error', '{$locale->tr("swfu_error_server_error")}' );
+Lifetype.Locale.add( 'swfu_error_upload_failed', '{$locale->tr("swfu_error_upload_failed")}' );
+Lifetype.Locale.add( 'swfu_error_http_error', '{$locale->tr("swfu_error_http_error")}' );
</script>
\ No newline at end of file
More information about the pLog-svn
mailing list