From 55da2b05b6db1967e2d50769a39cfd87e012d524 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 24 Nov 2010 15:11:23 +0000 Subject: [PATCH] 2010-11-24 16:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed RTE in language file generation in some side case, reported by Mindaugas. (not tested, pls do) --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 045252411c..97d6705878 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-24 16:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! Fixed RTE in language file generation in some side case, + reported by Mindaugas. + (not tested, pls do) + 2010-11-24 15:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Fixed typo causing not recognized -hbl (without parameter) diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 2380698f73..7327cf5860 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -10363,11 +10363,14 @@ STATIC PROCEDURE POTMerge( hbmk, aFiles, cFileBase, cFileOut ) STATIC PROCEDURE AutoTrans( hbmk, cFileIn, aFiles, cFileOut ) LOCAL cErrorMsg + LOCAL hTrans := LoadPOTFilesAsHash( hbmk, aFiles ) - IF ! __i18n_potArraySave( cFileOut, ; - __i18n_potArrayTrans( LoadPOTFiles( hbmk, {}, cFileIn, .F. ), ; - LoadPOTFilesAsHash( hbmk, aFiles ) ), @cErrorMsg, ! hbmk[ _HBMK_lMINIPO ], ! hbmk[ _HBMK_lMINIPO ] ) - hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: %1$s" ), cErrorMsg ) ) + IF hTrans != NIL + IF ! __i18n_potArraySave( cFileOut, ; + __i18n_potArrayTrans( LoadPOTFiles( hbmk, {}, cFileIn, .F. ), ; + hTrans ), @cErrorMsg, ! hbmk[ _HBMK_lMINIPO ], ! hbmk[ _HBMK_lMINIPO ] ) + hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: %1$s" ), cErrorMsg ) ) + ENDIF ENDIF RETURN