Kai Diefenbach avatar Kai Diefenbach committed bf93e3c Merge

Merged 0.7 branch.

Comments (0)

Files changed (5)

 Unreleased
 ----------
 
+* Bugfix: added safe filter to static block; issue #174 (Frank Feng)
+* Bugfix: Fixed display of short description for variants
+* Bugfix: fixed decimal_l10n tag: return origin value if it's no float
+* Bugfix: fixed error messages within checkout; issue #176 (Maciej Wiśniowski)
+* Bugfix: fixed __unicode__ methods of several models; issue #172
 * Bugfix: fixed positions of newly added variants (Maciej Wiśniowski)
 * Bugfix: fixed layout, when there are no portlets at right; issue #173 (Frank Feng)
 * Bugfix: fixed local variable 'message' referenced before assignment (Maciej Wiśniowski)

lfs/checkout/forms.py

 
         if self.data.get("is_anonymous") == "1" and \
            getattr(settings, "LFS_INVOICE_EMAIL_REQUIRED") and \
-           not self.cleaned_data.get("invoice_email"):
+           self.cleaned_data.get("invoice_email") == "":
             self._errors["invoice_email"] = ErrorList([msg])
 
         if not self.cleaned_data.get("no_shipping"):
-            if self.cleaned_data.get("shipping_firstname", "") == "":
+            if self.cleaned_data.get("shipping_firstname") == "":
                 self._errors["shipping_firstname"] = ErrorList([msg])
 
-            if self.cleaned_data.get("shipping_lastname", "") == "":
+            if self.cleaned_data.get("shipping_lastname") == "":
                 self._errors["shipping_lastname"] = ErrorList([msg])
 
             if getattr(settings, "LFS_SHIPPING_COMPANY_NAME_REQUIRED", False):
-                if self.cleaned_data.get("shipping_company_name", "") == "":
+                if self.cleaned_data.get("shipping_company_name") == "":
                     self._errors["shipping_company_name"] = ErrorList([msg])
 
             if getattr(settings, "LFS_SHIPPING_PHONE_REQUIRED", False):
-                if self.cleaned_data.get("shipping_phone", "") == "":
+                if self.cleaned_data.get("shipping_phone") == "":
                     self._errors["shipping_phone"] = ErrorList([msg])
 
             if getattr(settings, "LFS_SHIPPING_EMAIL_REQUIRED", False):
-                if self.cleaned_data.get("shipping_email", "") == "":
+                if self.cleaned_data.get("shipping_email") == "":
                     self._errors["shipping_email"] = ErrorList([msg])
 
         # check that shipping country is in the shops shipping countries list
Add a comment to this file

lfs/locale/pl/LC_MESSAGES/django.mo

Binary file modified.

lfs/locale/pl/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: LFS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 17:28+0100\n"
-"PO-Revision-Date: 2012-03-24 17:33+0100\n"
+"POT-Creation-Date: 2012-03-29 14:34-0500\n"
+"PO-Revision-Date: 2012-03-29 21:38+0100\n"
 "Last-Translator: Maciej Wiśniowski <pigletto@gmail.com>\n"
-"Language-Team: Jarek Miazga <jaroslaw.miazga@gmail.com>\n"
+"Language-Team: natcam.pl <hello@natcam.pl>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Poedit-Language: Polish\n"
+"X-Poedit-Country: POLAND\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: other_translations.py:3
 msgid "Price excludes tax"
 #: catalog/models.py:2067
 #: customer/models.py:105
 #: discounts/models.py:43
+#: payment/models.py:81
 #: templates/manage/portlets/portlets_inline.html:37
 #: templates/manage/voucher/vouchers_inline.html:70
 msgid "Type"
 msgid "Option has been added."
 msgstr "Opcja została dodana."
 
-#: manage/product/variants.py:393
 #: manage/product/variants.py:395
+#: manage/product/variants.py:397
 msgid "That slug is already in use. Please use another."
 msgstr "Ten adres url jest już używany. Proszę wybrać inny."
 
-#: manage/product/variants.py:417
+#: manage/product/variants.py:420
 msgid "Variants have been added."
 msgstr "Warianty zostały dodane."
 
-#: manage/product/variants.py:441
+#: manage/product/variants.py:444
 msgid "Variants have been deleted."
 msgstr "Warianty zostały usunięte."
 
-#: manage/product/variants.py:455
+#: manage/product/variants.py:458
 msgid "Variants have been saved."
 msgstr "Warianty zostały zapisane."
 
-#: manage/product/variants.py:556
+#: manage/product/variants.py:559
 msgid "Sup type has been saved."
 msgstr "Podtyp został zapisany."
 
-#: manage/product/variants.py:580
+#: manage/product/variants.py:583
 msgid "Category variant has been saved."
 msgstr "Dane wariantu kategorii zostały zapisane."
 
 msgid "note"
 msgstr "notatka"
 
+#: payment/models.py:80
+msgid "Module"
+msgstr "Moduł"
+
 #: payment/settings.py:16
 msgid "Mastercard"
 msgstr ""

lfs/payment/models.py

     tax = models.ForeignKey(Tax, verbose_name=_(u"Tax"), blank=True, null=True)
     price = models.FloatField(_(u"Price"), default=0.0)
     deletable = models.BooleanField(default=True)
-    module = models.CharField(blank=True, max_length=100, choices=getattr(settings, "LFS_PAYMENT_METHOD_PROCESSORS", []))
-    type = models.PositiveSmallIntegerField(choices=lfs.payment.settings.PAYMENT_METHOD_TYPES_CHOICES, default=lfs.payment.settings.PM_PLAIN)
+    module = models.CharField(_(u'Module'), blank=True, max_length=100, choices=getattr(settings, "LFS_PAYMENT_METHOD_PROCESSORS", []))
+    type = models.PositiveSmallIntegerField(_(u'Type'), choices=lfs.payment.settings.PAYMENT_METHOD_TYPES_CHOICES, default=lfs.payment.settings.PM_PLAIN)
 
     criteria_objects = generic.GenericRelation(CriteriaObjects,
         object_id_field="content_id", content_type_field="content_type")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.