fixed unicode for Criterion; updated Polish translations

lfs/criteria/models.py

@@ -6,6 +6,7 @@
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.utils.encoding import force_unicode
 from django.utils.translation import ugettext_lazy as _, ugettext
 from django.template import RequestContext
 from django.template.loader import render_to_string
@@ -148,10 +149,16 @@ class Meta:
     ]
 
     def __unicode__(self):
+        """ We're using force unicode as this basically fails:
+               from django.utils import translation
+               from django.utils.translation import ugettext_lazy as _
+               translation.activate('pl')
+               u'test: %s' % _('Payment method')
+        """
         return ugettext("%(name)s: %(operator)s %(value)s") % {
-            'name': self.get_name(),
-            'operator': self.get_current_operator_as_string(),
-            'value': self.get_value_as_string()
+            'name': force_unicode(self.get_name()),
+            'operator': force_unicode(self.get_current_operator_as_string()),
+            'value': force_unicode(self.get_value_as_string())
         }
 
     def save(self, *args, **kwargs):

lfs/locale/pl/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: LFS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-10-13 20:33+0200\n"
-"PO-Revision-Date: 2012-10-15 22:19+0100\n"
+"PO-Revision-Date: 2012-10-28 22:25+0100\n"
 "Last-Translator: Maciej Wiśniowski <pigletto@gmail.com>\n"
 "Language-Team: natcam.pl <hello@natcam.pl>\n"
 "Language: \n"
@@ -1370,7 +1370,7 @@ msgstr "Kraje"
 #: criteria/models.py:577
 #: templates/manage/payment/payment_methods.html:3
 msgid "Payment methods"
-msgstr "Metody płatności"
+msgstr "Sposoby płatności"
 
 #: criteria/models.py:637
 #: templates/manage/shipping_methods/shipping_methods.html:4

lfs/other_translations.py

@@ -9,3 +9,5 @@
 _('Zip Code')
 _(u'Last Order Number')
 _(u'Format')
+_(u"Cart Price")
+_(u"Combined Length and Girth")