lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/i18nctag

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1398

Tim Peeters: Approve on 2015-02-05

PS Jenkins bot: Approve (continuous-integration) on 2015-02-04

Diff: 221 lines (+95/-5)

9 files modified

.bzrignore (+1/-0)
components.api (+7/-0)
modules/Ubuntu/Components/plugin/i18n.cpp (+40/-1)
modules/Ubuntu/Components/plugin/i18n.h (+3/-1)
po/update-pot.sh (+2/-1)
tests/unit/tst_i18n/po/en_US.po (+7/-0)
tests/unit/tst_i18n/src/LocalizedApp.qml (+15/-1)
tests/unit/tst_i18n/src/tst_i18n.cpp (+13/-0)
tests/unit/tst_i18n/tst_i18n.pro (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1417031: i18n.noop function for tagging strings for gettext extraction

High

Fix Released

Link a bug report

Related blueprints

1398. By Cris Dywan on 2015-02-04

Add tag keyword to update-pot.sh

1397. By Cris Dywan on 2015-02-03

There's no need for a ctag, tag can be overloaded'

1396. By Cris Dywan on 2015-02-03

Add QML example of UserMetrics to i18n.tag documentation

1395. By Cris Dywan on 2015-02-02

Implement and unit-test i18n.(c)tag

1394. By Cris Dywan on 2015-01-30

Abort export_modules_dir.sh and ergo run_tests.sh if binaries are absent. Fixes: https://bugs.launchpad.net/bugs/1415973.

Approved by PS Jenkins bot, Tim Peeters.

1393. By Cris Dywan on 2015-01-29

Get arch for push_to_phone.sh from device and handle adb refusal.

Approved by PS Jenkins bot, Tim Peeters.

1392. By Albert Astals Cid on 2015-01-29

Adapt to behaviour change in handling of QVariants from QML to C++ in Qt 5.4

[QTBUG-40431] When a JavaScript object/array is passed to C++ through
  a QVariant, the engine no longer immediately converts the object
  recursively into a QVariantMap or QVariantList but instead stores a
  QJSValue in the QVariant. This prevents a loss of data when the JS
  object contains non-primitive types such as function objects for
  example. Code that expects the variant type to be exactly
  QVariant::Map or QVariant::List may need to be adapted. Registered
  conversion functions however ensure that code that merely calls
  toMap() or toList() continues to work. Fixes: https://bugs.launchpad.net/bugs/1395017.

Approved by PS Jenkins bot, Zsombor Egri.

1391. By Tim Peeters on 2015-01-29

Split up MainView in MainView and MainViewBase. Move docs to MainView.qdoc.

Approved by PS Jenkins bot, Zsombor Egri.

1390. By Albert Astals Cid on 2015-01-29

Fix test failure with Qt 5.4 ExpandablesColumn::test_expandedItem()

In Qt 5.4 an alias to a null variable is correctly null instead of undefined like
it was in 5.3, since we still want 5.3 support i'm conveting it to a verify with ==
that uses JS loose comparison to accept both null and undefined. Fixes: https://bugs.launchpad.net/bugs/1395012.

Approved by PS Jenkins bot, Zsombor Egri.

1389. By Albert Astals Cid on 2015-01-29

Adapt to behaviour change in handling of QVariants from QML to C++ in Qt 5.4

[QTBUG-40431] When a JavaScript object/array is passed to C++ through
  a QVariant, the engine no longer immediately converts the object
  recursively into a QVariantMap or QVariantList but instead stores a
  QJSValue in the QVariant. This prevents a loss of data when the JS
  object contains non-primitive types such as function objects for
  example. Code that expects the variant type to be exactly
  QVariant::Map or QVariant::List may need to be adapted. Registered
  conversion functions however ensure that code that merely calls
  toMap() or toList() continues to work. Fixes: https://bugs.launchpad.net/bugs/1394991.

Approved by PS Jenkins bot, Zsombor Egri.