GTG

Merge lp://qastaging/~dpm/gtg/bug-526420 into lp://qastaging/~gtg/gtg/old-trunk

bug-526420
Merge into old-trunk

Proposed by David Planella on 2010-03-12

Status:	Merged
Merge reported by:	Luca Invernizzi
Merged at revision:	not available
Proposed branch:	lp://qastaging/~dpm/gtg/bug-526420
Merge into:	lp://qastaging/~gtg/gtg/old-trunk
Diff against target:	1258 lines (+544/-516) (has conflicts) 5 files modified GTG/__init__.py (+4/-0) GTG/taskbrowser/browser.py (+2/-3) GTG/taskeditor/editor.py (+9/-10) GTG/tools/dates.py (+15/-0) po/gtg.pot (+514/-503) Text conflict in GTG/__init__.py Text conflict in GTG/tools/dates.py
To merge this branch:	bzr merge lp://qastaging/~dpm/gtg/bug-526420
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Luca Invernizzi (community)	2010-03-12	Approve on 2010-03-12
David Planella (community)		Needs Resubmitting on 2010-03-12
Review via email: mp+21223@code.qastaging.launchpad.net

Description of the change

Fix for bug 526420, might need some testing.

I haven't checked if there are other locations where plural forms should be used, but this should give you an idea of what's required.

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

Interesting stuff.

Devs, please do not merge this, but incorporate it in our "_" function (or do something similar).

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

Marking as rejected, as we will not merge exactly this, but thanks for the hint!

review: Disapprove

lp://qastaging/~dpm/gtg/bug-526420 updated on 2010-03-12

683. By David Planella on 2010-03-12: Fixed some plural forms
684. By David Planella on 2010-03-12: Merged from trunk, updated POT template

Revision history for this message

David Planella (dpm) wrote on 2010-03-12:

Hi Luca, thanks for looking into this.

I had not seen the e-mail before working further into the branch, so I started fixing the plural forms in all other places.

Just so you know when you merge it in whichever way you prefer.

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

Oh, that's fine, thanks for that!

lp://qastaging/~dpm/gtg/bug-526420 updated on 2010-03-12

685. By David Planella on 2010-03-12: Included ngettext call in the GTG init module

Revision history for this message

David Planella (dpm) wrote on 2010-03-12:

Ok, as I saw the change might be simple, I'm just resubmitting it including the ngettext call in the GTG __init__.py module, in the same way the _() function is used.

I've not abbreviated the call to e.g. P_() or something similar, since I seem to remember that xgettext seems to be picky about this, and only recognize "gettext.ngettext" or "ngettext" when extracting strings.

Anyway, this might be easier for you to merge, but feel free to reject if you want me to change it or you want to implement it in another way.

Thanks!

review: Needs Resubmitting

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

Oh, thank you, I will merge this.

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

I'm absolutely not an expert on this, but wouldn't xgettext be fooled also by our _() shortcut?

Revision history for this message

Luca Invernizzi (invernizzi) wrote on 2010-03-12:

approved