Author: mvidner Date: Fri May 27 17:17:35 2011 New Revision: 64129 URL: http://svn.opensuse.org/viewcvs/yast?rev=64129&view=rev Log: Fixed a garbled unbreakable space used as a thousand separator (bnc#683881). Modified: trunk/core/VERSION trunk/core/libycp/src/YCPBuiltinFloat.cc trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=64129&r1=64128&r2=64129&view=diff ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri May 27 17:17:35 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 Modified: trunk/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinFloat.cc?rev=64129&r1=64128&r2=64129&view=diff ============================================================================== --- trunk/core/libycp/src/YCPBuiltinFloat.cc (original) +++ trunk/core/libycp/src/YCPBuiltinFloat.cc Fri May 27 17:17:35 2011 @@ -31,6 +31,7 @@ #include "ycp/StaticDeclaration.h" #include "y2log.h" +#include "y2string.h" extern StaticDeclaration static_declarations; @@ -285,13 +286,14 @@ if (f.isNull () || precision.isNull ()) return YCPNull (); - std::ostringstream ss; + std::wostringstream ss; // bnc#683881#c12: need wide chars ss.imbue (std::locale ("")); ss.precision (precision->value ()); ss << fixed<< f->value (); - YCPString ret (ss.str ()); - return ret; + string in_utf8; + wchar2utf8 (ss.str (), &in_utf8); + return YCPString (in_utf8); } Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out?rev=64129&r1=64128&r2=64129&view=diff ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin_VIII.out Fri May 27 17:17:35 2011 @@ -22,7 +22,7 @@ ("1.02") ("1,02") ("1024.09") -("1Â024,09") +("1Â 024,09") (true) (true) (true) Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=64129&r1=64128&r2=64129&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri May 27 17:17:35 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 27 17:17:14 CEST 2011 - mvidner@suse.cz + +- Fixed a garbled unbreakable space used as a thousand separator (bnc#683881). +- 2.21.2 + +------------------------------------------------------------------- Fri May 27 11:32:55 CEST 2011 - mvidner@suse.cz - Don't crash when adding to a nil list (bnc#694520). -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org