Ticket #13656: 0001-Add-B_TRANSLATE_MARK_CONTEXT-to-Catalog.h.patch

File 0001-Add-B_TRANSLATE_MARK_CONTEXT-to-Catalog.h.patch, 2.1 KB (added by owenca, 7 years ago)

  • headers/os/locale/Catalog.h 

    From e870889ad0ee398f57a99466ee5c5f79d636d767 Mon Sep 17 00:00:00 2001
From: Owen <owenca@users.noreply.github.com>
Date: Sat, 5 Aug 2017 02:59:22 +0000
Subject: [PATCH] Add B_TRANSLATE_MARK_CONTEXT to Catalog.h and
 tools/CollectingCatalog.h

Fixes #13656
---
 headers/os/locale/Catalog.h                 | 6 ++++++
 headers/os/locale/tools/CollectingCatalog.h | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/headers/os/locale/Catalog.h b/headers/os/locale/Catalog.h
index 2d0664f..910d05a 100644
    a b private:  
    151151#undef B_TRANSLATE_MARK
    152152#define B_TRANSLATE_MARK(string) (string)
    153153
     154#undef B_TRANSLATE_MARK_CONTEXT
     155#define B_TRANSLATE_MARK_CONTEXT(string, context) (string)
     156
    154157#undef B_TRANSLATE_MARK_COMMENT
    155158#define B_TRANSLATE_MARK_COMMENT(string, comment) (string)
    156159
    … … private:  
    167170#undef B_TRANSLATE_MARK_VOID
    168171#define B_TRANSLATE_MARK_VOID(string)
    169172
     173#undef B_TRANSLATE_MARK_CONTEXT_VOID
     174#define B_TRANSLATE_MARK_CONTEXT_VOID(string, context)
     175
    170176#undef B_TRANSLATE_MARK_COMMENT_VOID
    171177#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment)
    172178

  • headers/os/locale/tools/CollectingCatalog.h 

    diff --git a/headers/os/locale/tools/CollectingCatalog.h b/headers/os/locale/tools/CollectingCatalog.h
index 49e32bc..84482b2 100644
    a b  
    3535#define B_TRANSLATE_MARK(string) \
    3636    B_CATKEY((string), B_TRANSLATION_CONTEXT)
    3737
     38#undef B_TRANSLATE_MARK_CONTEXT
     39#define B_TRANSLATE_MARK_CONTEXT(string, context) \
     40    B_CATKEY((string), (context))
     41
    3842#undef B_TRANSLATE_MARK_COMMENT
    3943#define B_TRANSLATE_MARK_COMMENT(string, comment) \
    4044    B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))
    … …  
    5559#define B_TRANSLATE_MARK_VOID(string) \
    5660    B_CATKEY((string), B_TRANSLATION_CONTEXT)
    5761
     62#undef B_TRANSLATE_MARK_CONTEXT_VOID
     63#define B_TRANSLATE_MARK_CONTEXT_VOID(string, context) \
     64    B_CATKEY((string), (context))
     65
    5866#undef B_TRANSLATE_MARK_COMMENT_VOID
    5967#define B_TRANSLATE_MARK_COMMENT_VOID(string, comment) \
    6068    B_CATKEY((string), B_TRANSLATION_CONTEXT, (comment))