From 1ede7c2fdb4bc8345e778ab734b0c3e59fdeb32a Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 31 Oct 2013 13:24:16 +0100 Subject: [PATCH 1/1] Minor shop fixes. --- shop/locale/pl/LC_MESSAGES/django.mo | Bin 2174 -> 2364 bytes shop/locale/pl/LC_MESSAGES/django.po | 37 ++++++++++++++++++--------- shop/models.py | 4 +-- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/shop/locale/pl/LC_MESSAGES/django.mo b/shop/locale/pl/LC_MESSAGES/django.mo index 24fe2e949ee48d4a33c575d13fe5ffc3a4b0aabe..7ed860b4a8e91d5f38e20659c0f95a658da3dcc0 100644 GIT binary patch delta 928 zcmYk)OK1~89LMo#v!<~xW2~*(R;TfCsuYY+5D^06MbLwu1P|LJHcQ&glB7t25D@g> zL4-vR1o0vW3PO7jp@LF_pr;l*D557p@l+3`BB& z-@J?(-n1Kxd4~x;T*V}Qiu!-zD$!ZT-L$X7I}?4xL)5>bBIB@%otVb$cpNp(DO6<6 zBagX6kz#%`!;3yxKn-*gwc{r^iqG%}zDG^`E9y_M%4zETsQ*q!dXcwLkyt|3W?tYB zzCuOz12)O#JB2=2kK9C^-M`2_wxN}epaw`IK`_%uK+F#E9`Z0*cSvKYUs2FTlyryE z?YB;$JF#Eque08@rGqisldwrMLRMt9Caqjam(S`YN(WGjRMIi%?6rGEOldD!n_^G8 zcOJH6?wrk)tF>?}mQA^S-d2lV5P1G=lwNVRS$KBDhdb2_6x?A(ht@}C8dN$8w h?$vrY(X%nsaBazLE$8dDFxx212Xk(v5e_Gc{{e>ta9;ob delta 741 zcmXxiy)Q#i7{~EbeN}H&s@_`EOHv`xHb`n=!hl3#FnCGY#HfojV(4nWF&S(o31Tsb zh=HLoNYm9s;tyc3i0@BNpWNqu&bjB_`2U>bXIwl-ce>ooL&4Gd!*IZTmL29IzU zFL4knIEi1V2_<-|3XEH)P=#h}e-3^07i@pY_E#}rN))CM;)ZQ|!#=*U3kMkC`XW!O zz!r{R4z&Zv*pBDeh_@KTN7Te#Pz$P}-v5bu{s)=6iF4B!^-Y3?3N51sc5oJRs0U81 z57rOVgo1(E%0j3@QRFb=_Ik#eMSYS5>k4Y3n^@|kk*C38%^|XIqifXo|9)ID9i+zl zNWDm_ZX*>ctk41!`jm<&sYz-<`rg_x{a@Xr{xt==mj3^_G#hrsbdhng9zFF2Y6}%D t&UZt>DY)mIvb*A3c+T9ZY|2^nj(Sqr^z=>9`|NVo{JT!s|Ls%*dw*}NIdK30 diff --git a/shop/locale/pl/LC_MESSAGES/django.po b/shop/locale/pl/LC_MESSAGES/django.po index b523584..1ba5aa4 100644 --- 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" -"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 \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgstr "Zgoda na przetwarzanie danych" msgid "price" msgstr "cena" -#: models.py:25 models.py:45 +#: models.py:25 models.py:48 msgid "offer" msgstr "oferta" @@ -66,39 +66,39 @@ msgstr "oferta" msgid "offers" msgstr "oferty" -#: models.py:46 +#: models.py:49 msgid "items" msgstr "liczba egzemplarzy" -#: models.py:47 +#: models.py:50 msgid "name" msgstr "nazwisko" -#: models.py:48 +#: models.py:51 msgid "email" msgstr "e-mail" -#: models.py:49 +#: models.py:52 msgid "address" msgstr "adres" -#: models.py:50 +#: models.py:53 msgid "payed at" msgstr "zapłacono" -#: models.py:54 +#: models.py:57 msgid "order" msgstr "zamówienie" -#: models.py:55 +#: models.py:58 msgid "orders" msgstr "zamówienie" -#: models.py:113 +#: models.py:117 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." @@ -138,6 +138,19 @@ msgstr "" 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!" diff --git a/shop/models.py b/shop/models.py index 349cf43..aca0703 100644 --- a/shop/models.py +++ b/shop/models.py @@ -27,7 +27,7 @@ class Offer(models.Model): ordering = ['entry'] def __unicode__(self): - return self.entry.title + return unicode(self.entry) 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' ) -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') -- 2.20.1