i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional TR*-->B_TRANSLATE* cleanup

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36784 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-10 14:44:54 +00:00
parent d293cd2cf0
commit e1361e2e66
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/Catalog.h
+13 -13
View File
@@ -80,19 +80,19 @@ extern BCatalog* be_app_catalog;
// Translation macros which may be used to shorten translation requests: // Translation macros which may be used to shorten translation requests:
#undef TR #undef B_TRANSLATE
#define B_TRANSLATE(str) \ #define B_TRANSLATE(str) \
be_catalog->GetString((str), B_TRANSLATE_CONTEXT) be_catalog->GetString((str), B_TRANSLATE_CONTEXT)
#undef TR_CMT #undef B_TRANSLATE_COMMENT
#define B_TRANSLATE_COMMENT(str, cmt) \ #define B_TRANSLATE_COMMENT(str, cmt) \
be_catalog->GetString((str), B_TRANSLATE_CONTEXT, (cmt)) be_catalog->GetString((str), B_TRANSLATE_CONTEXT, (cmt))
#undef TR_ALL #undef B_TRANSLATE_ALL
#define B_TRANSLATE_ALL(str, ctx, cmt) \ #define B_TRANSLATE_ALL(str, ctx, cmt) \
be_catalog->GetString((str), (ctx), (cmt)) be_catalog->GetString((str), (ctx), (cmt))
#undef TR_ID #undef B_TRANSLATE_ID
#define B_TRANSLATE_ID(id) \ #define B_TRANSLATE_ID(id) \
be_catalog->GetString((id)) be_catalog->GetString((id))
@@ -102,36 +102,36 @@ extern BCatalog* be_app_catalog;
#define B_TRANSLATE_CONTEXT "MyDecentApp-Menu" #define B_TRANSLATE_CONTEXT "MyDecentApp-Menu"
static const char *choices[] = { static const char *choices[] = {
TR_MARK("left"), B_TRANSLATE_MARK("left"),
TR_MARK("right"), B_TRANSLATE_MARK("right"),
TR_MARK("up"), B_TRANSLATE_MARK("up"),
TR_MARK("down") B_TRANSLATE_MARK("down")
}; };
void MyClass::AddChoices(BMenu *menu) { void MyClass::AddChoices(BMenu *menu) {
for (char **ch = choices; *ch; ch++) { for (char **ch = choices; *ch; ch++) {
menu->AddItem( menu->AddItem(
new BMenuItem( new BMenuItem(
TR(*ch), B_TRANSLATE(*ch),
new BMessage(...) new BMessage(...)
) )
) )
} }
} }
*/ */
#undef TR_MARK #undef B_TRANSLATE_MARK
#define B_TRANSLATE_MARK(str) \ #define B_TRANSLATE_MARK(str) \
BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_CONTEXT, "") BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_CONTEXT, "")
#undef TR_MARK_CMT #undef B_TRANSLATE_MARK_COMMENT
#define B_TRANSLATE_MARK_COMMENT(str, cmt) \ #define B_TRANSLATE_MARK_COMMENT(str, cmt) \
BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_CONTEXT, (cmt)) BCatalogAddOn::MarkForTranslation((str), B_TRANSLATE_CONTEXT, (cmt))
#undef TR_MARK_ALL #undef B_TRANSLATE_MARK_ALL
#define B_TRANSLATE_MARK_ALL(str, ctx, cmt) \ #define B_TRANSLATE_MARK_ALL(str, ctx, cmt) \
BCatalogAddOn::MarkForTranslation((str), (ctx), (cmt)) BCatalogAddOn::MarkForTranslation((str), (ctx), (cmt))
#undef TR_MARK_ID #undef B_TRANSLATE_MARK_ID
#define B_TRANSLATE_MARK_ID(id) \ #define B_TRANSLATE_MARK_ID(id) \
BCatalogAddOn::MarkForTranslation((id)) BCatalogAddOn::MarkForTranslation((id))