Minor shop fixes.

diff --git a/shop/locale/pl/LC_MESSAGES/django.mo b/shop/locale/pl/LC_MESSAGES/django.mo
index 24fe2e9..7ed860b 100644 (file)
Binary files a/shop/locale/pl/LC_MESSAGES/django.mo and b/shop/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/shop/locale/pl/LC_MESSAGES/django.po b/shop/locale/pl/LC_MESSAGES/django.po
index b523584..1ba5aa4 100644 (file)
--- a/shop/locale/pl/LC_MESSAGES/django.po
+++ b/shop/locale/pl/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2013-10-31 11:13+0100\n"
-"PO-Revision-Date: 2013-10-31 11:25+0100\n"
+"POT-Creation-Date: 2013-10-31 13:23+0100\n"
+"PO-Revision-Date: 2013-10-31 13:23+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -58,7 +58,7 @@ msgstr "Zgoda na przetwarzanie danych"
 msgid "price"
 msgstr "cena"
 
 msgid "price"
 msgstr "cena"
 

-#: models.py:25 models.py:45
+#: models.py:25 models.py:48

 msgid "offer"
 msgstr "oferta"
 
 msgid "offer"
 msgstr "oferta"
 


@@ -66,39 +66,39 @@ msgstr "oferta"
 msgid "offers"
 msgstr "oferty"
 
 msgid "offers"
 msgstr "oferty"
 

-#: models.py:46
+#: models.py:49

 msgid "items"
 msgstr "liczba egzemplarzy"
 
 msgid "items"
 msgstr "liczba egzemplarzy"
 

-#: models.py:47
+#: models.py:50

 msgid "name"
 msgstr "nazwisko"
 
 msgid "name"
 msgstr "nazwisko"
 

-#: models.py:48
+#: models.py:51

 msgid "email"
 msgstr "e-mail"
 
 msgid "email"
 msgstr "e-mail"
 

-#: models.py:49
+#: models.py:52

 msgid "address"
 msgstr "adres"
 
 msgid "address"
 msgstr "adres"
 

-#: models.py:50
+#: models.py:53

 msgid "payed at"
 msgstr "zapłacono"
 
 msgid "payed at"
 msgstr "zapłacono"
 

-#: models.py:54
+#: models.py:57

 msgid "order"
 msgstr "zamówienie"
 
 msgid "order"
 msgstr "zamówienie"
 

-#: models.py:55
+#: models.py:58

 msgid "orders"
 msgstr "zamówienie"
 
 msgid "orders"
 msgstr "zamówienie"
 

-#: models.py:113
+#: models.py:117

 msgid "Your payment has been completed."
 msgstr "Twoja płatność została wykonana."
 
 msgid "Your payment has been completed."
 msgstr "Twoja płatność została wykonana."
 

-#: models.py:117
+#: models.py:121

 msgid "New order has been placed."
 msgstr "Zostało złożone nowe zamówienie."
 
 msgid "New order has been placed."
 msgstr "Zostało złożone nowe zamówienie."
 


@@ -138,6 +138,19 @@ msgstr ""
 msgid "Your order is now being processed: "
 msgstr "Twoje zamówienie jest przetwarzane:"
 
 msgid "Your order is now being processed: "
 msgstr "Twoje zamówienie jest przetwarzane:"
 

+#: templates/shop/snippets/order_form.html:8
+msgid "Payment and shipping costs"
+msgstr "Koszt płatności i dostawy"
+
+#: templates/shop/snippets/order_form.html:10
+#: templates/shop/snippets/order_form.html:13
+msgid "for each copy"
+msgstr "za każdy egzemplarz"
+
+#: templates/shop/snippets/order_form.html:12
+msgid "Final cost"
+msgstr "Sumaryczny koszt"
+

 #: templates/shop/snippets/order_form.html:18
 msgid "Donate!"
 msgstr "Wesprzyj!"
 #: templates/shop/snippets/order_form.html:18
 msgid "Donate!"
 msgstr "Wesprzyj!"

diff --git a/shop/models.py b/shop/models.py
index 349cf43..aca0703 100644 (file)
--- a/shop/models.py
+++ b/shop/models.py
@@ -27,7 +27,7 @@ class Offer(models.Model):
         ordering = ['entry']
 
     def __unicode__(self):
         ordering = ['entry']
 
     def __unicode__(self):

-        return self.entry.title
+        return unicode(self.entry)

 
     def get_absolute_url(self):
         return self.entry.get_absolute_url()
 
     def get_absolute_url(self):
         return self.entry.get_absolute_url()


@@ -121,4 +121,4 @@ def payment_status_changed_listener(sender, instance, old_status, new_status, **
             _('New order has been placed.'),
             'shop/email/payed_managers.txt'
         )
             _('New order has been placed.'),
             'shop/email/payed_managers.txt'
         )

-getpaid.signals.payment_status_changed.connect(payment_status_changed_listener)
+getpaid.signals.payment_status_changed.connect(payment_status_changed_listener, dispatch_uid='shop.models.payment_status_changed_listener')