hrev51350 adds 1 changeset to branch 'master'
old head: 7c86c4573f697c129540e52d6b926937f3b00e16
new head: d64c7746c754342b020683871c5b770174218b45
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=d64c7746c754+%5E7c86c4573f69
----------------------------------------------------------------------------
d64c7746c754: Add B_TRANSLATE_MARK_CONTEXT to Catalog.h and
tools/CollectingCatalog.h
Fixes #13656
Signed-off-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
[ Owen <owenca@xxxxxxxxxxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51350
Commit: d64c7746c754342b020683871c5b770174218b45
URL: http://cgit.haiku-os.org/haiku/commit/?id=d64c7746c754
Author: Owen <owenca@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sat Aug 5 02:59:22 2017 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Commit-Date: Mon Aug 7 04:55:28 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13656
----------------------------------------------------------------------------
2 files changed, 14 insertions(+)
headers/os/locale/Catalog.h | 6 ++++++
headers/os/locale/tools/CollectingCatalog.h | 8 ++++++++
----------------------------------------------------------------------------
diff --git a/headers/os/locale/Catalog.h b/headers/os/locale/Catalog.h
index 2d0664f..910d05a 100644
--- a/headers/os/locale/Catalog.h
+++ b/headers/os/locale/Catalog.h
@@ -151,6 +151,9 @@ private:
#undef B_TRANSLATE_MARK
#define B_TRANSLATE_MARK(string) (string)
+#undef B_TRANSLATE_MARK_CONTEXT
+#define B_TRANSLATE_MARK_CONTEXT(string, context) (string)
+
#undef B_TRANSLATE_MARK_COMMENT
#define B_TRANSLATE_MARK_COMMENT(string, comment) (string)
@@ -167,6 +170,9 @@ private:
#undef B_TRANSLATE_MARK_VOID
#define B_TRANSLATE_MARK_VOID(string)
+#undef B_TRANSLATE_MARK_CONTEXT_VOID
+#define B_TRANSLATE_MARK_CONTEXT_VOID(string, context)
+
#undef B_TRANSLATE_MARK_COMMENT_VOID
#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment)
diff --git a/headers/os/locale/tools/CollectingCatalog.h
b/headers/os/locale/tools/CollectingCatalog.h
index 49e32bc..84482b2 100644
--- a/headers/os/locale/tools/CollectingCatalog.h
+++ b/headers/os/locale/tools/CollectingCatalog.h
@@ -35,6 +35,10 @@
#define B_TRANSLATE_MARK(string) \
B_CATKEY((string), B_TRANSLATION_CONTEXT)
+#undef B_TRANSLATE_MARK_CONTEXT
+#define B_TRANSLATE_MARK_CONTEXT(string, context) \
+ B_CATKEY((string), (context))
+
#undef B_TRANSLATE_MARK_COMMENT
#define B_TRANSLATE_MARK_COMMENT(string, comment) \
B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
@@ -55,6 +59,10 @@
#define B_TRANSLATE_MARK_VOID(string) \
B_CATKEY((string), B_TRANSLATION_CONTEXT)
+#undef B_TRANSLATE_MARK_CONTEXT_VOID
+#define B_TRANSLATE_MARK_CONTEXT_VOID(string, context) \
+ B_CATKEY((string), (context))
+
#undef B_TRANSLATE_MARK_COMMENT_VOID
#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
