Merge lp:~agateau/unity-2d/gettext into lp:unity-2d/3.0
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 407 |
Merged at revision: | 401 |
Proposed branch: | lp:~agateau/unity-2d/gettext |
Merge into: | lp:unity-2d/3.0 |
Diff against target: |
667 lines (+485/-1) 18 files modified
CMakeLists.txt (+2/-0) debian/control (+1/-1) debian/rules (+2/-0) launcher/app/launcher.cpp (+6/-0) libunity-2d-private/src/CMakeLists.txt (+1/-0) libunity-2d-private/src/gettexttranslator.cpp (+85/-0) libunity-2d-private/src/gettexttranslator.h (+61/-0) libunity-2d-private/tests/CMakeLists.txt (+11/-0) libunity-2d-private/tests/config-test.h.in (+1/-0) libunity-2d-private/tests/fr.po (+10/-0) libunity-2d-private/tests/gettexttest.cpp (+74/-0) panel/app/main.cpp (+6/-0) places/app/CMakeLists.txt (+2/-0) places/app/places.cpp (+8/-0) po/CMakeLists.txt (+7/-0) po/fr.po (+92/-0) po/unity-2d.pot (+92/-0) po/update-unity-2d-pot (+24/-0) |
To merge this branch: | bzr merge lp:~agateau/unity-2d/gettext |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Florian Boucault | Pending | ||
unity-2d-team | Pending | ||
Review via email: mp+50605@code.launchpad.net |
Commit message
[i18n] Implement gettext support
This branch provides:
- a po/update-
- a po/ dir containing translations, using the unity-2d domain. These files are compiled and installed as part of the regular "all" and "install" targets.
- a hook in debian/rules updating the .pot file, for LP to fetch it
Description of the change
This branch provides:
- a po/update-
- a po/ dir containing translations, using the unity-2d domain. These files are compiled and installed as part of the regular "all" and "install" targets.
- a hook in debian/rules updating the .pot file, for LP to fetch it
The debian/rules hook is inspired from Unity 3D hook. I hope it works, but having David Planella confirmation on it would be better.
Great stuff.
make check fails on me, any clue?
test 1
Start 1: gettexttest
1: Test command: /home/kaleo/ Projects/ upicek/ unity-2d/ libunity- 2d-private/ tests/gettextte st :initTestCase( ) :testTranslate( ) Compared values are not the same on::translate( "", "Hello")): Hello "Bonjour" )): Bonjour kaleo/Projects/ upicek/ unity-2d/ libunity- 2d-private/ tests/gettextte st.cpp( 46)] :testTranslateW ithDisambiguati on() Compared values are not the same on::translate( "", "Close", "Closing a door")): Closing a door?Close "Fermer" )): Fermer kaleo/Projects/ upicek/ unity-2d/ libunity- 2d-private/ tests/gettextte st.cpp( 58)] :testTranslateW ithEmptyNonNull Disambiguation( ) Compared values are not the same on::translate( "", "Hello", "")): Hello "Bonjour" )): Bonjour kaleo/Projects/ upicek/ unity-2d/ libunity- 2d-private/ tests/gettextte st.cpp( 68)] :cleanupTestCas e() ....... ....... .***Failed 0.01 sec
1: Test timeout computed to be: 9.99988e+06
1: ********* Start testing of GettextTest *********
1: Config: Using QTest library 4.7.0, Qt 4.7.0
1: PASS : GettextTest:
1: FAIL! : GettextTest:
1: Actual (QCoreApplicati
1: Expected (QString(
1: Loc: [/home/
1: FAIL! : GettextTest:
1: Actual (QCoreApplicati
1: Expected (QString(
1: Loc: [/home/
1: FAIL! : GettextTest:
1: Actual (QCoreApplicati
1: Expected (QString(
1: Loc: [/home/
1: PASS : GettextTest:
1: Totals: 2 passed, 3 failed, 0 skipped
1: ********* Finished testing of GettextTest *********
1/4 Test #1: gettexttest .......