From be28dac578d5e5cf4c4752631869d3f2f45178c7 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 5 Jul 2010 13:52:49 +0000 Subject: [PATCH] A wrongly escaped regexp in collectcatkeys made it not find any strings to translate. Thanks to mt for noticing! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37401 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/locale/collectcatkeys.cpp | 4 ++-- src/tools/locale/collectcatkeys.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/locale/collectcatkeys.cpp b/src/bin/locale/collectcatkeys.cpp index b47e978a04..08c08facb9 100644 --- a/src/bin/locale/collectcatkeys.cpp +++ b/src/bin/locale/collectcatkeys.cpp @@ -29,7 +29,7 @@ const char *inputFile = NULL; 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 @@ usage() " -o \t\texplicitly specifies the name of the output-file\n" " -p\t\t\tprint keys as they are found\n" " -r \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 \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"); diff --git a/src/tools/locale/collectcatkeys.cpp b/src/tools/locale/collectcatkeys.cpp index ca5d7c2021..88f61626fd 100644 --- a/src/tools/locale/collectcatkeys.cpp +++ b/src/tools/locale/collectcatkeys.cpp @@ -28,7 +28,7 @@ const char *inputFile = NULL; 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*)");