fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-05-06 20:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
  * utils/hbmk2/hbmk2.hu_HU.po
    % Optimize to do only one .pot -> .po merge per session 
      (was one merge per target language)
    + Added screen feedback for .po/.hbl related operations.
    % Don't do .po rebuild if no source file has changed.
This commit is contained in:
Viktor Szakats
2009-05-06 18:15:04 +00:00
parent 02e0b97797
commit db91918805
3 changed files with 726 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-06 20:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
* utils/hbmk2/hbmk2.hu_HU.po
% Optimize to do only one .pot -> .po merge per session
(was one merge per target language)
+ Added screen feedback for .po/.hbl related operations.
% Don't do .po rebuild if no source file has changed.
2009-05-06 19:10 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/hbole/olecore.c
! fixed assign method return value

1293
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

File diff suppressed because it is too large Load Diff

59
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2829,7 +2829,7 @@ FUNCTION hbmk( aArgs )
s_aRESSRC_TODO := s_aRESSRC
ENDIF
IF ! Empty( s_cPO ) .AND. ! Empty( s_aPRG )
IF ! Empty( s_cPO ) .AND. ! Empty( s_aPRG ) .AND. Len( s_aPRG_TODO ) > 0
MakePO( s_aLNG, s_cPO, ListDirExt( s_aPRG, cWorkDir, ".pot" ) )
ENDIF
@@ -5094,30 +5094,58 @@ STATIC PROCEDURE MakePO( aLNG, cPO, aPOTIN )
LOCAL cPOTemp
LOCAL cPOCooked
LOCAL aNew := {}
LOCAL aUpd := {}
FOR EACH cLNG IN iif( Empty( aLNG ), { _LNG_MARKER }, aLNG )
cPOCooked := StrTran( cPO, _LNG_MARKER, cLNG )
IF hb_FileExists( cPOCooked )
fhnd := hb_FTempCreateEx( @cPOTemp, NIL, NIL, ".po" )
IF cLNG:__enumIndex() == 1
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "MakePO: existing/output unified .po: %1$s", cPOCooked ) )
hbmk_OutStd( hb_StrFormat( "MakePO: file .pot list: %1$s", ArrayToList( aPOTIN, ", " ) ) )
hbmk_OutStd( hb_StrFormat( "MakePO: unified .po: %1$s", cPOTemp ) )
ENDIF
fhnd := hb_FTempCreateEx( @cPOTemp, NIL, NIL, ".po" )
IF fhnd != F_ERROR
FClose( fhnd )
POTMerge( aPOTIN, cPOTemp )
AutoTrans( cPOTemp, { cPOCooked }, cPOCooked )
FErase( cPOTemp )
ELSE
hbmk_OutStd( I_( "Error: Cannot create temporary file." ) )
ENDIF
ENDIF
cPOCooked := StrTran( cPO, _LNG_MARKER, cLNG )
IF hb_FileExists( cPOCooked )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "MakePO: existing/output unified .po: %1$s", cPOCooked ) )
ENDIF
AutoTrans( cPOTemp, { cPOCooked }, cPOCooked )
AAdd( aUpd, cLNG )
ELSE
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "MakePO: new unified .po: %1$s", cPOCooked ) )
hbmk_OutStd( hb_StrFormat( "MakePO: file .pot list: %1$s", ArrayToList( aPOTIN, ", " ) ) )
ENDIF
POTMerge( aPOTIN, cPOCooked )
hb_FCopy( cPOTemp, cPOCooked )
AAdd( aNew, cLNG )
ENDIF
NEXT
IF ! Empty( cPOTemp )
FErase( cPOTemp )
ENDIF
IF ! Empty( aNew )
IF Empty( aLNG )
hbmk_OutStd( hb_StrFormat( I_( "Created .po file: %1$s" ), cPO ) )
ELSE
hbmk_OutStd( hb_StrFormat( I_( "Created .po file '%1$s' for language(s): %2$s" ), cPO, ArrayToList( aNew, ", " ) ) )
ENDIF
ENDIF
IF ! Empty( aUpd )
IF Empty( aLNG )
hbmk_OutStd( hb_StrFormat( I_( "Updated .po file: %1$s" ), cPO ) )
ELSE
hbmk_OutStd( hb_StrFormat( I_( "Updated .po file '%1$s' for language(s): %2$s" ), cPO, ArrayToList( aUpd, ", " ) ) )
ENDIF
ENDIF
RETURN
STATIC PROCEDURE MakeHBL( aPO, cHBL, aLNG )
@@ -5127,6 +5155,8 @@ STATIC PROCEDURE MakeHBL( aPO, cHBL, aLNG )
LOCAL tLNG
LOCAL aPO_TODO
LOCAL aNew := {}
IF ! Empty( aPO )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "po: in: %1$s", ArrayToList( aPO ) ) )
@@ -5152,10 +5182,19 @@ STATIC PROCEDURE MakeHBL( aPO, cHBL, aLNG )
hbmk_OutStd( hb_StrFormat( "po: %1$s -> %2$s", ArrayToList( aPO_TODO ), StrTran( cHBL, _LNG_MARKER, cLNG ) ) )
ENDIF
GenHbl( aPO_TODO, StrTran( cHBL, _LNG_MARKER, cLNG ) )
AAdd( aNew, cLNG )
ENDIF
NEXT
ENDIF
IF ! Empty( aNew )
IF Empty( aLNG )
hbmk_OutStd( hb_StrFormat( I_( "Created .hbl file: %1$s" ), cHBL ) )
ELSE
hbmk_OutStd( hb_StrFormat( I_( "Created .hbl file '%1$s' for language(s): %2$s" ), cHBL, ArrayToList( aNew, ", " ) ) )
ENDIF
ENDIF
RETURN
STATIC FUNCTION LoadPOTFiles( aFiles, lIgnoreError )
@@ -5423,7 +5462,7 @@ STATIC PROCEDURE ShowHelp( lLong )
LOCAL aText_Basic := {;
I_( "Syntax:" ),;
"",;
I_( " hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.pot|.po|.hbl]>" ),;
I_( " hbmk [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.po|.pot|.hbl]>" ),;
"",;
I_( "Options:" ) }