Changeset: 550 fdbozzo - 06/12/2014 03:33:12:

- Agregada parametrización del lenguaje en foxbin2prg.cfg

foxbin2prg.cfg

@@ -1,10 +1,13 @@
 ****************************************************************************************************
-* FOXBIN2PRG v1.19.37
+* FOXBIN2PRG v1.19.38
 * CONFIGURATION FILE / ARCHIVO DE CONFIGURACI<43>N
 ****************************************************************************************************
 
 ****************************************************************************************************
-* OPTION DOCUMENTATION SECTION / SECCI<43>N DE DOCUMENTACI<43>N DE OPCIONES
+* SECTION DOCUMENTATION OF OPTIONS / SECCI<43>N DE DOCUMENTACI<43>N DE OPCIONES
+*
+* EN: Note: This values have precedence over internal parameters and parameters used on scripts
+* ES: Nota: Estos valores tienen precedencia sobre los par<61>metros internos y los par<61>metros usados en los scripts
 *
 * DETAIL OF SUPPORTED VALUES / DETALLE DE VALORES SOPORTADOS
 * If no values given, these are the DEFAULTS / Si no se proporcionan valores, estos son los PREDETERMINADOS
@@ -20,6 +23,7 @@
 * OptimizeByFilestamp: 0		&& Optimize file regeneration depending on file timestamp / Optimizar la regeneraci<63>n de archivos dependiendo del timestamp de archivo
 * AllowMultiConfig: 1			&& 1=Allow CFG files per directory. if no CFG found, then use Main CFG. 0=Only use Main CFG
 * DropNullCharsFromCode: 1		&& 1=Drop NULL chars from source code / 0=Leave Nulls in code, if any
+* Language: (auto)				&& Language of shown messages and LOGs. EN=English, FR=French, ES=Espa<70>ol, DE=German, Not defined = AUTOMATIC [DEFAULT]
 
 *-- CONVERTION OPTIONS / OPCIONES DE CONVERSI<53>N
 * XXX_Conversion_Support: N		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
@@ -41,9 +45,6 @@
 * RedirectClassPerFileToMain: 0	&& 0=Don't redirect to file.tx2, 1=Redirect to file.tx2 when selecting file.class.tx2 / 0=No redireccionar a archivo.tx2, 1=Redireccionar a archivo.tx2 cuando se seleccione archivo.clase.tx2
 * ClassPerFileCheck: 0			&& 0=Don't check file.class.tx2 inclusion, 1=Check file.class.tx2 inclusion / 0=No verificar la inclusi<73>n de archivo.clase.tx2, 1=Verificar la inclusi<73>n de archivo.clase.tx2
 *
-* EN: Note: This values have precedence over internal parameters and parameters used on scripts
-* ES: Nota: Estos valores tienen precedencia sobre los par<61>metros internos y los par<61>metros usados en los scripts
-*
 * END DOCUMENTATION SECTION / FIN DE LA SECCI<43>N DE DOCUMENTACI<43>N
 ****************************************************************************************************
 

foxbin2prg.prg

@@ -550,7 +550,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	*--
 	n_FB2PRG_Version				= 1.19
 	*--
-	c_Language						= 'ES'
+	c_Language						= ''	&& EN, FR, ES, DE
 	c_loc_processing_file			= ''
 	c_loc_process_progress			= ''
 	c_FB2PRG_EXE_Version			= 0
@@ -1411,6 +1411,13 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 								.writeLog( JUSTFNAME(lcConfigFile) + ' > DropNullCharsFromCode:      ' + TRANSFORM(lcValue) )
 							ENDIF
 
+						CASE LEFT( laConfig(I), 9 ) == LOWER('Language:')
+							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 10 ) )
+							IF .T.
+								.ChangeLanguage(lcValue)
+								.writeLog( JUSTFNAME(lcConfigFile) + ' > Language:                   ' + TRANSFORM(lcValue) + ' (' + .c_Language + ')' )
+							ENDIF
+
 						CASE LEFT( laConfig(I), 23 ) == LOWER('PJX_Conversion_Support:')
 							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 24 ) )
 							IF INLIST( lcValue, '0', '1', '2' ) THEN
@@ -1529,6 +1536,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 				.writeLog( '> l_OptimizeByFilestamp:        ' + TRANSFORM(.l_OptimizeByFilestamp) )
 				.writeLog( '> l_DropNullCharsFromCode:      ' + TRANSFORM(.l_DropNullCharsFromCode) )
 				.writeLog( '> l_ClearDBFLastUpdate:         ' + TRANSFORM(.l_ClearDBFLastUpdate) )
+				.writeLog( '> c_Language:                   ' + TRANSFORM(.c_Language) )
 
 				lo_CFG	= NULL
 				RELEASE lo_CFG
@@ -2173,7 +2181,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 	ENDPROC
 
 
-	PROCEDURE ejecutar_WriteErrorLog
+	HIDDEN PROCEDURE ejecutar_WriteErrorLog
 		LPARAMETERS toEx, tcErrorInfo
 
 		LOCAL loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
@@ -11139,7 +11147,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 			LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
 		#ENDIF
 
-		LOCAL llFileExists
+		LOCAL llFileExists, lnBytes
 		LOCAL loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
 		loLang			= _SCREEN.o_FoxBin2Prg_Lang
 
@@ -11155,7 +11163,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
 				toFoxBin2Prg.ChangeFileAttribute( tcOutputFile, '-R' )
 			ENDIF
 
-			IF STRTOFILE( tcCodigo, tcOutputFile ) = 0
+			lnBytes	= STRTOFILE( tcCodigo, tcOutputFile )
+			THIS.writeLog( 'Generated file size: ' + TRANSFORM(lnBytes/1024) + ' KiB' )
+
+			IF lnBytes = 0
 				*ERROR 'No se puede generar el archivo [' + .c_OutputFile + '] porque es ReadOnly'
 				ERROR (TEXTMERGE(loLang.C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC))
 			ENDIF
@@ -21473,6 +21484,7 @@ DEFINE CLASS CL_LANG AS Custom
 		+ "   FOXBIN2PRG 'c:\development\classes\*.vc2'  '0'  '0'  '0'  '1'  '0'"
 	C_FOXBIN2PRG_JUST_VFP_9_LOC										= "FOXBIN2PRG is only for Visual FoxPro 9.0!"
 	C_FOXBIN2PRG_WARN_CAPTION_LOC									= "FOXBIN2PRG: WARNING!"
+	C_GENERATED_FILE_SIZE_LOC										= "Generated file size"
 	C_LANGUAGE_LOC													= "EN"
 	C_MENU_NOT_IN_VFP9_FORMAT_LOC									= "Menu [<<THIS.c_InputFile>>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU '<<THIS.c_InputFile>>'"
 	C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC						= "* Names capitalization program [<<lcEXE_CAPS>>] found"
@@ -21560,7 +21572,7 @@ DEFINE CLASS CL_LANG AS Custom
 					*-- Ya se carg<72>
 					.n_LanguageSelectedMethod	= 2	&& 2=Loaded from foxbin2prg.h
 
-				CASE tcLanguage == '33' && French (Franc<6E>s)
+				CASE INLIST(tcLanguage, '33', 'FR') && French (Franc<6E>s)
 					*-------------------------------------------------------------------------------------------------------------------------------------------
 					*-- NOTE: MUST USE DOUBLE QUOTES, OR SYNTAX ERRORS HAPPEN WHEN COMPILING. STRANGE :(
 					*-------------------------------------------------------------------------------------------------------------------------------------------
@@ -21594,6 +21606,7 @@ DEFINE CLASS CL_LANG AS Custom
 						+ "   FOXBIN2PRG 'c:\development\classes\*.vc2'  '0'  '0'  '0'  '1'  '0'"
 					.C_FOXBIN2PRG_JUST_VFP_9_LOC									= "FOXBIN2PRG est seulement pour Visual FoxPro 9.0!"
 					.C_FOXBIN2PRG_WARN_CAPTION_LOC									= "FOXBIN2PRG: AVERTISSEMENT!"
+					.C_GENERATED_FILE_SIZE_LOC										= "Taille du fichier g<>n<EFBFBD>r<EFBFBD>"
 					.C_LANGUAGE_LOC													= "FR"
 					.C_MENU_NOT_IN_VFP9_FORMAT_LOC									= "Menu [<<THIS.c_InputFile>>] ne est pas dans VFP 9 Format! - Se il vous pla<6C>t se convertir <20> VFP 9 avec MODIFY MENU '<<THIS.c_InputFile>>'"
 					.C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC						= "* Programme des noms de capitalisation [<<lcEXE_CAPS>>] trouv<75>"
@@ -21617,7 +21630,7 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_WARN_TABLE_ALIAS_ON_INDEX_EXPRESSION_LOC						= "AVERTISSEMENT!!" + CR_LF+ "ASSUREZ VOUS NE UTILISEZ PAS UN ALIAS DE TABLE SUR LES EXPRESSIONS INDEX CL<43>S!! (exemple: index on <<UPPER(JUSTSTEM(THIS.c_InputFile))>>.campo tag keyname)"
 					.C_WITH_ERRORS_LOC												= "avec des erreurs"
 
-				CASE tcLanguage == '34' && Spanish (Espa<70>ol)
+				CASE INLIST(tcLanguage, '34', 'ES') && Spanish (Espa<70>ol)
 					*-------------------------------------------------------------------------------------------------------------------------------------------
 					*-- NOTA: SE DEBEN USAR COMILLAS DOBLES, O ERRORES DE SINTAXIS OCURREN AL COMPILAR. EXTRA<52>O :(
 					*-------------------------------------------------------------------------------------------------------------------------------------------
@@ -21651,6 +21664,7 @@ DEFINE CLASS CL_LANG AS Custom
 						+ "   FOXBIN2PRG 'c:\desa\clases\*.vc2'  '0'  '0'  '0'  '1'  '0'"
 					.C_FOXBIN2PRG_JUST_VFP_9_LOC									= "<22>FOXBIN2PRG es solo para Visual FoxPro 9.0!"
 					.C_FOXBIN2PRG_WARN_CAPTION_LOC									= "FOXBIN2PRG: <20>ATENCI<43>N!"
+					.C_GENERATED_FILE_SIZE_LOC										= "Tama<6D>o del archivo generado"
 					.C_MENU_NOT_IN_VFP9_FORMAT_LOC									= "El Men<65> [<<THIS.c_InputFile>>] NO est<73> en formato VFP 9! - Por favor convertirlo a VFP 9 con MODIFY MENU '<<THIS.c_InputFile>>'"
 					.C_LANGUAGE_LOC													= "ES"
 					.C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC						= "* Se ha encontrado el programa de capitalizaci<63>n de nombres [<<lcEXE_CAPS>>]"
@@ -21674,7 +21688,7 @@ DEFINE CLASS CL_LANG AS Custom
 					.C_WARN_TABLE_ALIAS_ON_INDEX_EXPRESSION_LOC						= "<22><>ATENCI<43>N!!" + CR_LF+ "ASEG<45>RESE DE QUE NO EST<53> USANDO UN ALIAS DE TABLA EN LAS EXPRESIONES DE LOS <20>NDICES!! (ej: index on <<UPPER(JUSTSTEM(THIS.c_InputFile))>>.campo tag nombreclave)"
 					.C_WITH_ERRORS_LOC												= "con errores"
 
-				CASE tcLanguage == '49' && German (Alem<65>n)
+				CASE INLIST(tcLanguage, '49', 'DE') && German (Alem<65>n)
 					*-------------------------------------------------------------------------------------------------------------------------------------------
 					*-- NOTE: ES M<>SSEN ANF<4E>HRUNGSZEICHEN BENUTZT WERDEN, ODER SYNTAX ERRORS PASSIEREN BEIM COMPILE. SELTSAM :(
 					*-------------------------------------------------------------------------------------------------------------------------------------------
@@ -21708,6 +21722,7 @@ DEFINE CLASS CL_LANG AS Custom
 						+ "   FOXBIN2PRG 'c:\development\classes\*.vc2'  '0'  '0'  '0'  '1'  '0'"
 					.C_FOXBIN2PRG_JUST_VFP_9_LOC									= "FOXBIN2PRG ist nur f<>r Visual FoxPro 9.0!"
 					.C_FOXBIN2PRG_WARN_CAPTION_LOC									= "FOXBIN2PRG: WARNUNG!"
+					.C_GENERATED_FILE_SIZE_LOC										= "Generierte Dateigr<67><72>e"
 					.C_LANGUAGE_LOC													= "DE"
 					.C_MENU_NOT_IN_VFP9_FORMAT_LOC									= "Menu [<<THIS.c_InputFile>>] ist NICHT in VFP 9 Format! - Bitte zuerst nach VFP 9 konvertieren mit MODIFY MENU '<<THIS.c_InputFile>>'"
 					.C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC						= "* Programm f<>r Gro<72>schreibungssetzung [<<lcEXE_CAPS>>] gefunden"