summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2010-07-02 19:28:40 +0200
committerVincent Untz <vuntz@gnome.org>2010-07-02 19:28:40 +0200
commite30fef2331b70d23544fd0ee9b5cba7366f8821b (patch)
tree433790707b857e5efc448ac97691784a1a020542
parent10e7f322f827aa92a6071d77972d835a65d0bed1 (diff)
downloadgconf-e30fef2331b70d23544fd0ee9b5cba7366f8821b.tar.gz
[gsettings] Always add specified gettext-domain via command-line option
It's useful to get the summary/description translations, not just for localized defaults. https://bugzilla.gnome.org/show_bug.cgi?id=616309
-rwxr-xr-xgsettings/gsettings-schema-convert6
1 files changed, 4 insertions, 2 deletions
diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
index db26c85b..131bfafb 100755
--- a/gsettings/gsettings-schema-convert
+++ b/gsettings/gsettings-schema-convert
@@ -946,14 +946,16 @@ class GConfSchemaParser:
def parse(self):
# reset the state of the parser
self.root = GSettingsSchemaRoot()
+ if self.default_gettext_domain:
+ self.root.gettext_domain = self.default_gettext_domain
self.default_schema_id_count = 0
gconfschemafile_node = ET.parse(self.file).getroot()
for schemalist_node in gconfschemafile_node.findall('schemalist'):
for schema_node in schemalist_node.findall('schema'):
gconf_schema = GConfSchema(schema_node)
- if gconf_schema.localized:
- self.root.gettext_domain = self.default_gettext_domain or 'FIXME'
+ if gconf_schema.localized and not self.root.gettext_domain:
+ self.root.gettext_domain = 'FIXME'
self._insert_schema(gconf_schema)
self._fix_hierarchy()