[svn r21955] FS#2867 - The FCKEditor, the simple file manager: Restoring language support.

main/inc/lib/fckeditor/editor/dialog/common/fck_dialog_common.js

@@ -191,9 +191,13 @@ function OpenFileBrowser( url, width, height )
 		{
 			var FCKDialog = oEditor.FCKDialog ;
 		}
+		if ( !FCKLang )
+		{
+			var FCKLang = oEditor.FCKLang ;
+		}
 	}
 
-	// Otherwise FCK, FCKConfig and FCKDialog must be defined.
+	// Otherwise FCK, FCKConfig, FCKDialog and FCKLang must be defined.
 
 	if ( ( FCKConfig.OpenSimpleFileManagerInANewWindow && FCKConfig.OpenSimpleFileManagerInANewWindow.toString() == 'true' ) &&
 		( !FCKConfig.AdvancedFileManager || FCKConfig.AdvancedFileManager.toString() != 'true' ) )
@@ -211,7 +215,7 @@ function OpenFileBrowser( url, width, height )
 	}
 	else
 	{
-		FCKDialog.OpenDialog( 'FCKDialog_FileManager' , 'File Manager', url, width, height, '', window, true ) ;
+		FCKDialog.OpenDialog( 'FCKDialog_FileManager' , FCKLang['BrowseServer'], url, width, height, '', window, true ) ;
 	}
 }
 

main/inc/lib/fckeditor/editor/filemanager/browser/default/browser.html

@@ -75,22 +75,21 @@ if ( window.opener )
 }
 else
 {
-	var dialog = window.parent ;
-	var oEditor = dialog.InnerDialogLoaded() ;
-	var FCK = oEditor.FCK ;
-	var FCKLang = oEditor.FCKLang ;
-	var FCKConfig = oEditor.FCKConfig ;
+	try
+	{
+		var dialog = window.parent ;
+		var oEditor = dialog.InnerDialogLoaded() ;
+		var FCKLang = oEditor.FCKLang ;
+	}
+	catch ( ex ) { }
 }
-
-// Initialization of some language variables.
 if ( !FCKLang )
 {
-	FCKLang = [] ;
-}
-if ( !FCKLang['BrowseServer'] )
-{
-	FCKLang['BrowseServer'] = 'Browse Server' ;
+	var FCKLang = [] ;
 }
+
+// Initialization of some language variables.
+if ( !FCKLang['BrowseServer'] ) { FCKLang['BrowseServer'] = 'Browse Server' ; }
 FCKLang['FolderAlreadyExists'] = FCKLang['FolderAlreadyExists'] ? FCKLang['FolderAlreadyExists'] : 'Folder already exists.' ;
 FCKLang['InvalidFolderName'] = FCKLang['InvalidFolderName'] ? FCKLang['InvalidFolderName'] : 'Invalid folder name.' ;
 FCKLang['NoPermissionsToCreateFolder'] = FCKLang['NoPermissionsToCreateFolder'] ? FCKLang['NoPermissionsToCreateFolder'] : 'You have no permissions to create the folder.' ;

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmactualfolder.html

@@ -78,7 +78,7 @@ window.onload = function()
 		<table class="fullHeight" cellSpacing="0" cellPadding="0" width="100%" border="0">
 			<tr>
 				<td>
-					<!-- <button style="WIDTH: 100%" type="button"> -->
+					<!-- <button style="width: 100%" type="button"> -->
 						<table cellSpacing="0" cellPadding="0" width="100%" border="0">
 							<tr>
 								<td><img height="32" alt="" src="images/FolderOpened32.gif" width="32"></td>

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html

@@ -29,28 +29,32 @@
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
 
-// Initialization of some language variables.
-var FCKLang = [];
-
 if ( window.parent.opener )
 {
+	var FCKLang = [];
 	try
 	{
 		FCKLang = window.parent.opener.FCKLang ;
 	}
 	catch ( ex ) { }
 }
-
-if ( !FCKLang )
+else
 {
-	FCKLang = [] ;
+	try
+	{
+		var dialog = window.parent.parent ;
+		var oEditor = dialog.InnerDialogLoaded() ;
+		var FCKLang = oEditor.FCKLang ;
+	}
+	catch ( ex ) { }
 }
-
-if ( !FCKLang['CreateNewFolder'] )
+if ( !FCKLang )
 {
-	FCKLang['CreateNewFolder'] = 'Create a folder' ;
+	var FCKLang = [] ;
 }
 
+//Initialization of some language variables.
+if ( !FCKLang['CreateNewFolder'] ) { FCKLang['CreateNewFolder'] = 'Create a folder' ; }
 FCKLang['NewFoderName'] = FCKLang['NewFoderName'] ? FCKLang['NewFoderName'] : 'Type the name of the new folder:' ;
 FCKLang['NewFoderNameRequest'] = FCKLang['NewFoderNameRequest'] ? FCKLang['NewFoderNameRequest'] : 'Please, type the folder name.' ;
 FCKLang['FolderAlreadyExists'] = FCKLang['FolderAlreadyExists'] ? FCKLang['FolderAlreadyExists'] : 'Folder already exists.' ;

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourceslist.html

@@ -29,10 +29,9 @@
 	<script type="text/javascript" src="js/common.js"></script>
 	<script type="text/javascript">
 
-// Initialization of some language variables.
-var FCKLang = [];
 if ( window.parent.opener )
 {
+	var FCKLang = [];
 	try
 	{
 		FCKLang = window.parent.opener.FCKLang ;
@@ -43,14 +42,18 @@ else
 {
 	try
 	{
-		FCKLang = window.parent.FCKLang ;
+		var dialog = window.parent.parent ;
+		var oEditor = dialog.InnerDialogLoaded() ;
+		var FCKLang = oEditor.FCKLang ;
 	}
-	catch ( ex ) { }	
+	catch ( ex ) { }
 }
 if ( !FCKLang )
 {
-	FCKLang = [] ;
+	var FCKLang = [] ;
 }
+
+//Initialization of some language variables.
 FCKLang['ServerDidNotReturnProperXmlData'] = FCKLang['ServerDidNotReturnProperXmlData'] ? FCKLang['ServerDidNotReturnProperXmlData'] : 'The server didn\'t reply with a proper XML data. Please check your configuration.' ;
 
 var oListManager = new Object() ;

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmresourcetype.html

@@ -29,52 +29,37 @@
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
 
-// Initialization of some language variables.
-var FCKLang = [];
-
 if ( window.parent.opener )
 {
+	var FCKLang = [];
 	try
 	{
 		FCKLang = window.parent.opener.FCKLang ;
 	}
 	catch ( ex ) { }
 }
-
-if ( !FCKLang )
-{
-	FCKLang = [] ;
-}
-
-if ( !FCKLang['Folder'] )
-{
-	FCKLang['Folder'] = 'Folder' ;
-}
-
-if ( !FCKLang['ResourceTypeRoot'] )
-{
-	FCKLang['ResourceTypeRoot'] = 'Root' ;
-}
-
-if ( !FCKLang['ResourceTypeAudio'] )
+else
 {
-	FCKLang['ResourceTypeAudio'] = 'Audio' ;
-}
-
-if ( !FCKLang['ResourceTypeImages'] )
-{
-	FCKLang['ResourceTypeImages'] = 'Images' ;
+	try
+	{
+		var dialog = window.parent.parent ;
+		var oEditor = dialog.InnerDialogLoaded() ;
+		var FCKLang = oEditor.FCKLang ;
+	}
+	catch ( ex ) { }
 }
-
-if ( !FCKLang['ResourceTypeFlash'] )
+if ( !FCKLang )
 {
-	FCKLang['ResourceTypeFlash'] = 'Flash' ;
+	var FCKLang = [] ;
 }
 
-if ( !FCKLang['ResourceTypeVideo'] )
-{
-	FCKLang['ResourceTypeVideo'] = 'Video' ;
-}
+// Initialization of some language variables.
+if ( !FCKLang['Folder'] ) { FCKLang['Folder'] = 'Folder' ; }
+if ( !FCKLang['ResourceTypeRoot'] ) { FCKLang['ResourceTypeRoot'] = 'Root' ; }
+if ( !FCKLang['ResourceTypeAudio'] ) { FCKLang['ResourceTypeAudio'] = 'Audio' ; }
+if ( !FCKLang['ResourceTypeImages'] ) { FCKLang['ResourceTypeImages'] = 'Images' ; }
+if ( !FCKLang['ResourceTypeFlash'] ) { FCKLang['ResourceTypeFlash'] = 'Flash' ; }
+if ( !FCKLang['ResourceTypeVideo'] ) { FCKLang['ResourceTypeVideo'] = 'Video' ; }
 
 function SetResourceType( type )
 {

main/inc/lib/fckeditor/editor/filemanager/browser/default/frmupload.html

@@ -29,39 +29,34 @@
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
 
-// Initialization of some language variables.
-var FCKLang = [];
-
 if ( window.parent.opener )
 {
+	var FCKLang = [];
 	try
 	{
 		FCKLang = window.parent.opener.FCKLang ;
 	}
 	catch ( ex ) { }
 }
-
-if ( !FCKLang )
+else
 {
-	FCKLang = [] ;
-}
-
-// We have to avoid javascript errors if some language variables have not been defined. 
-if ( !FCKLang['UploadFile'] )
-{
-	FCKLang['UploadFile'] = 'Upload a file' ;
-}
-
-if ( !FCKLang['Upload'] )
-{
-	FCKLang['Upload'] = 'Upload' ;
+	try
+	{
+		var dialog = window.parent.parent ;
+		var oEditor = dialog.InnerDialogLoaded() ;
+		var FCKLang = oEditor.FCKLang ;
+	}
+	catch ( ex ) { }
 }
-
-if ( !FCKLang['UploadSelectFileFirst'] )
+if ( !FCKLang )
 {
-	FCKLang['UploadSelectFileFirst'] = 'Please, select a file before pressing the upload button.' ;
+	var FCKLang = [] ;
 }
 
+// Initialization of some language variables.
+if ( !FCKLang['UploadFile'] ) { FCKLang['UploadFile'] = 'Upload a file' ; }
+if ( !FCKLang['Upload'] ) { FCKLang['Upload'] = 'Upload' ; }
+if ( !FCKLang['UploadSelectFileFirst'] ) { FCKLang['UploadSelectFileFirst'] = 'Please, select a file before pressing the upload button.' ; }
 FCKLang['FileRenamed'] = FCKLang['FileRenamed'] ? FCKLang['FileRenamed'] : 'A file with the same name is already available. The uploaded file has been renamed to ' ;
 FCKLang['InvalidFileType'] = FCKLang['InvalidFileType'] ? FCKLang['InvalidFileType'] : 'Invalid file type.' ;
 FCKLang['UploadError'] = FCKLang['UploadError'] ? FCKLang['UploadError'] : 'Error on file upload. Error number: ' ;