Merge lp:~dobey/ubuntu-system-settings/fix-settings-i18n into lp:ubuntu-system-settings

[dobey]

Fix the CMakeLists.txt to handle settings.js generation and translations better.

[Ken VanDine (ken-vandine)]

You should drop the changes to the pot file from the branch

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1615
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2662/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6771/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/845
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5136/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6782
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28034

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2662/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dobey/ubuntu-system-settings/fix-settings-i18n]

1616. By dobey on 2016-03-16

Revert the pot file update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1616
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2665/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/848
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5138/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28039

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2665/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-12-11 20:27:49 +0000
+++ po/CMakeLists.txt	2016-03-16 13:36:24 +0000
@@ -17,10 +17,9 @@
                         "${CMAKE_SOURCE_DIR}/plugins/*/*.settings")
 file(GLOB PYFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
                         "${CMAKE_SOURCE_DIR}/push-helper/*.py")
-file(GLOB SETTINGSJSFILE RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
-                   "${CMAKE_CURRENT_BINARY_DIR}/settings.js")
+file(RELATIVE_PATH SETTINGSJSFILE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/settings.js")
 
-add_custom_command(OUTPUT settings.js
+add_custom_target(settings.js
     COMMAND ./extractsettingsinfo ${SETTINGSFILES} -o ${CMAKE_CURRENT_BINARY_DIR}/settings.js
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     DEPENDS ${SETTINGSFILES}
@@ -48,7 +47,7 @@
                             --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
                             ${QMLFILES} ${SETTINGSJSFILE}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    DEPENDS pot-desktop ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js" #desktop.js
+    DEPENDS pot-desktop ${QMLFILES} settings.js #desktop.js
 )
 
 add_custom_target(pot-cpp