Merge lp:~diegosarmentero/pay-ui/translation into lp:pay-ui

[Diego Sarmentero]

- Adding support for translations

[lp:~diegosarmentero/pay-ui/translation]

28. By Diego Sarmentero on 2014-08-11

changes in cmake

[dobey (dobey)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:27
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/pay-ui/translation/+merge/230299/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/pay-ui-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/392/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/57
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/57/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:28
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/pay-ui/translation/+merge/230299/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/pay-ui-ci/61/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/395/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/pay-ui/translation]

29. By Diego Sarmentero on 2014-08-12

translation supported

[David Planella (dpm)]

At a glance, it looks good to me. I would suggest to internationalize the .desktop file as well, but it could be done in a separate branch.

Here is one example of .desktop file internationalization: https://code.launchpad.net/~dpm/ubuntu-calendar-app/desktop-i18n-1325626-1318008/+merge/222414 (and there are more branches for other apps in the associated bug 1318008)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:29
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~diegosarmentero/pay-ui/translation/+merge/230299/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/pay-ui-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/403
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/pay-ui/translation]

30. By Diego Sarmentero on 2014-08-13

merge translations in desktop

31. By Diego Sarmentero on 2014-08-13

improves in cmake

32. By Diego Sarmentero on 2014-08-13

updates in cmake

33. By Diego Sarmentero on 2014-08-13

conflicts resolved

[David Planella (dpm)]

See comments inline

review: Needs Fixing

[lp:~diegosarmentero/pay-ui/translation]

34. By Diego Sarmentero on 2014-08-13

marking attributes for translation

35. By Diego Sarmentero on 2014-08-13

adding underscore on .desktop too

[dobey (dobey)]

See inline comments.

review: Needs Fixing

[lp:~diegosarmentero/pay-ui/translation]

36. By Diego Sarmentero on 2014-08-13

fixing commented code

37. By Diego Sarmentero on 2014-08-13

adding dependecy

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/408
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[lp:~diegosarmentero/pay-ui/translation]

38. By Diego Sarmentero on 2014-08-13

email updated

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/64/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, the only thing I'd recommend is to remove the underscores from the .desktop file. Also, the only reason for having a .desktop file kept in bzr was for Qt Creator to be able to launch pure QML applications. If this does not apply to this app, I'd just remove it.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/65/rebuild

review: Approve (continuous-integration)

[lp:~diegosarmentero/pay-ui/translation]

39. By Diego Sarmentero on 2014-08-15

working on translations

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/64

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/67/rebuild

review: Approve (continuous-integration)

[lp:~diegosarmentero/pay-ui/translation]

40. By Diego Sarmentero on 2014-08-20

remove all rule

41. By Diego Sarmentero on 2014-08-20

mrege

42. By Diego Sarmentero on 2014-08-20

removed generated desktop file

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-30 19:01:50 +0000
+++ CMakeLists.txt	2014-08-20 13:26:53 +0000
@@ -9,11 +9,14 @@
 set(APPLICATION_DIR ${DATA_DIR})
 set(CLICK_NAMESPACE com.canonical.payui)
 set(APPLICATION_FILE "${CLICK_NAMESPACE}_${APP_NAME}.application")
+set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
 
 find_package(Qt5Core)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 #find_package(ubuntu-sdk-libs)
+find_program(INTLTOOL_MERGE intltool-merge)
+find_program(INTLTOOL_EXTRACT intltool-extract)
 
 #automatically create moc files
 set(CMAKE_AUTOMOC ON)
@@ -54,3 +57,23 @@
                     DEPENDS payuibackend payuibackend-qmldir
                     WORKING_DIRECTORY ./app)
 
+file(GLOB SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     *.qml *.js *.png *.js *.svg)
+install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
+
+file(GLOB_RECURSE I18N_SRC_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
+     *.qml *.js)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
+list(SORT I18N_SRC_FILES)
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
+add_custom_target(${DESKTOP_FILE} ALL
+                  COMMENT "Merging translations into ${DESKTOP_FILE}"
+                  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_CURRENT_SOURCE_DIR}/po
+                          ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+
+add_subdirectory(po)

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-04-16 18:29:09 +0000
+++ app/CMakeLists.txt	2014-08-20 13:26:53 +0000
@@ -3,11 +3,6 @@
 # make the files visible on qtcreator
 add_custom_target(payui_QMlFiles ALL SOURCES ${QML_JS_FILES})
 
-#substitute variables in the desktop file
-set(DESKTOP_FILE "${CMAKE_PROJECT_NAME}.desktop")
-configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
 install(FILES ${QML_JS_FILES} DESTINATION ${PAYUI_DIR})
 
 add_subdirectory(components)

=== removed file 'app/payui.desktop.in'
--- app/payui.desktop.in	2014-08-11 13:01:18 +0000
+++ app/payui.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Pay UI
-Comment=The application for completing a purchase.
-Exec=@EXEC@ --transparent %u
-Icon=graphics/[e-mail]
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true
-OnlyShowIn=Old

=== modified file 'debian/control'
--- debian/control	2014-07-28 12:57:07 +0000
+++ debian/control	2014-08-20 13:26:53 +0000
@@ -5,6 +5,8 @@
  cmake,
  debhelper (>= 9),
  pkg-config,
+ gettext,
+ intltool,
  libqt5webkit5-qmlwebkitplugin,
  libubuntuoneauth-2.0-dev,
  qtbase5-dev,

=== modified file 'manifest.json'
--- manifest.json	2014-08-11 13:01:18 +0000
+++ manifest.json	2014-08-20 13:26:53 +0000
@@ -1,16 +1,16 @@
 {
     "name": "com.canonical.payui",
     "description": "UI for Pay Service",
-    "framework": "ubuntu-sdk-14.10-qml-dev2",
+    "framework": "ubuntu-sdk-14.10-qml-dev3",
     "architecture": "armhf",
     "title": "PayUI",
     "hooks": {
         "payui": {
             "account-application": "com.canonical.payui_payui.application",
             "apparmor": "payui.json",
-            "desktop": "payui.desktop"
+            "desktop": "payui_payui.desktop"
         }
     },
-    "version": "0.3.9",
-    "maintainer": "Sarmentero Diego <[e-mail]>"
+    "version": "0.3.11",
+    "maintainer": "Diego Sarmentero <[e-mail]>"
 }
\ No newline at end of file

=== added file 'payui_payui.desktop.in.in'
--- payui_payui.desktop.in.in	1970-01-01 00:00:00 +0000
+++ payui_payui.desktop.in.in	2014-08-20 13:26:53 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Pay UI
+_Comment=The application for completing a purchase.
+Exec=@EXEC@ %u
+Icon=graphics/[e-mail]
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+OnlyShowIn=Old

=== added directory 'po'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2014-08-20 13:26:53 +0000
@@ -0,0 +1,30 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+add_custom_target(${POT_FILE}
+    COMMENT "Generating translation template"
+    COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+        --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+        -D ${CMAKE_CURRENT_SOURCE_DIR}
+        -D ${CMAKE_CURRENT_BINARY_DIR}
+        --from-code=UTF-8
+        --c++ --qt --add-comments=TRANSLATORS
+        --keyword=tr --keyword=tr:1,2 --keyword=N_
+        --package-name='${PROJECT_NAME}'
+        --copyright-holder='Canonical Ltd.'
+        ${I18N_SRC_FILES}
+    COMMAND cp -f ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/)
+
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'po/payui.pot'
--- po/payui.pot	1970-01-01 00:00:00 +0000
+++ po/payui.pot	2014-08-20 13:26:53 +0000
@@ -0,0 +1,107 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: payui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-13 12:14-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/payui.qml:245
+msgid "Purchase failed"
+msgstr ""
+
+#: ../app/payui.qml:246
+msgid "The purchase couldn't be completed."
+msgstr ""
+
+#: ../app/payui.qml:260
+msgid "Error contacting the server"
+msgstr ""
+
+#: ../app/payui.qml:261 ../app/payui.qml:276
+msgid "Do you want to try again?"
+msgstr ""
+
+#: ../app/payui.qml:275
+msgid "Adding Credit Card failed"
+msgstr ""
+
+#: ../app/payui.qml:292
+msgid "Processing Purchase"
+msgstr ""
+
+#: ../app/payui.qml:292
+msgid "Loading"
+msgstr ""
+
+#: ../app/payui.qml:293
+msgid "Please wait…"
+msgstr ""
+
+#: ../app/payui.qml:307 ../app/ui/AddPaymentPage.qml:168
+#: ../app/ui/CheckoutPage.qml:207 ../app/ui/DirectPurchase.qml:168
+msgid "Cancel"
+msgstr ""
+
+#: ../app/payui.qml:374 ../app/payui.qml:387
+msgid "Add Payment"
+msgstr ""
+
+#: ../app/ui/AddPaymentPage.qml:25 ../app/ui/CheckoutPage.qml:25
+msgid "Payment"
+msgstr ""
+
+#: ../app/ui/AddPaymentPage.qml:155 ../app/ui/CheckoutPage.qml:230
+msgid "Add credit/debit card"
+msgstr ""
+
+#: ../app/ui/CheckoutPage.qml:216 ../app/ui/DirectPurchase.qml:177
+msgid "Buy Now"
+msgstr ""
+
+#: ../app/ui/DirectPurchase.qml:82
+msgid "Sign in to Ubuntu Store"
+msgstr ""
+
+#: ../app/ui/DirectPurchase.qml:95
+msgid "Enter the Ubuntu One password for"
+msgstr ""
+
+#: ../app/ui/DirectPurchase.qml:120
+msgid "Password"
+msgstr ""
+
+#: ../app/ui/DirectPurchase.qml:134
+msgid "Incorrect Password, please try again."
+msgstr ""
+
+#: ../app/ui/DirectPurchase.qml:193
+msgid "View wallet"
+msgstr ""
+
+#: ../app/ui/ErrorDialog.qml:45
+msgid "Retry"
+msgstr ""
+
+#: ../app/ui/ErrorDialog.qml:55
+msgid "Close"
+msgstr ""
+
+#: payui_payui.desktop.in.in.h:1
+msgid "Pay UI"
+msgstr ""
+
+#: payui_payui.desktop.in.in.h:2
+msgid "The application for completing a purchase."
+msgstr ""