Commits

Kai Diefenbach committed 53e62c9 Merge

Merged in pigletto/django-lfs-0.7-raw (pull request #12)

  • Participants
  • Parent commits fcb39e2, 7656e35

Comments (0)

Files changed (8)

docs/user/concepts/properties.rst

 Overview
 ========
 
-Generally, properties are used to extend products with miscellaneous date fields.
+Generally, properties are used to extend products with miscellaneous data fields.
 Properties are attached to products with the help of :doc:`property groups
 </user/management/properties/property_groups>`.
 

lfs/core/templatetags/lfs_tags.py

         objects = []
         objects.append({
             "name": _(u"Information"),
-            "url": reverse("lfs_pages")}),
+            "url": reverse("lfs_pages")})
         objects.append({"name": obj.title})
 
         result = {

lfs/core/widgets/image.py

         if value and hasattr(value, "url_60x60"):
             output += u"""<div><img src="%s" /></div>""" % value.url_60x60
         elif value and hasattr(value, "url"):
-                output += u"""<div><img src="%s" /></div>""" % value.url
+            output += u"""<div><img src="%s" /></div>""" % value.url
 
         if value:
             trans = _(u"Delete image")

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-29 14:34-0500\n"
-"PO-Revision-Date: 2012-03-29 21:38+0100\n"
+"POT-Creation-Date: 2012-04-02 11:38-0500\n"
+"PO-Revision-Date: 2012-04-02 18:39+0100\n"
 "Last-Translator: Maciej Wiśniowski <pigletto@gmail.com>\n"
 "Language-Team: natcam.pl <hello@natcam.pl>\n"
 "Language: \n"
 msgid "Payment Flagged"
 msgstr "Oznaczona płatność"
 
+#: page/models.py:20
+msgid "Short text"
+msgstr "Skrócony tekst"
+
 #: page/models.py:21
 #: portlet/models/text.py:15
 msgid "Text"

lfs/manage/categories/view.py

 
 
 class ViewForm(ModelForm):
-    """Form to add/edit seo properties of a category.
+    """Form to add/edit category.
     """
     def __init__(self, *args, **kwargs):
         super(ViewForm, self).__init__(*args, **kwargs)

lfs/page/models.py

     slug = models.SlugField(_(u"Slug"), max_length=100)
     position = models.IntegerField(_(u"Position"), default=999)
     exclude_from_navigation = models.BooleanField(_(u"Exclude from navigation"), default=False)
-    short_text = models.TextField(blank=True)
+    short_text = models.TextField(_(u"Short text"), blank=True)
     body = models.TextField(_(u"Text"), blank=True)
     file = models.FileField(_(u"File"), blank=True, upload_to="files")
 

lfs/portlet/models/featured.py

 
 
 class FeaturedPortlet(Portlet):
-    """A portlet for displaying for sale products.
+    """A portlet for displaying featured products.
     """
     class Meta:
         app_label = 'portlet'