ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/reboot-do-not-modify-sourcecode-during-translation-generation into lp:ubuntu-calculator-app/reboot.

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)
  Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot): continuous-integration

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/reboot-do-not-modify-sourcecode-during-translation-generation/+merge/255465

Do not modify source code during generating pot translation template file.
It is very ugly and dirty to modify source code with scripts to generate translation template, without user permission/knowledge.

It is visible especially during using Ubuntu-SDK.
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/reboot-do-not-modify-sourcecode-during-translation-generation into lp:ubuntu-calculator-app/reboot.

=== modified file 'README.translations'
--- README.translations	2014-11-28 14:59:44 +0000
+++ README.translations	2015-04-08 07:09:09 +0000
@@ -11,8 +11,12 @@
 messages in the code, make sure to follow these steps:
 
  1. Run click-buddy retaining the build directory:
-    `click-buddy --dir . --no-clean`
- 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`
+    $ click-buddy --dir . --no-clean
+ 2. Copy the .pot file from the <build dir> mentioned in the output to your
+    original source:
+    $ cp <build dir>/po/*.pot po/
+ 2. Commit the generated .pot file: 
+    $ bzr commit -m"Updated translation template"
  3. Push the branch and send a merge proposal as usual
 
 And that's it, once the branch lands Launchpad should take care of all the rest!

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-01-20 00:55:24 +0000
+++ po/CMakeLists.txt	2015-04-08 07:09:09 +0000
@@ -32,8 +32,6 @@
           --copyright-holder='Canonical Ltd.'
           -D ${CMAKE_CURRENT_SOURCE_DIR} 
           ${I18N_SRC_FILES}
-  # Copy the up2date translation file to the source directory
-  COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 # Builds the binary translations catalog. For each language

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-03-26 21:16:14 +0000
+++ po/com.ubuntu.calculator.pot	2015-04-08 07:09:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-26 22:15+0100\n"
+"POT-Creation-Date: 2015-04-07 22:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,35 +21,35 @@
 msgid "NaN"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:212 ../app/ubuntu-calculator-app.qml:217
+#: ../app/ubuntu-calculator-app.qml:215 ../app/ubuntu-calculator-app.qml:220
 msgid "Favorite"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:268
+#: ../app/ubuntu-calculator-app.qml:273
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:282
+#: ../app/ubuntu-calculator-app.qml:287
 msgid "Select All"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:282
+#: ../app/ubuntu-calculator-app.qml:287
 msgid "Select None"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:289 ../app/ubuntu-calculator-app.qml:360
+#: ../app/ubuntu-calculator-app.qml:294 ../app/ubuntu-calculator-app.qml:365
 msgid "Copy"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:297 ../app/ubuntu-calculator-app.qml:412
+#: ../app/ubuntu-calculator-app.qml:302 ../app/ubuntu-calculator-app.qml:417
 msgid "Delete"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:373
+#: ../app/ubuntu-calculator-app.qml:378
 msgid "Edit"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:389
+#: ../app/ubuntu-calculator-app.qml:394
 msgid "Add to favorites"
 msgstr ""
 
@@ -59,7 +59,7 @@
 #. TRANSLATORS: this is a time formatting string, see
 #. http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid
 #. expressions
-#: ../app/ubuntu-calculator-app.qml:542 ../app/ui/FavouritePage.qml:89
+#: ../app/ubuntu-calculator-app.qml:548 ../app/ui/FavouritePage.qml:89
 #: ../app/ui/Screen.qml:50
 msgid "dd MMM yyyy"
 msgstr ""
@@ -101,14 +101,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.IQZ6BEYwiF/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.IQZ6BEYwiF/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.IQZ6BEYwiF/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""