alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support plurals and varaiable argument list lengths

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/plasma/scriptengines/javascript/; revision=962209
This commit is contained in:
Aaron J. Seigo 2009-05-01 18:46:02 +00:00
parent bee1aaf2a9
commit d30bb648aa
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -432,6 +432,7 @@ void SimpleJavaScriptApplet::setupObjects()
m_engine->setDefaultPrototype(qMetaTypeId<ServiceJob*>(), m_engine->newQObject(new ServiceJob(QString(), QString(), QMap<QString, QVariant>()))); m_engine->setDefaultPrototype(qMetaTypeId<ServiceJob*>(), m_engine->newQObject(new ServiceJob(QString(), QString(), QMap<QString, QVariant>())));
global.setProperty("i18n", m_engine->newFunction(SimpleJavaScriptApplet::jsi18n)); global.setProperty("i18n", m_engine->newFunction(SimpleJavaScriptApplet::jsi18n));
global.setProperty("i18np", m_engine->newFunction(SimpleJavaScriptApplet::jsi18np));
global.setProperty("dataEngine", m_engine->newFunction(SimpleJavaScriptApplet::dataEngine)); global.setProperty("dataEngine", m_engine->newFunction(SimpleJavaScriptApplet::dataEngine));
global.setProperty("service", m_engine->newFunction(SimpleJavaScriptApplet::service)); global.setProperty("service", m_engine->newFunction(SimpleJavaScriptApplet::service));
qScriptRegisterMetaType<DataEngine::Data>(m_engine, qScriptValueFromData, 0, QScriptValue()); qScriptRegisterMetaType<DataEngine::Data>(m_engine, qScriptValueFromData, 0, QScriptValue());
@ -511,13 +512,35 @@ QScriptValue SimpleJavaScriptApplet::dataEngine(QScriptContext *context, QScript
QScriptValue SimpleJavaScriptApplet::jsi18n(QScriptContext *context, QScriptEngine *engine) QScriptValue SimpleJavaScriptApplet::jsi18n(QScriptContext *context, QScriptEngine *engine)
{ {
if (context->argumentCount() != 1) { if (context->argumentCount() < 1) {
return context->throwError(i18n("i18n takes one argument")); return context->throwError(i18n("i18n takes at least one argument"));
} }
//TODO: detect i18np pattern KLocalizedString message = ki18n(context->argument(0).toString().toLocal8Bit());
QString message = context->argument(0).toString();
return engine->newVariant(i18n(message.toLocal8Bit())); int numArgs = context->argumentCount();
for (int i = 1; i < numArgs; ++i) {
message.subs(context->argument(i).toString());
}
return engine->newVariant(message.toString().toLocal8Bit());
}
QScriptValue SimpleJavaScriptApplet::jsi18np(QScriptContext *context, QScriptEngine *engine)
{
if (context->argumentCount() < 2) {
return context->throwError(i18n("i18n takes at least two arguments"));
}
KLocalizedString message = ki18np(context->argument(0).toString().toLocal8Bit(),
context->argument(1).toString().toLocal8Bit());
int numArgs = context->argumentCount();
for (int i = 1; i < numArgs; ++i) {
message.subs(context->argument(i).toString());
}
return engine->newVariant(message.toString().toLocal8Bit());
} }
QScriptValue SimpleJavaScriptApplet::dataEngine(QScriptContext *context, QScriptEngine *engine) QScriptValue SimpleJavaScriptApplet::dataEngine(QScriptContext *context, QScriptEngine *engine)

1
scriptengines/javascript/simplejavascriptapplet.h
View File

@ -63,6 +63,7 @@ private:
static QString findSvg(QScriptEngine *engine, const QString &file); static QString findSvg(QScriptEngine *engine, const QString &file);
static QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine); static QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine);
static QScriptValue jsi18np(QScriptContext *context, QScriptEngine *engine);
static QScriptValue dataEngine(QScriptContext *context, QScriptEngine *engine); static QScriptValue dataEngine(QScriptContext *context, QScriptEngine *engine);
static QScriptValue service(QScriptContext *context, QScriptEngine *engine); static QScriptValue service(QScriptContext *context, QScriptEngine *engine);
static QScriptValue loadui(QScriptContext *context, QScriptEngine *engine); static QScriptValue loadui(QScriptContext *context, QScriptEngine *engine);