2013-03-31 20:13 UTC+0200 Viktor Szakats (harbour syenar.net)

- utils/hbmk2/po/hbmk2.hu!.po
    - deleted accidentally added file

  * utils/hbmk2/_md_make.hb
  * utils/hbmk2/_po_pull.hb
    * minor tweaks

  * utils/hbmk2/po/hbmk2.hu.po
    + added two translations for testing automatic .po translation upload

ChangeLog.txt

@@ -10,6 +10,17 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-31 20:13 UTC+0200 Viktor Szakats (harbour syenar.net)
+  - utils/hbmk2/po/hbmk2.hu!.po
+    - deleted accidentally added file
+
+  * utils/hbmk2/_md_make.hb
+  * utils/hbmk2/_po_pull.hb
+    * minor tweaks
+
+  * utils/hbmk2/po/hbmk2.hu.po
+    + added two translations for testing automatic .po translation upload
+
 2013-03-31 16:34 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/_md_make.hb
   * utils/hbmk2/_po_pull.hb

utils/hbmk2/_md_make.hb

@@ -26,24 +26,20 @@ PROCEDURE Main()
    LOCAL cPO_Dir := cBase + hb_DirSepToOS( "po/" )
    LOCAL cDoc_Dir := cBase + hb_DirSepToOS( "doc/" )
 
-   ? "preparing"
-
-   FOR EACH file IN Directory( cPO_Dir + "*.po" )
-      hb_run( hb_StrFormat( "hbi18n -q -g -o%1$s %2$s", ;
-         hb_FNameDir( cMain ) + hb_FNameName( file[ F_NAME ] ) + ".hbl", ;
-         cPO_Dir + file[ F_NAME ] ) )
-   NEXT
-
    cTemp := hb_FNameExtSet( cMain, ".hrb" )
 
-   hb_run( hb_StrFormat( "hbmk2 -hbraw -q0 %1$s -gh -o%2$s", cMain, cTemp ) )
-
    ? "generating .md help:"
 
+   hb_run( hb_StrFormat( "hbmk2 -hbraw -q0 %1$s -gh -o%2$s", cMain, cTemp ) )
+
    FOR EACH cLang IN hb_ATokens( cBaseLang + "," + hb_regexAll( "-lng=([a-zA-Z0-9_\-,]*)", hb_MemoRead( hb_FNameExtSet( cMain, ".hbp" ) ),,,,, .T. )[ 1 ][ 2 ], "," )
 
       ?? "", cLang
 
+      hb_run( hb_StrFormat( "hbi18n -q -g %1$s -o%2$s", ;
+         cPO_Dir + hb_FNameName( cMain ) + "." + cLang + ".po", ;
+         hb_FNameDir( cMain ) + hb_FNameName( cMain ) + "." + cLang + ".hbl" ) )
+
       file := cDoc_Dir + hb_FNameName( cMain ) + "." + cLang + ".md"
       hb_run( hb_StrFormat( "hbrun %1$s %2$s > %3$s", cTemp, StrTran( cDocOptions, "{LANG}", cLang ), file ) )
       FToNativeEOL( file )
@@ -54,13 +50,12 @@ PROCEDURE Main()
          hb_run( hb_StrFormat( "hbrun %1$s -lang=%2$s -longhelpmdsh > %3$s", cTemp, cLang, file ) )
          FToNativeEOL( file )
       ENDIF
+
+      FErase( hb_FNameDir( cMain ) + hb_FNameName( cMain ) + "." + cLang + ".hbl" )
    NEXT
 
    FErase( cTemp )
 
-   AEval( Directory( hb_FNameDir( cMain ) + "*.hbl" ), ;
-      {| tmp | FErase( hb_FNameDir( cMain ) + tmp[ F_NAME ] ) } )
-
    RETURN
 
 STATIC FUNCTION FToNativeEOL( cFile )

utils/hbmk2/_po_pull.hb

@@ -36,8 +36,8 @@ PROCEDURE Main( cLogin )
       ?? "", cLang
 
       hb_run( hb_StrFormat( "curl -s -i -L --user %1$s -X " + ;
-         "GET https://www.transifex.com/api/2/project/%2$s/resource/%3$s/translation/%4$s/ " + ;
-         "-o %5$s", ;
+         "GET https://www.transifex.com/api/2/project/%2$s/resource/%3$s/translation/%4$s/" + ;
+         " -o %5$s", ;
          cLogin, cProject, hb_FNameName( cMain ), cLang, cTemp ) )
 
       IF hb_jsonDecode( GetJSON( hb_MemoRead( cTemp ) ), @json ) > 0

utils/hbmk2/po/hbmk2.hu.po

@@ -88,12 +88,12 @@ msgstr "Figyelem: Hibás -main= érték figyelmen kívül hagyva: %1$s"
 #: utils/hbmk2/hbmk2.prg:2900
 #, c-format
 msgid "Warning: Invalid -request= value ignored: %1$s"
-msgstr ""
+msgstr "Figyelem: Hibás -request= érték figyelmen kívül hagyva: %1$s"
 
 #: utils/hbmk2/hbmk2.prg:3022
 #, c-format
 msgid "Warning: Ignored unsupported codepage value: %1$s"
-msgstr ""
+msgstr "Figyelem: Nem támogatott kódlap figyelmen kívül hagyva: %1$s"
 
 #: utils/hbmk2/hbmk2.prg:3070
 #, c-format