diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-01-08 23:25:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-01-08 23:25:14 +0000 |
| commit | ed565c27bae3afb9fa0361493573322b0414b0c1 (patch) | |
| tree | 23b1e84df1be26806dc341fc0886602c9b6ef2d8 | |
| parent | a7a85ac86778bf0adeb1b71c24dfb0398b23fd0d (diff) | |
| download | gtk+-ed565c27bae3afb9fa0361493573322b0414b0c1.tar.gz | |
Don't translate empty strings. (#326200, Christian Stimming)
2006-01-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (dgettext_swapped): Don't translate
empty strings. (#326200, Christian Stimming)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkactiongroup.c | 6 |
3 files changed, 15 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2006-01-08 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate + empty strings. (#326200, Christian Stimming) + +2006-01-08 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.[hc]: * gtk/gtklabel.[hc]: Shrink the private structs of these a bit. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b434a4ea08..ce5115520b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2006-01-08 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate + empty strings. (#326200, Christian Stimming) + +2006-01-08 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.[hc]: * gtk/gtklabel.[hc]: Shrink the private structs of these a bit. diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 91b2cb35cf..a1985809e2 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -1037,7 +1037,11 @@ static gchar * dgettext_swapped (const gchar *msgid, const gchar *domainname) { - return dgettext (domainname, msgid); + /* Pass through dgettext if and only if msgid is nonempty. */ + if (msgid && *msgid) + return dgettext (domainname, msgid); + else + return (gchar*) msgid; } /** |