From ee63f459ea878f0b140d48a7a33bf8ca177bf588 Mon Sep 17 00:00:00 2001
From: johanengelen <johanengelen@users.sourceforge.net>
Date: Tue, 13 Nov 2007 14:02:49 +0000
Subject: [PATCH] make INX <option> translatable

---
 share/extensions/perfectboundcover.inx | 20 ++++++++++----------
 src/extension/paramenum.cpp            |  8 +++++++-
 src/extension/paramradiobutton.cpp     |  6 +++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/share/extensions/perfectboundcover.inx b/share/extensions/perfectboundcover.inx
index 62369adf1..422c32964 100644
--- a/share/extensions/perfectboundcover.inx
+++ b/share/extensions/perfectboundcover.inx
@@ -10,20 +10,20 @@
   <param name="removeguides" type="boolean" _gui-text="Remove existing guides">true</param>
   <_param name="paper" type="description">Interior Pages</_param>
   <param name="paperthicknessmeasurement" _gui-text="Paper Thickness Measurement" type="optiongroup">
-      <_option>Pages Per Inch (PPI)</_option>
-      <_option>Caliper (inches)</_option>
-      <_option>Points</_option>
-      <_option>Bond Weight #</_option>
-      <_option>Specify Width</_option>
+      <option>Pages Per Inch (PPI)</option>
+      <option>Caliper (inches)</option>
+      <option>Points</option>
+      <option>Bond Weight #</option>
+      <option>Specify Width</option>
   </param>
   <param precision="4" name="paperthickness" type="float" min="0.000" max="1000.000" _gui-text="Value">0</param>
   <_param name="cover" type="description">Cover</_param>
   <param name="coverthicknessmeasurement" _gui-text="Cover Thickness Measurement" type="optiongroup">
-      <_option>Pages Per Inch (PPI)</_option>
-      <_option>Caliper (inches)</_option>
-      <_option>Points</_option>
-      <_option>Bond Weight #</_option>
-      <_option>Specify Width</_option>
+      <option>Pages Per Inch (PPI)</option>
+      <option>Caliper (inches)</option>
+      <option>Points</option>
+      <option>Bond Weight #</option>
+      <option>Specify Width</option>
   </param>
   <param precision="4" name="coverthickness" type="float" min="0.000" max="1000.000" _gui-text="Value">0</param>
   <param precision="3" name="bleed" type="float" min="0.000" max="1.000" _gui-text="Bleed (in)">.25</param>
diff --git a/src/extension/paramenum.cpp b/src/extension/paramenum.cpp
index 8d779d1c2..1b1b83f6d 100644
--- a/src/extension/paramenum.cpp
+++ b/src/extension/paramenum.cpp
@@ -77,10 +77,16 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
                 const char * contents = sp_repr_children(child_repr)->content();
                 if (contents != NULL)
                      newguitext = new Glib::ustring( _(contents) );
+                else
+                    continue;
+
                 const char * val = child_repr->attribute("value");
                 if (val != NULL)
                     newvalue = new Glib::ustring(val);
-                if ( (newguitext) && (newvalue) ) {
+                else
+                    newvalue = new Glib::ustring(contents);
+
+                if ( (newguitext) && (newvalue) ) {   // logical error if this is not true here
                     choices = g_slist_append( choices, new enumentry(newvalue, newguitext) );
                 }
             }
diff --git a/src/extension/paramradiobutton.cpp b/src/extension/paramradiobutton.cpp
index ad18ce79f..1624bf587 100644
--- a/src/extension/paramradiobutton.cpp
+++ b/src/extension/paramradiobutton.cpp
@@ -71,12 +71,12 @@ 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") || !strcmp(chname, "_option")) {
+            if (!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);
+                     newguitext = new Glib::ustring( _(contents) );
                 else
                     continue;  
                     
@@ -84,7 +84,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name, const gchar * guitext, c
                 if (val != NULL)
                     newvalue = new Glib::ustring(val);
                 else
-                    newvalue = new Glib::ustring(*newguitext);
+                    newvalue = new Glib::ustring(contents);
                             
                 if ( (newguitext) && (newvalue) ) {   // logical error if this is not true here
                     choices = g_slist_append( choices, new optionentry(newvalue, newguitext) );
-- 
2.30.2