[haiku-commits] r37401 - in haiku/trunk/src: bin/locale tools/locale

  • From: pulkomandy@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 5 Jul 2010 15:52:49 +0200 (CEST)

Author: pulkomandy
Date: 2010-07-05 15:52:49 +0200 (Mon, 05 Jul 2010)
New Revision: 37401
Changeset: http://dev.haiku-os.org/changeset/37401/haiku

Modified:
   haiku/trunk/src/bin/locale/collectcatkeys.cpp
   haiku/trunk/src/tools/locale/collectcatkeys.cpp
Log:
A wrongly escaped regexp in collectcatkeys made it not find any strings to 
translate. Thanks to mt for noticing!


Modified: haiku/trunk/src/bin/locale/collectcatkeys.cpp
===================================================================
--- haiku/trunk/src/bin/locale/collectcatkeys.cpp       2010-07-05 13:36:16 UTC 
(rev 37400)
+++ haiku/trunk/src/bin/locale/collectcatkeys.cpp       2010-07-05 13:52:49 UTC 
(rev 37401)
@@ -29,7 +29,7 @@
 BString outputFile;
 const char *catalogSig = NULL;
 const char *catalogLang = "English";
-BString rxString("(BCatalogStub::GetCatalog()\\s*->\\s*GetString\\s*"
+BString rxString("(BCatalogStub::GetCatalog\\(\\)\\s*->\\s*GetString\\s*"
        "|BCatalogAddOn\\s*::\\s*MarkForTranslation\\s*)");
 
 
@@ -52,7 +52,7 @@
                "  -o <outfile>\t\texplicitly specifies the name of the 
output-file\n"
                "  -p\t\t\tprint keys as they are found\n"
                "  -r <regex>\t\tchanges the regex used by the key-scanner to 
the one given,\n"
-               "      \t\t\tthe default is:   
be_catalog\\s*->\\s*GetString\\s*\n"
+               "      \t\t\tthe default is:   
BCatalogStub::GetCatalog\\(\\)\\s*->\\s*GetString\\s*\n"
                "  -s <catalogSig>\tsignature of the target-catalog\n"
                "  -v\t\t\tbe verbose, show summary\n"
                "  -w\t\t\tshow warnings about catalog-accesses that couldn't 
be resolved completely\n");

Modified: haiku/trunk/src/tools/locale/collectcatkeys.cpp
===================================================================
--- haiku/trunk/src/tools/locale/collectcatkeys.cpp     2010-07-05 13:36:16 UTC 
(rev 37400)
+++ haiku/trunk/src/tools/locale/collectcatkeys.cpp     2010-07-05 13:52:49 UTC 
(rev 37401)
@@ -28,7 +28,7 @@
 BString outputFile;
 const char *catalogSig = NULL;
 const char *catalogLang = "English";
-BString rxString("(BCatalogStub::GetCatalog()\\s*->\\s*GetString\\s*"
+BString rxString("(BCatalogStub::GetCatalog\\(\\)\\s*->\\s*GetString\\s*"
        "|BCatalogAddOn\\s*::\\s*MarkForTranslation\\s*)");
 
 


Other related posts:

  • » [haiku-commits] r37401 - in haiku/trunk/src: bin/locale tools/locale - pulkomandy