diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5408ca45c9..451e00d24c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,25 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-23 21:14 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/doc/man/harbour.1 + * harbour/source/compiler/hbusage.c + + added description for -j switch + + * harbour/include/hbexprb.c + * replaced // comments by /* */ + * accept (domain) parameters of HB_i18nGettext() when + number of parameters is two or more + Should we generate compile time warning when wrong number of + parameters is passed to this function or they are not literal + strings? Maybe only after -j+ or sth like that? + + * harbour/include/hbclass.ch + * harbour/include/tbrowse.ch + * harbour/include/hbpers.ch + * harbour/include/getexit.ch + * replaced // comments by /* */ + 2007-11-23 18:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/source/include/hbexprb.c * changed HB_i18nGettext() to hb_i18n_gettext(), to respect diff --git a/harbour/doc/man/harbour.1 b/harbour/doc/man/harbour.1 index 96fc5c28b5..bf64135fdf 100644 --- a/harbour/doc/man/harbour.1 +++ b/harbour/doc/man/harbour.1 @@ -38,6 +38,8 @@ output type: Windows/DOS OBJ32 (.obj) output type: Harbour Portable Object (.hrb) .IP "\fB-i\fP" 10 #include file search path +.IP "\fB-j[]\fP" 10 +generate i18n gettex file (.pot) .IP "\fB-k\fP" 10 compilation mode (type -k? for more data) .IP "\fB-l\fP" 10 diff --git a/harbour/include/getexit.ch b/harbour/include/getexit.ch index 210e420668..2380e9918a 100644 --- a/harbour/include/getexit.ch +++ b/harbour/include/getexit.ch @@ -63,7 +63,7 @@ #define GE_WRITE 6 #define GE_ESCAPE 7 #define GE_WHEN 8 /* when clause unsatisfied */ -#define GE_SHORTCUT 9 // introduced in x5.3 -#define GE_MOUSEHIT 10 // introduced in x5.3 +#define GE_SHORTCUT 9 /* introduced in x5.3 */ +#define GE_MOUSEHIT 10 /* introduced in x5.3 */ #endif /* _GETEXIT_CH */ diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index 674693f07a..f5b2474dde 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -442,7 +442,7 @@ DECLARE HBClass ; #xcommand PROTECTED: => nScope := HB_OO_CLSTP_PROTECTED - // Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07 + /* Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07 */ #xcommand METHOD [ AS ] INLINE [Local ,] [] => ; MESSAGE [ AS ] BLOCK {|Self [,] | __HB_CLS_SYMBOL_UNUSED(Self), } [ ] diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index 0a3e1f843f..2d02b7def4 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -1649,16 +1649,19 @@ static HB_EXPR_FUNC( hb_compExprUseFunCall ) { HB_EXPR_PTR pArg = pParms->value.asList.pExprList; - // TODO: do we need to add empty string also? - // TODO: add context, line number - if( HB_COMP_PARAM->fI18n && pArg->ExprType == HB_ET_STRING && pArg->ulLength > 0 ) + /* TODO: do we need to add empty string also? */ + /* TODO: add context, line number */ + if( HB_COMP_PARAM->fI18n && pArg->ExprType == HB_ET_STRING && + pArg->ulLength > 0 ) { - if( usCount == 2 && pArg->pNext->ExprType == HB_ET_STRING && pArg->pNext->ulLength > 0 ) - hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string, - pArg->pNext->value.asString.string, HB_COMP_PARAM->currLine ); - else - hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string, NULL, + if( usCount >= 2 && pArg->pNext->ExprType == HB_ET_STRING && + pArg->pNext->ulLength > 0 ) + hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string, + pArg->pNext->value.asString.string, HB_COMP_PARAM->currLine ); + else + hb_compI18nAdd( HB_COMP_PARAM, pArg->value.asString.string, + NULL, HB_COMP_PARAM->currLine ); } } #endif diff --git a/harbour/include/hbpers.ch b/harbour/include/hbpers.ch index 4da96a7240..da44789945 100644 --- a/harbour/include/hbpers.ch +++ b/harbour/include/hbpers.ch @@ -60,6 +60,6 @@ #xcommand ARRAY LEN => := Array( ) -#xcommand ENDARRAY => // Just used to ease the read of the ascii file +#xcommand ENDARRAY => /* Just used to ease the read of the ascii file */ #endif diff --git a/harbour/include/tbrowse.ch b/harbour/include/tbrowse.ch index 7c875c82e5..36cbaa9a11 100644 --- a/harbour/include/tbrowse.ch +++ b/harbour/include/tbrowse.ch @@ -53,13 +53,13 @@ #ifndef _TBROWSE_CH #define _TBROWSE_CH -// tBrowse ApplyKey() method return codes +/* tBrowse ApplyKey() method return codes */ #define TBR_EXIT -1 #define TBR_CONTINUE 0 #define TBR_EXCEPTION 1 -// tBrowse Styles +/* tBrowse Styles */ #define TBR_APPEND 1 #define TBR_APPENDING 2 @@ -69,7 +69,7 @@ #define TBR_CUSTOM 6 -// tBcolumn Styles +/* tBcolumn Styles */ #define TBC_READWRITE 1 #define TBC_MOVE 2 @@ -77,4 +77,3 @@ #define TBC_CUSTOM 4 #endif - diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c index b770351ecd..b787236a0e 100644 --- a/harbour/source/compiler/hbusage.c +++ b/harbour/source/compiler/hbusage.c @@ -77,6 +77,9 @@ void hb_compPrintUsage( HB_COMP_DECL, char * szSelf ) "\n %cgw output type: Windows/DOS OBJ32 (.obj)", "\n %cgh output type: Harbour Portable Object (.hrb)", "\n %ci #include file search path", +#ifdef HB_I18N_SUPPORT + "\n %cj[] generate i18n gettex file (.pot)", +#endif "\n %ck compilation mode (type -k? for more data)", "\n %cl suppress line number information", "\n %cm compile module only",