summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:32:24 +0100
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-10 08:32:24 +0100
commit43c5939684ac89f5aa998b72ccdf5e55fccdcf24 (patch)
tree912e00cc886f44764776a1e0104972d617976071
parent095a8a49ba05217b165c987d1bcdddc75a326878 (diff)
downloadscilab-43c5939684ac89f5aa998b72ccdf5e55fccdcf24.zip
scilab-43c5939684ac89f5aa998b72ccdf5e55fccdcf24.tar.gz
utf: scicos 2
Change-Id: Icb4266a712065c3e8870d7112498d3a36eaac720
-rw-r--r--scilab/modules/scicos/sci_gateway/cpp/sci_scicos_log.cpp6
-rw-r--r--scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp8
-rw-r--r--scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_log.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_log.cpp
index 5966a5e..812fad1 100644
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_log.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_log.cpp
@@ -77,15 +77,15 @@ types::Function::ReturnValue sci_scicos_log(types::typed_list &in, int _iRetCoun
77 enum LogLevel logLevel = LoggerView::indexOf(strLevel->get(0)); 77 enum LogLevel logLevel = LoggerView::indexOf(strLevel->get(0));
78 if (logLevel < 0) 78 if (logLevel < 0)
79 { 79 {
80 std::wstringstream buffer; 80 std::stringstream buffer;
81 for (int i = LOG_TRACE; i < LOG_FATAL; i++) 81 for (int i = LOG_TRACE; i < LOG_FATAL; i++)
82 { 82 {
83 buffer << LoggerView::toString(static_cast<enum LogLevel>(i)); 83 buffer << LoggerView::toString(static_cast<enum LogLevel>(i));
84 buffer << L", "; 84 buffer << ", ";
85 } 85 }
86 buffer << LoggerView::toString(LOG_FATAL); 86 buffer << LoggerView::toString(LOG_FATAL);
87 87
88 Scierror(999, _("%s: Wrong value for input argument #%d: Must be in the set {%ls}.\n"), funame.data(), 1, buffer.str().data()); 88 Scierror(999, _("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"), funame.data(), 1, buffer.str().data());
89 return types::Function::Error; 89 return types::Function::Error;
90 } 90 }
91 91
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp
index bec2b6e..1e2a7af 100644
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_new.cpp
@@ -68,7 +68,7 @@ types::InternalType * alloc_and_set(kind_t k, types::String* type_name, types::t
68 std::string name (type_name->get(i)); 68 std::string name (type_name->get(i));
69 if (!adaptor->setProperty(name, in[i], controller)) 69 if (!adaptor->setProperty(name, in[i], controller))
70 { 70 {
71 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%ls\".\n"), funame.data(), i, name.data()); 71 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%s\".\n"), funame.data(), i, name.data());
72 delete adaptor; 72 delete adaptor;
73 return 0; 73 return 0;
74 } 74 }
@@ -88,7 +88,7 @@ types::InternalType * alloc_and_set_as_tlist(types::String* type_name, types::ty
88 std::string name(type_name->get(i)); 88 std::string name(type_name->get(i));
89 if (!adaptor.hasProperty(name)) 89 if (!adaptor.hasProperty(name))
90 { 90 {
91 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%ls\".\n"), funame.data(), i, name.data()); 91 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%s\".\n"), funame.data(), i, name.data());
92 return 0; 92 return 0;
93 } 93 }
94 } 94 }
@@ -115,7 +115,7 @@ types::InternalType * alloc_and_set_as_mlist(types::String* type_name, types::ty
115 std::string name(type_name->get(i)); 115 std::string name(type_name->get(i));
116 if (!adaptor.hasProperty(name)) 116 if (!adaptor.hasProperty(name))
117 { 117 {
118 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%ls\".\n"), funame.data(), i, name.data()); 118 Scierror(999, _("%s: Wrong value for input argument #%d: unable to set \"%s\".\n"), funame.data(), i, name.data());
119 return 0; 119 return 0;
120 } 120 }
121 } 121 }
@@ -227,7 +227,7 @@ static types::Function::ReturnValue allocate(types::typed_list &in, int _iRetCou
227 } 227 }
228 break; 228 break;
229 default: 229 default:
230 Scierror(999, _("%s: Wrong value for input argument #%d: \"%ls\" type is not managed.\n"), funame.data(), 1, type_name->get(0)); 230 Scierror(999, _("%s: Wrong value for input argument #%d: \"%s\" type is not managed.\n"), funame.data(), 1, type_name->get(0));
231 return types::Function::Error; 231 return types::Function::Error;
232 } 232 }
233 out.push_back(returnType); 233 out.push_back(returnType);
diff --git a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp
index 1590559..8836deb 100644
--- a/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp
+++ b/scilab/modules/scicos/sci_gateway/cpp/sci_scicos_setfield.cpp
@@ -183,7 +183,7 @@ types::Function::ReturnValue sci_scicos_setfield(types::typed_list &in, int _iRe
183 out.push_back(returnType); 183 out.push_back(returnType);
184 break; 184 break;
185 default: 185 default:
186 Scierror(999, _("%s: Wrong value for input argument #%d: \"%ls\" type is not managed.\n"), funame.data(), 2, adaptor->getTypeStr().c_str()); 186 Scierror(999, _("%s: Wrong value for input argument #%d: \"%s\" type is not managed.\n"), funame.data(), 2, adaptor->getTypeStr().c_str());
187 return types::Function::Error; 187 return types::Function::Error;
188 break; 188 break;
189 } 189 }