Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding B_TRANSLATE_NOCOLLECT_APP_NAME. Reordered.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40961 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström 2011-03-15 16:00:58 +00:00
parent 820ea97496
commit b6075d1fd2
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
headers/os/locale/Catalog.h
View File

@ -100,12 +100,6 @@ private:
BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_CONTEXT)
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_APP_NAME_CONTEXT) : (string)
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
BLocaleRoster::Default()->GetCatalog()->GetString((string), (context))
@ -124,6 +118,12 @@ private:
#define B_TRANSLATE_ID(id) \
BLocaleRoster::Default()->GetCatalog()->GetString((id))
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
BLocaleRoster::Default()->IsFilesystemTranslationPreferred() \
? BLocaleRoster::Default()->GetCatalog()->GetString((string), \
B_TRANSLATE_APP_NAME_CONTEXT) : (string)
// Translation markers which can be used to mark static strings/IDs which
// are used as key for translation requests (at other places in the code):
/* example:
@ -185,6 +185,10 @@ private:
#define B_TRANSLATE_NOCOLLECT_ID(id) \
B_TRANSLATE_ID(id)
#undef B_TRANSLATE_NOCOLLECT_APP_NAME
#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
B_TRANSLATE_APP_NAME(str)
#endif /* B_AVOID_TRANSLATION_MACROS */
#else /* B_COLLECTING_CATKEYS */
@ -200,10 +204,6 @@ private:
#define B_TRANSLATE(string) \
B_CATKEY((string), B_TRANSLATE_CONTEXT)
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
#undef B_TRANSLATE_WITH_CONTEXT
#define B_TRANSLATE_WITH_CONTEXT(string, context) \
B_CATKEY((string), (context))
@ -220,6 +220,10 @@ private:
#define B_TRANSLATE_ID(id) \
B_CATKEY((id))
#undef B_TRANSLATE_APP_NAME
#define B_TRANSLATE_APP_NAME(string) \
B_CATKEY((string), B_TRANSLATE_APP_NAME_CONTEXT)
#undef B_TRANSLATE_MARK
#define B_TRANSLATE_MARK(str) \
B_CATKEY((str), B_TRANSLATE_CONTEXT)
@ -256,6 +260,10 @@ private:
#define B_TRANSLATE_NOCOLLECT_ID(id) \
(void)
#undef B_TRANSLATE_NOCOLLECT_APP_NAME
#define B_TRANSLATE_NOCOLLECT_APP_NAME(str) \
(void)
#endif /* B_COLLECTING_CATKEYS */