From 8f98233affcb8c3e1a3dbf4e11c45266d3a5be1e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Jul 2007 16:37:43 +0000 Subject: [PATCH] Support old-style message contexts, too. 2007-07-08 Matthias Clasen * gtk/gtkbuilderparser.c (pgettext): Support old-style message contexts, too. svn path=/trunk/; revision=18405 --- ChangeLog | 5 +++++ gtk/gtkbuilderparser.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7399d16ff8..cc66a6bb8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-07-08 Matthias Clasen + + * gtk/gtkbuilderparser.c (pgettext): Support old-style + message contexts, too. + 2007-07-08 Johan Dahlin * gtk/gtk-builder-convert: Improve the way properties diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index b4700b1f0e..8937b7847a 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -865,10 +865,17 @@ dpgettext (const char *domain, translation = dgettext (domain, msg_ctxt_id); - if (translation != msg_ctxt_id) - return translation; + if (translation == msg_ctxt_id) + { + /* try the old way of doing message contexts, too */ + msg_ctxt_id[msgctxt_len - 1] = '|'; + translation = dgettext (domain, msg_ctxt_id); + + if (translation == msg_ctxt_id) + return msgid; + } - return msgid; + return translation; } /* Called for character data */