diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-11-13 14:02:49 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-11-13 14:02:49 +0000 |
| commit | c0037a60caf4de84b33ed9a3a79331c2b6d1e398 (patch) | |
| tree | 22f3a3c51bf1f529d9246b8c2ad90a6bc72893c7 | |
| parent | Update translations for Khmer (diff) | |
| download | inkscape-c0037a60caf4de84b33ed9a3a79331c2b6d1e398.tar.gz inkscape-c0037a60caf4de84b33ed9a3a79331c2b6d1e398.zip | |
make INX <option> translatable
(bzr r4076)
| -rw-r--r-- | share/extensions/perfectboundcover.inx | 20 | ||||
| -rw-r--r-- | src/extension/paramenum.cpp | 8 | ||||
| -rw-r--r-- | 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) ); |