diff --git a/airtime_mvc/application/controllers/PluploadController.php b/airtime_mvc/application/controllers/PluploadController.php index 64de111d2..eddf9b47c 100644 --- a/airtime_mvc/application/controllers/PluploadController.php +++ b/airtime_mvc/application/controllers/PluploadController.php @@ -16,10 +16,12 @@ class PluploadController extends Zend_Controller_Action global $CC_CONFIG; $baseUrl = Application_Common_OsPath::getBaseDir(); + $locale = Application_Model_Preference::GetLocale(); $this->view->headScript()->appendFile($baseUrl.'/js/plupload/plupload.full.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/plupload/jquery.plupload.queue.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/plupload.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/plupload/i18n/'.$locale.'.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/plupload.queue.css?'.$CC_CONFIG['airtime_version']); } diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index de12ed800..8cf911c06 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -56,9 +56,8 @@ $(document).ready(function() { $(window).bind('beforeunload', function(){ if(uploadProgress){ - return $.i18n._("You are currently uploading files.")+"\n"+ - $.i18n._("Going to another screen will cancel the upload process.")+"\n"+ - $.i18n._("Are you sure you want to leave the page?"); + return sprintf($.i18n._("You are currently uploading files. %sGoing to another screen will cancel the upload process. %sAre you sure you want to leave the page?"), + "\n", "\n"); } }); diff --git a/airtime_mvc/public/js/plupload/i18n/en_CA.js b/airtime_mvc/public/js/plupload/i18n/en_CA.js new file mode 100644 index 000000000..b34927459 --- /dev/null +++ b/airtime_mvc/public/js/plupload/i18n/en_CA.js @@ -0,0 +1,25 @@ +// English +plupload.addI18n({ + 'Select files' : 'Select files', + 'Add files to the upload queue and click the start button.' : 'Add files to the upload queue and click the start button.', + 'Filename' : 'Filename', + 'Status' : 'Status', + 'Size' : 'Size', + 'Add files' : 'Add files', + 'Stop current upload' : 'Stop current upload', + 'Start uploading queue' : 'Start uploading queue', + 'Uploaded %d/%d files': 'Uploaded %d/%d files', + 'N/A' : 'N/A', + 'Drag files here.' : 'Drag files here.', + 'File extension error.': 'File extension error.', + 'File size error.': 'File size error.', + 'Init error.': 'Init error.', + 'HTTP Error.': 'HTTP Error.', + 'Security error.': 'Security error.', + 'Generic error.': 'Generic error.', + 'IO error.': 'IO error.', + 'Stop Upload': 'Stop Upload', + 'Add Files': 'Add Files', + 'Start Upload': 'Start Upload', + '%d files queued': '%d files queued' +}); \ No newline at end of file