From ceb09a144afae488057c1841ec68a2fa0117a3f3 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 17 Feb 2012 10:11:43 +1000 Subject: Make QLocale::uiLanguages() available in Qt.locale() object Available as uiLanguages property returning an array of strings. Change-Id: Ic698bbaff2eb0f9f6720ae06952c12a987298964 Reviewed-by: Glenn Watson --- src/declarative/qml/qdeclarativelocale.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src') diff --git a/src/declarative/qml/qdeclarativelocale.cpp b/src/declarative/qml/qdeclarativelocale.cpp index fc6017ce5a..8ec51b058c 100644 --- a/src/declarative/qml/qdeclarativelocale.cpp +++ b/src/declarative/qml/qdeclarativelocale.cpp @@ -556,6 +556,19 @@ static v8::Handle locale_get_weekDays(v8::Local, const v8 return result; } +static v8::Handle locale_get_uiLanguages(v8::Local, const v8::AccessorInfo &info) +{ + GET_LOCALE_DATA_RESOURCE(info.This()); + + QStringList langs = r->locale.uiLanguages(); + v8::Handle result = v8::Array::New(langs.size()); + for (int i = 0; i < langs.size(); ++i) { + result->Set(i, r->engine->toString(langs.at(i))); + } + + return result; +} + static v8::Handle locale_currencySymbol(const v8::Arguments &args) { GET_LOCALE_DATA_RESOURCE(args.This()); @@ -717,6 +730,7 @@ QV8LocaleDataDeletable::QV8LocaleDataDeletable(QV8Engine *engine) ft->PrototypeTemplate()->SetAccessor(v8::String::New("weekDays"), locale_get_weekDays); ft->PrototypeTemplate()->SetAccessor(v8::String::New("measurementSystem"), locale_get_measurementSystem); ft->PrototypeTemplate()->SetAccessor(v8::String::New("textDirection"), locale_get_textDirection); + ft->PrototypeTemplate()->SetAccessor(v8::String::New("uiLanguages"), locale_get_uiLanguages); constructor = qPersistentNew(ft->GetFunction()); } @@ -998,6 +1012,17 @@ v8::Handle QDeclarativeLocale::locale(QV8Engine *v8engine, const QStr \sa firstDayOfWeek */ +/*! + \qmlproperty Array QtQuick2::Locale::uiLanguages + + Returns an ordered list of locale names for translation purposes in + preference order. + + The return value represents locale names that the user expects to see the + UI translation in. + + The first item in the list is the most preferred one. +*/ /*! \qmlproperty enumeration QtQuick2::Locale::textDirection -- cgit v1.2.3