From e4a550dbd37fb6901d4b9153d882ae1eb7d4421a Mon Sep 17 00:00:00 2001 From: ffsup2 Date: Tue, 7 Jun 2011 22:22:36 +0200 Subject: [PATCH] Fix for translation of UTF strings In italian language the accented u was not displayed correctly in equalizer panel --- rtgui/dirpyrequalizer.cc | 17 ++++++++++------- rtgui/equalizer.cc | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc index 0ee746a2d..f421fa30a 100644 --- a/rtgui/dirpyrequalizer.cc +++ b/rtgui/dirpyrequalizer.cc @@ -54,13 +54,16 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) { for(int i = 0; i < 4; i++) { - std::stringstream ss; - ss << i; - if(i == 0) - ss << " (" << M("TP_DIRPYREQUALIZER_LUMAFINEST") << ")"; - if(i == 3) - ss << " (" << M("TP_DIRPYREQUALIZER_LUMACOARSEST") << ")"; - multiplier[i] = Gtk::manage ( new Adjuster (ss.str(), 0, 4, 0.01, 1.0) ); + Glib::ustring ss; + switch( i ){ + case 0: + ss =Glib::ustring::compose( "%1 (%2)",i, M("TP_DIRPYREQUALIZER_LUMAFINEST"));break; + case 3: + ss =Glib::ustring::compose( "%1 (%2)",i, M("TP_DIRPYREQUALIZER_LUMACOARSEST"));break; + default: + ss =Glib::ustring::compose( "%1",i); + } + multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 1.0) ); multiplier[i]->setAdjusterListener(this); pack_start(*multiplier[i]); } diff --git a/rtgui/equalizer.cc b/rtgui/equalizer.cc index 9b3b5dc25..2364db291 100644 --- a/rtgui/equalizer.cc +++ b/rtgui/equalizer.cc @@ -54,14 +54,17 @@ Equalizer::Equalizer () : Gtk::VBox(), FoldableToolPanel(this) { for(int i = 0; i < 8; i++) { - std::stringstream ss; - ss << i; - if(i == 0) - ss << " (" << M("TP_EQUALIZER_FINEST") << ")"; - if(i == 7) - ss << " (" << M("TP_EQUALIZER_LARGEST") << ")"; + Glib::ustring ss; + switch( i ){ + case 0: + ss =Glib::ustring::compose( "%1 (%2)",i, M("TP_EQUALIZER_FINEST"));break; + case 7: + ss =Glib::ustring::compose( "%1 (%2)",i, M("TP_EQUALIZER_LARGEST"));break; + default: + ss =Glib::ustring::compose( "%1",i); + } - correction[i] = Gtk::manage ( new Adjuster (ss.str(), -100, 100, 1, 0) ); + correction[i] = Gtk::manage ( new Adjuster (ss, -100, 100, 1, 0) ); correction[i]->setAdjusterListener(this); pack_start(*correction[i]); }