script: Add 'context' to the translatable definitions
This should cover all the possible options.
This commit is contained in:
parent
837b6cf756
commit
d5738b6bd4
@ -1094,7 +1094,7 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
|
|||||||
char **str)
|
char **str)
|
||||||
{
|
{
|
||||||
JsonObject *obj;
|
JsonObject *obj;
|
||||||
const char *string, *domain;
|
const char *string, *domain, *context;
|
||||||
const char *res;
|
const char *res;
|
||||||
gboolean translatable;
|
gboolean translatable;
|
||||||
|
|
||||||
@ -1112,6 +1112,11 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
|
|||||||
if (string == NULL || *string == '\0')
|
if (string == NULL || *string == '\0')
|
||||||
return FALSE;
|
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"))
|
if (json_object_has_member (obj, "domain"))
|
||||||
domain = json_object_get_string_member (obj, "domain");
|
domain = json_object_get_string_member (obj, "domain");
|
||||||
else
|
else
|
||||||
@ -1122,10 +1127,10 @@ _clutter_script_parse_translatable_string (ClutterScript *script,
|
|||||||
|
|
||||||
if (translatable)
|
if (translatable)
|
||||||
{
|
{
|
||||||
if (domain != NULL && *domain != '\0')
|
if (context != NULL && *context != '\0')
|
||||||
res = g_dgettext (domain, string);
|
res = g_dpgettext2 (domain, context, string)
|
||||||
else
|
else
|
||||||
res = gettext (string);
|
res = g_dgettext (domain, string);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
res = string;
|
res = string;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user