From adfaad758013ebc7e80c283ab63fb75292d3c830 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 6 May 2009 19:37:39 +0000 Subject: [PATCH] 2009-05-06 21:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg % Applied __I18N_potArrayJoin() tweak to embedded LoadPOTFiles() function. This hugely boosts .pot merge performance for large number of these files. --- harbour/ChangeLog | 6 ++++++ harbour/utils/hbmk2/hbmk2.prg | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b71597fb8f..02e07dc2ce 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-06 21:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * utils/hbmk2/hbmk2.prg + % Applied __I18N_potArrayJoin() tweak to embedded LoadPOTFiles() + function. This hugely boosts .pot merge performance for large + number of these files. + 2009-05-06 21:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/mpkg_deb.sh * accept also slang1 for GTSLN diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index bea913894c..d3eefa2667 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5199,6 +5199,7 @@ STATIC PROCEDURE MakeHBL( aPO, cHBL, aLNG ) STATIC FUNCTION LoadPOTFiles( aFiles, lIgnoreError ) LOCAL aTrans, aTrans2 + LOCAL hIndex LOCAL cErrorMsg LOCAL cFileName @@ -5221,7 +5222,7 @@ STATIC FUNCTION LoadPOTFiles( aFiles, lIgnoreError ) IF s_lDEBUGI18N hbmk_OutStd( hb_StrFormat( "LoadPOTFiles(): Loaded: %1$s", cFileName ) ) ENDIF - __i18n_potArrayJoin( aTrans, aTrans2 ) + __i18n_potArrayJoin( aTrans, aTrans2, @hIndex ) ELSE IF ! lIgnoreError hbmk_OutErr( hb_StrFormat( I_( ".pot error: %1$s" ), cErrorMsg ) )