INX files: <option>, <_option>, <item> and <_item> now all work. The underscored...

diff --git a/src/extension/paramenum.cpp b/src/extension/paramenum.cpp
index 1b1b83f6d987f53393cc6d180856926845f36870..58c2d3a454c3b5934105efba98d078a6d87ba196 100644 (file)
--- a/src/extension/paramenum.cpp
+++ b/src/extension/paramenum.cpp
@@ -71,12 +71,13 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
         Inkscape::XML::Node *child_repr = sp_repr_children(xml);
         while (child_repr != NULL) {
             char const * chname = child_repr->name();
-            if (!strcmp(chname, "item")) {
+            if (!strcmp(chname, "item") || !strcmp(chname, "_item")) {
                 Glib::ustring * newguitext = NULL;
                 Glib::ustring * newvalue = NULL;
                 const char * contents = sp_repr_children(child_repr)->content();
                 if (contents != NULL)
-                     newguitext = new Glib::ustring( _(contents) );
+                    // don't translate when 'item' but do translate when '_item'
+                     newguitext = new Glib::ustring( !strcmp(chname, "_item") ? _(contents) : contents );
                 else
                     continue;
 

diff --git a/src/extension/paramradiobutton.cpp b/src/extension/paramradiobutton.cpp
index 1624bf5873a8ce3576ac2726253fe937ad6d84b5..c59e5c7621a5484ce9c6e0b160fb618f4b815988 100644 (file)
--- a/src/extension/paramradiobutton.cpp
+++ b/src/extension/paramradiobutton.cpp
@@ -71,12 +71,13 @@ ParamRadioButton::ParamRadioButton (const gchar * name, const gchar * guitext, c
         Inkscape::XML::Node *child_repr = sp_repr_children(xml);
         while (child_repr != NULL) {
             char const * chname = child_repr->name();
-            if (!strcmp(chname, "option")) {
+            if (!strcmp(chname, "option") || !strcmp(chname, "_option")) {
                 Glib::ustring * newguitext = NULL;
                 Glib::ustring * newvalue = NULL;
                 const char * contents = sp_repr_children(child_repr)->content();
                 if (contents != NULL)
-                     newguitext = new Glib::ustring( _(contents) );
+                    // don't translate when 'option' but do translate when '_option'
+                     newguitext = new Glib::ustring( !strcmp(chname, "_option") ? _(contents) : contents );
                 else
                     continue;