lp:~nick-dedekind/ubuntu-ui-toolkit/lp1378821.time-translation

Branch merges

Superseded for merging into lp:ubuntu-ui-toolkit

Christian Dywan: Needs Fixing on 2015-01-20

Zoltan Balogh (community): Needs Fixing on 2015-01-20

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-01-12

Diff: 905 lines (+718/-24)

10 files modified

debian/changelog (+7/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+2/-2)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-2)
modules/Ubuntu/Components/plugin/timeformatter.cpp (+199/-0)
modules/Ubuntu/Components/plugin/timeformatter.h (+61/-0)
modules/Ubuntu/Components/plugin/timeformatter_p.h (+177/-0)
po/ubuntu-ui-toolkit.pot (+133/-19)
tests/unit/tst_components/dateExt.js (+67/-0)
tests/unit/tst_components/tst_components.pro (+2/-1)
tests/unit/tst_components/tst_timeformatter.qml (+65/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1133. By Nick Dedekind on 2015-07-20

unsubscribe live timer on destruction

1132. By Nick Dedekind on 2015-07-15

whitespace

1131. By Nick Dedekind on 2015-07-15

better frequency handling

1130. By Nick Dedekind on 2015-07-15

reverted old changelogs

1129. By Nick Dedekind on 2015-07-15

updated api

1128. By Nick Dedekind on 2015-07-15

version bump

1127. By Nick Dedekind on 2015-07-15

removed old file

1126. By Nick Dedekind on 2015-07-15

updated potfile

1125. By Nick Dedekind on 2015-07-15

merged with trunk

1124. By Nick Dedekind on 2015-07-15

version bumped