diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-07-27 15:30:40 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 11:27:26 +0200 |
| commit | aa2d36a3d7405c3130b27b41b0e3941ca466f3cd (patch) | |
| tree | 7b828aec3ffcce11a66bc0425b0c338855821864 /src/declarative/qml/v8/qv8engine.cpp | |
| parent | ff7867460cbaf18fc09717b111df7abb344f5957 (diff) | |
Fix translation context for QML files.
Use the base file name as done in QtQuick 1, rather
than using the entire path. This also fixes QTBUG-17255
for QtQuick 2.
Change-Id: Ia27f6539f82d6caf6e7060b89ff1996d42ffb9cb
Reviewed-on: http://codereview.qt.nokia.com/2246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/declarative/qml/v8/qv8engine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/v8/qv8engine.cpp b/src/declarative/qml/v8/qv8engine.cpp index b8a1bc41e2..2dd52b0ac3 100644 --- a/src/declarative/qml/v8/qv8engine.cpp +++ b/src/declarative/qml/v8/qv8engine.cpp @@ -1587,7 +1587,10 @@ v8::Handle<v8::Value> QV8Engine::qsTr(const v8::Arguments &args) QV8Engine *v8engine = V8ENGINE(); QDeclarativeContextData *ctxt = v8engine->callingContext(); - QString context = ctxt->url.toString(); + QString path = ctxt->url.toString(); + int lastSlash = path.lastIndexOf(QLatin1Char('/')); + QString context = (lastSlash > -1) ? path.mid(lastSlash + 1, path.length()-lastSlash-5) : QString(); + QString text = v8engine->toString(args[0]); QString comment; if (args.Length() > 1) |