harvest-dev team mailing list archive

[Nigel Jones <dev@xxxxxxxxxx>]

Nigel Jones has proposed merging lp:~dev-nigelj/harvest/627340 into lp:harvest with lp:~dev-nigelj/harvest/misc-fixes as a prerequisite.

Requested reviews:
  harvest-dev (harvest-dev)
Related bugs:
  #627340 Change label of "selected" and "package sets" to "limit to…"
  https://bugs.launchpad.net/bugs/627340


Change the filtering headings to 'Limit to'
-- 
https://code.launchpad.net/~dev-nigelj/harvest/627340/+merge/34531
Your team harvest-dev is requested to review the proposed merge of lp:~dev-nigelj/harvest/627340 into lp:harvest.

=== modified file 'harvest/locale/harvest.pot'
--- harvest/locale/harvest.pot	2010-09-03 12:32:06 +0000
+++ harvest/locale/harvest.pot	2010-09-03 12:39:44 +0000
@@ -8,7 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2010-09-03 07:32-0500\n"
+=======
+"POT-Creation-Date: 2010-09-03 07:28-0500\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -46,6 +50,10 @@
 msgstr[0] ""
 msgstr[1] ""
 
+#: opportunities/filters.py:59 opportunities/filters.py:63
+msgid "Limit to"
+msgstr ""
+
 #: opportunities/forms.py:6
 msgid "Enter a new note"
 msgstr ""

=== modified file 'harvest/opportunities/filters.py'
--- harvest/opportunities/filters.py	2010-08-13 22:15:55 +0000
+++ harvest/opportunities/filters.py	2010-09-03 12:39:44 +0000
@@ -1,5 +1,6 @@
 from harvest.filters import filters, containers
 from harvest.common.ordereddict import OrderedDict
+from django.utils.translation import ugettext as _
 import models
 
 class PkgNameFilter(filters.EditFilter):
@@ -55,11 +56,11 @@
             [
                 filters.FilterGroup('pkg', [
                     PkgNameFilter('name', name='Named'),
-                    PkgSetFilter('set', name='Package sets')
+                    PkgSetFilter('set', name=_('Limit to'))
                 ], name='Packages' ),
                 filters.FilterGroup('opp', [
                     OppFeaturedFilter('featured', name='Featured'),
-                    OppListFilter('list', name='Selected')
+                    OppListFilter('list', name=_('Limit to'))
                 ], name='Opportunities' )
             ],
             default_parameters = { 'pkg' : 'set',