[haiku-commits] r40961 - haiku/trunk/headers/os/locale

  • From: jonas@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 15 Mar 2011 17:00:58 +0100 (CET)

Author: kirilla
Date: 2011-03-15 17:00:58 +0100 (Tue, 15 Mar 2011)
New Revision: 40961
Changeset: http://dev.haiku-os.org/changeset/40961

Modified:
   haiku/trunk/headers/os/locale/Catalog.h
Log:
Adding B_TRANSLATE_NOCOLLECT_APP_NAME. Reordered.

Modified: haiku/trunk/headers/os/locale/Catalog.h
===================================================================
--- haiku/trunk/headers/os/locale/Catalog.h     2011-03-15 15:32:22 UTC (rev 
40960)
+++ haiku/trunk/headers/os/locale/Catalog.h     2011-03-15 16:00:58 UTC (rev 
40961)
@@ -100,12 +100,6 @@
        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 @@
 #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 @@
 #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 @@
 #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 @@
 #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 @@
 #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 */
 
 


Other related posts:

  • » [haiku-commits] r40961 - haiku/trunk/headers/os/locale - jonas