ubuntu-system-settings

Merge lp://qastaging/~cypressyew/ubuntu-system-settings/pot-update into lp://qastaging/ubuntu-system-settings

pot-update
Merge into trunk

Proposed by Po-Hsu Lin on 2016-05-26

Status:	Rejected
Rejected by:	Sebastien Bacher on 2016-05-30
Proposed branch:	lp://qastaging/~cypressyew/ubuntu-system-settings/pot-update
Merge into:	lp://qastaging/ubuntu-system-settings
Diff against target:	3277 lines (+966/-130) 1 file modified po/ubuntu-system-settings.pot (+966/-130)
To merge this branch:	bzr merge lp://qastaging/~cypressyew/ubuntu-system-settings/pot-update
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Sebastien Bacher (community)		Disapprove on 2016-05-30
Jonas G. Drange (community)	2016-05-26	Needs Information on 2016-05-26
Review via email: mp+295798@code.qastaging.launchpad.net

Description of the change

Update the po/ubuntu-system-settings.pot file for *.cpp, *.qml and *.py, with the following command:

PY_FILES=`find ./ -name "*.py"`
CPP_FILES=`find ./ -name "*.cpp"`
QML_FILES=`find ./ -name "*.qml"`

xgettext -o po/ubuntu-system-settings.pot --join-existing --language=python --add-comments=TRANSLATORS --keyword=_ --keyword=N_ ${PY_FILES}
xgettext -o po/ubuntu-system-settings.pot --join-existing --language=C++ --add-comments=TRANSLATORS --keyword=_ --keyword=N_ ${CPP_FILES} --from-code=UTF-8
xgettext -o po/ubuntu-system-settings.pot --join-existing --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 ${QML_FILES} --from-code=UTF-8

lp://qastaging/~cypressyew/ubuntu-system-settings/pot-update updated on 2016-05-26

1661. By Po-Hsu Lin on 2016-05-26: Update pot file for cpp, py, qml files

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2016-05-26:

I've never updated the pot manually, so I assumed launchpad did this automatically. Rather than manually updating the pot, can we find the reason as to why the .pot file was not updated properly?

review: Needs Information

Revision history for this message

Po-Hsu Lin (cypressyew) wrote on 2016-05-26:

From the pot file timestamp, it's outdated for a while.
For .py and .cpp files, they can be managed by launchpad with a POTFILE.in in the "po" directory.
(I'm not sure if qml files can be managed too)

An example of a POTFILE.in can be found here [1]

[1] http://bazaar.launchpad.net/~checkbox-dev/checkbox/trunk/view/head:/providers/plainbox-provider-checkbox/po/POTFILES.in

Revision history for this message

Po-Hsu Lin (cypressyew) wrote on 2016-05-30:

Tested with a POTFILES.in, with all *.py, *,cpp and *.qml added into that file.

Command "intltool-update -p" does not generate the desired translatable string output for qml files.

Revision history for this message

Sebastien Bacher (seb128) wrote on 2016-05-30:

Thanks but there is a makefile target to update the template and that's done during the deb build

"override_dh_auto_build:
dh_auto_build
$(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) pot"

the strings are translatable as indicated on the bug report, the chinese translations just need to be validated.

Note that the trunk template tend to be outdated which is confusing so it should probably be deleted but the translations are done in the Ubuntu serie instead

review: Disapprove

Revision history for this message

Po-Hsu Lin (cypressyew) wrote on 2016-05-31:

Ah cool, thanks for the info.

FYI, for a certain string, like "Brightness & Display" it's only available for translators in "ubuntu-system-settings in Ubuntu RTM 15.04" it's not available for other versions including Xenial.

I think this fact just matches your explanation here: the trunk template tend to be outdated and it's confusing.

[1] https://translations.launchpad.net/ubuntu-rtm/15.04/+source/ubuntu-system-settings