2013-03-30 12:06 UTC+0100 Viktor Szakats (harbour syenar.net)

* .gitattributes
    + added .yml
  * utils/hbmk2/_md_make.hb
    ! fixed to include base language
  * utils/hbmk2/_po_push.hb
    ! fixed one cwd dependence
  * utils/hbmk2/hbmk2.hbp
    * fmt

.gitattributes

@@ -43,6 +43,7 @@ ChangeLog.txt ident
 *.xml     text
 *.xsl     text
 *.y       text
+*.yml     text
 *.yyc     text
 *.yyh     text
 

ChangeLog.txt

@@ -10,6 +10,16 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-30 12:06 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * .gitattributes
+    + added .yml
+  * utils/hbmk2/_md_make.hb
+    ! fixed to include base language
+  * utils/hbmk2/_po_push.hb
+    ! fixed one cwd dependence
+  * utils/hbmk2/hbmk2.hbp
+    * fmt
+
 2013-03-30 04:24 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/_po_push.hb
   * utils/hbmk2/po/hbmk2.en.po

utils/hbmk2/_md_make.hb

@@ -23,7 +23,7 @@ PROCEDURE Main()
          hb_DirSepToOS( hb_DirBase() + "po/" + file[ F_NAME ] ) ) )
    NEXT
 
-   FOR EACH cLang IN hb_ATokens( hb_regexAll( "-lng=([a-zA-Z0-9_,]*)", hb_MemoRead( hb_DirBase() + "hbmk2.hbp" ),,,,, .T. )[ 1 ][ 2 ], "," )
+   FOR EACH cLang IN hb_ATokens( "en," + hb_regexAll( "-lng=([a-zA-Z0-9_,]*)", hb_MemoRead( hb_DirBase() + "hbmk2.hbp" ),,,,, .T. )[ 1 ][ 2 ], "," )
       ? file := hb_DirSepToOS( hb_DirBase() + "doc/hbmk2." + cLang + ".md" )
       hb_run( hb_StrFormat( "hbrun %1$s -lang=%2$s -longhelpmd > %3$s", hb_DirBase() + "hbmk2.prg", cLang, file ) )
       hb_MemoWrit( file, StrTran( hb_MemoRead( file ), e"\n", hb_eol() ) )

utils/hbmk2/_po_push.hb

@@ -24,7 +24,7 @@ PROCEDURE Main( cLogin )
 
    ? "generating pot"
 
-   hb_run( hb_StrFormat( "harbour -q0 hbmk2.prg -j%1$s -i%2$s -s", cTemp, hb_DirSepToOS( hb_DirBase() + "../../include" )) )
+   hb_run( hb_StrFormat( "harbour -q0 %1$s -j%2$s -i%3$s -s", hb_DirBase() + "hbmk2.prg", cTemp, hb_DirSepToOS( hb_DirBase() + "../../include" )) )
 
    ? "saving locally"
 

utils/hbmk2/hbmk2.hbp

@@ -22,6 +22,7 @@ hbmk2.prg
 
 po/hbmk2.%{hb_lng}.po
 -hbl=hbmk2.%{hb_lng}.hbl
+
 -lng=el,es_419,es_ES,fr_FR,hu,it,pt_BR
 
 # not using these together with .rc input, because some compilers (mingw)