[clutter] script: Add 'context' to the translatable definitions
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] script: Add 'context' to the translatable definitions
- Date: Sat, 17 Mar 2012 22:56:55 +0000 (UTC)
commit d5738b6bd4e40f36ca09cfd730968c8035d3ad62
Author: Emmanuele Bassi <ebassi gnome org>
Date: Sat Mar 17 22:55:33 2012 +0000
script: Add 'context' to the translatable definitions
This should cover all the possible options.
clutter/clutter-script-parser.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter-script-parser.c b/clutter/clutter-script-parser.c
index 925ab9a..e410997 100644
--- a/clutter/clutter-script-parser.c
+++ b/clutter/clutter-script-parser.c
@@ -1094,7 +1094,7 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
char **str)
{
JsonObject *obj;
- const char *string, *domain;
+ const char *string, *domain, *context;
const char *res;
gboolean translatable;
@@ -1112,6 +1112,11 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
if (string == NULL || *string == '\0')
return FALSE;
+ if (json_object_has_member (obj, "context"))
+ context = json_object_get_string_member (obj, "context");
+ else
+ context = NULL;
+
if (json_object_has_member (obj, "domain"))
domain = json_object_get_string_member (obj, "domain");
else
@@ -1122,10 +1127,10 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
if (translatable)
{
- if (domain != NULL && *domain != '\0')
- res = g_dgettext (domain, string);
+ if (context != NULL && *context != '\0')
+ res = g_dpgettext2 (domain, context, string)
else
- res = gettext (string);
+ res = g_dgettext (domain, string);
}
else
res = string;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]