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

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

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed -pot= option mentioned in prev entry.
    ! -pot= refinement to handle missing source .pots (which
      is normal). Also added/fixed some lng related debug options.
    ! Remaining debug texts made non-translatable.
    ; NOTE: It's now possible to handle all aspect of translation
            files using hbmk2 alone. (extraction from source ->
            creation of unified translation file -> merging this
            file with previous version retaining existing
            translations -> creation of .hbl file from .pots)
This commit is contained in:
Viktor Szakats
2009-05-05 22:25:01 +00:00
parent ac2958e071
commit 1ff83fb1fb
2 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-06 00:20 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Fixed -pot= option mentioned in prev entry.
! -pot= refinement to handle missing source .pots (which
is normal). Also added/fixed some lng related debug options.
! Remaining debug texts made non-translatable.
; NOTE: It's now possible to handle all aspect of translation
files using hbmk2 alone. (extraction from source ->
creation of unified translation file -> merging this
file with previous version retaining existing
translations -> creation of .hbl file from .pots)
2009-05-05 19:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
* utils/hbmk2/hbmk2.hu_HU.pot
@@ -29,7 +41,7 @@
Przemek, copyright retained.
; TOFIX: For some reason update of existing .pot file with
new one doesn't work. It's probably something obvious
but I cannot see what.
but I cannot see what. [DONE]
2009-05-04 19:40 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/rddsql/sddmy/mysqldd.c

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

@@ -152,6 +152,7 @@ STATIC s_cUILNG
STATIC s_lDEBUGTIME := .F.
STATIC s_lDEBUGINC := .F.
STATIC s_lDEBUGSTUB := .F.
STATIC s_lDEBUGI18N := .F.
STATIC s_cCCPATH
STATIC s_cCCPREFIX
@@ -1089,6 +1090,7 @@ FUNCTION hbmk( aArgs )
CASE cParamL == "-debugtime" ; s_lDEBUGTIME := .T.
CASE cParamL == "-debuginc" ; s_lDEBUGINC := .T.
CASE cParamL == "-debugstub" ; s_lDEBUGSTUB := .T.
CASE cParamL == "-debugi18n" ; s_lDEBUGI18N := .T.
CASE cParamL == "-nulrdd" ; s_lNULRDD := .T.
CASE cParamL == "-nulrdd-" ; s_lNULRDD := .F.
CASE cParamL == "-map" ; s_lMAP := .T.
@@ -5087,21 +5089,30 @@ STATIC PROCEDURE MakePOT( aLNG, cPOT, aPRG, cWorkDir )
LOCAL aPOTIN
LOCAL fhnd
LOCAL cTempFileName
LOCAL cPOTCooked
IF ! Empty( cPOT )
aPOTIN := ListDirExt( aPRG, cWorkDir, ".pot" )
IF ! Empty( aPOTIN )
FOR EACH cLNG IN iif( Empty( aLNG ), { _LNG_MARKER }, aLNG )
cPOTCooked := StrTran( cPOT, _LNG_MARKER, cLNG )
IF hb_FileExists( cPOT )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "MakePOT: existing .pot / output: %1$s", cPOTCooked ) )
hbmk_OutStd( hb_StrFormat( "MakePOT: file .pot list: %1$s", ArrayToList( aPOTIN, ", " ) ) )
ENDIF
fhnd := hb_FTempCreateEx( @cTempFileName, NIL, NIL, ".pot" )
IF fhnd != F_ERROR
FClose( fhnd )
POTMerge( aPOTIN, cTempFileName )
AutoTrans( StrTran( cPOT, _LNG_MARKER, cLNG ), { cTempFileName }, StrTran( cPOT, _LNG_MARKER, cLNG ) )
AutoTrans( cTempFileName, { cPOTCooked }, cPOTCooked )
FErase( cTempFileName )
ENDIF
ELSE
POTMerge( aPOTIN, cPOT )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "MakePOT: new .pot: %1$s", cPOTCooked ) )
ENDIF
POTMerge( aPOTIN, cPOTCooked )
ENDIF
NEXT
ENDIF
@@ -5117,8 +5128,8 @@ STATIC PROCEDURE MakeHBL( aPOT, cHBL, aLNG )
LOCAL aPOT_TODO
IF ! Empty( aPOT )
IF s_lDEBUG
hbmk_OutStd( hb_StrFormat( I_( "pot: in: %1$s" ), ArrayToList( aPOT ) ) )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "pot: in: %1$s", ArrayToList( aPOT ) ) )
ENDIF
IF Empty( cHBL )
cHBL := FN_NameGet( aPOT[ 1 ] )
@@ -5137,8 +5148,8 @@ STATIC PROCEDURE MakeHBL( aPOT, cHBL, aLNG )
ENDIF
NEXT
IF ! Empty( aPOT_TODO )
IF s_lDEBUG
hbmk_OutStd( hb_StrFormat( I_( "pot: %1$s -> %2$s" ), ArrayToList( aPOT_TODO ), StrTran( cHBL, _LNG_MARKER, cLNG ) ) )
IF s_lDEBUGI18N
hbmk_OutStd( hb_StrFormat( "pot: %1$s -> %2$s", ArrayToList( aPOT_TODO ), StrTran( cHBL, _LNG_MARKER, cLNG ) ) )
ENDIF
GenHbl( aPOT_TODO, StrTran( cHBL, _LNG_MARKER, cLNG ) )
ENDIF
@@ -5147,24 +5158,28 @@ STATIC PROCEDURE MakeHBL( aPOT, cHBL, aLNG )
RETURN
STATIC FUNCTION LoadPOTFiles( aFiles )
STATIC FUNCTION LoadPOTFiles( aFiles, lIgnoreError )
LOCAL aTrans, aTrans2
LOCAL cErrorMsg
LOCAL n
aTrans := __i18n_potArrayLoad( aFiles[ 1 ], @cErrorMsg )
IF aTrans == NIL
hbmk_OutErr( hb_StrFormat( I_( ".pot error: %1$s" ), cErrorMsg ) )
ELSE
IF aTrans != NIL
FOR n := 2 TO Len( aFiles )
aTrans2 := __i18n_potArrayLoad( aFiles[ n ], @cErrorMsg )
IF aTrans2 == NIL
hbmk_OutErr( hb_StrFormat( I_( ".pot error: %1$s" ), cErrorMsg ) )
EXIT
ELSE
IF aTrans2 != NIL
__i18n_potArrayJoin( aTrans, aTrans2 )
ELSE
IF ! lIgnoreError
hbmk_OutErr( hb_StrFormat( I_( ".pot error: %1$s" ), cErrorMsg ) )
EXIT
ENDIF
ENDIF
NEXT
ELSE
IF ! lIgnoreError
hbmk_OutErr( hb_StrFormat( I_( ".pot error: %1$s" ), cErrorMsg ) )
ENDIF
ENDIF
RETURN aTrans
@@ -5191,10 +5206,10 @@ STATIC FUNCTION LoadPOTFilesAsHash( aFiles )
ENDIF
ELSE
aTrans := __i18n_potArrayLoad( aFiles[ n ], @cErrorMsg )
IF aTrans == NIL
hbmk_OutErr( hb_StrFormat( I_( "Error: %1$s" ), cErrorMsg ) )
ELSE
IF aTrans != NIL
hTrans := __i18n_potArrayToHash( aTrans,, hTrans )
ELSE
hbmk_OutErr( hb_StrFormat( I_( "Error: %1$s" ), cErrorMsg ) )
ENDIF
ENDIF
NEXT
@@ -5203,7 +5218,7 @@ STATIC FUNCTION LoadPOTFilesAsHash( aFiles )
STATIC PROCEDURE POTMerge( aFiles, cFileOut )
LOCAL cErrorMsg
LOCAL aTrans := LoadPOTFiles( aFiles )
LOCAL aTrans := LoadPOTFiles( aFiles, .T. )
IF aTrans != NIL
IF !__i18n_potArraySave( cFileOut, aTrans, @cErrorMsg )
@@ -5216,7 +5231,7 @@ STATIC PROCEDURE POTMerge( aFiles, cFileOut )
STATIC FUNCTION GenHbl( aFiles, cFileOut, lEmpty )
LOCAL cHblBody
LOCAL pI18N
LOCAL aTrans := LoadPOTFiles( aFiles )
LOCAL aTrans := LoadPOTFiles( aFiles, .F. )
LOCAL lRetVal := .F.
IF ISARRAY( aTrans )
@@ -5235,7 +5250,7 @@ STATIC PROCEDURE AutoTrans( cFileIn, aFiles, cFileOut )
LOCAL cErrorMsg
IF !__I18N_potArraySave( cFileOut, ;
__I18N_potArrayTrans( LoadPOTFiles( { cFileIn } ), ;
__I18N_potArrayTrans( LoadPOTFiles( { cFileIn }, .T. ), ;
LoadPOTFilesAsHash( aFiles ) ), @cErrorMsg )
hbmk_OutErr( hb_StrFormat( I_( "Error: %1$s" ), cErrorMsg ) )
ENDIF