diff options
author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-11-12 13:40:05 (GMT) |
---|---|---|
committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-11-12 13:40:05 (GMT) |
commit | c4eadef4caf3b3eb682193729390fdeb7e5e3d11 (patch) | |
tree | 4ce4f435b5b662b5829a2c6eb04c0b0889e80d79 | |
parent | 5555979c9cbe700c42446d76835e515c9ba1ec2a (diff) |
no more save translated text in the base. save the english version
* src/gcompris/menu.c: (_add_xml_to_data): no more save translated text in the base.
save the english version instead.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | src/gcompris/menu.c | 28 |
2 files changed, 21 insertions, 12 deletions
@@ -1,5 +1,10 @@ 2006-11-12 Bruno coudoin <bruno.coudoin@free.fr> + * src/gcompris/menu.c: (_add_xml_to_data): no more save translated text in the base. + save the english version instead. + +2006-11-12 Bruno coudoin <bruno.coudoin@free.fr> + - Added support for sqlite compilation under windows * Makefile.mingw.in: diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c index 9918c5d..5f95758 100644 --- a/src/gcompris/menu.c +++ b/src/gcompris/menu.c @@ -115,7 +115,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, { title = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->title = reactivate_newline(gettext(title)); - g_free(title); } /* get the description of the board */ @@ -123,7 +122,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, { description = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->description = reactivate_newline(gettext(description)); - g_free(description); } /* get the help prerequisite help of the board */ @@ -134,7 +132,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, prerequisite = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->prerequisite = reactivate_newline(gettext(prerequisite)); - g_free(prerequisite); } /* get the help goal of the board */ @@ -145,7 +142,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, goal = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->goal = reactivate_newline(gettext(goal)); - g_free(goal); } /* get the help user manual of the board */ @@ -156,7 +152,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, manual = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->manual = reactivate_newline(gettext(manual)); - g_free(manual); } /* get the help user credit of the board */ @@ -167,7 +162,6 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, credit =(char *) xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 0); gcomprisBoard->credit = reactivate_newline(gettext(credit)); - g_free(credit); } /* Display the resource on stdout */ @@ -209,19 +203,29 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, gcomprisBoard->mandatory_sound_file, gcomprisBoard->mandatory_sound_dataset, gcomprisBoard->filename, - gcomprisBoard->title, - gcomprisBoard->description, - gcomprisBoard->prerequisite, - gcomprisBoard->goal, - gcomprisBoard->manual, - gcomprisBoard->credit + /* Don't put translated text in the base */ + title, + description, + prerequisite, + goal, + manual, + credit ); g_warning("db board written %d in %d %s/%s", gcomprisBoard->board_id, gcomprisBoard->section_id, gcomprisBoard->section, gcomprisBoard->name); + + } + g_free(title); + g_free(description); + g_free(prerequisite); + g_free(goal); + g_free(manual); + g_free(credit); + } /* parse the doc, add it to our internal structures and to the clist */ |