From b74a8ca3378d9c4e377fa25109a48d034a9bf959 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 12 Nov 2012 11:59:31 +0100 Subject: [PATCH 1/1] Fix categorization. Change *.conf to *.py, so that Django tools see it as code. Minor fixes. --- .gitignore | 2 +- prawokultury/locale/pl/LC_MESSAGES/django.mo | Bin 1904 -> 1757 bytes prawokultury/locale/pl/LC_MESSAGES/django.po | 89 +++++++++--------- .../settings.d/{10-paths.conf => 10-paths.py} | 0 .../settings.d/{20-basic.conf => 20-basic.py} | 0 .../settings.d/{30-apps.conf => 30-apps.py} | 0 .../{30-locale.conf => 30-locale.py} | 0 .../{35-search.conf => 35-search.py} | 0 .../settings.d/{40-auth.conf => 40-auth.py} | 0 .../{40-context.conf => 40-context.py} | 0 .../{40-logging.conf => 40-logging.py} | 0 .../{40-middleware.conf => 40-middleware.py} | 0 .../{50-contrib.conf => 50-contrib.py} | 0 .../{50-static.conf => 50-static.py} | 0 prawokultury/settings.d/60-custom.conf | 1 - prawokultury/settings.d/60-custom.py | 11 +++ prawokultury/settings.py | 2 +- prawokultury/templates/base.html | 1 + requirements.txt | 2 +- 19 files changed, 62 insertions(+), 46 deletions(-) rename prawokultury/settings.d/{10-paths.conf => 10-paths.py} (100%) rename prawokultury/settings.d/{20-basic.conf => 20-basic.py} (100%) rename prawokultury/settings.d/{30-apps.conf => 30-apps.py} (100%) rename prawokultury/settings.d/{30-locale.conf => 30-locale.py} (100%) rename prawokultury/settings.d/{35-search.conf => 35-search.py} (100%) rename prawokultury/settings.d/{40-auth.conf => 40-auth.py} (100%) rename prawokultury/settings.d/{40-context.conf => 40-context.py} (100%) rename prawokultury/settings.d/{40-logging.conf => 40-logging.py} (100%) rename prawokultury/settings.d/{40-middleware.conf => 40-middleware.py} (100%) rename prawokultury/settings.d/{50-contrib.conf => 50-contrib.py} (100%) rename prawokultury/settings.d/{50-static.conf => 50-static.py} (100%) delete mode 100644 prawokultury/settings.d/60-custom.conf create mode 100644 prawokultury/settings.d/60-custom.py diff --git a/.gitignore b/.gitignore index 5818dca..8726538 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*/settings.d/local.conf +*/settings.d/local.py dev.sqlite *.db *.db-journal diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index a24b21f932cab4159af4af1d82a6afad3ad32bea..d31f22ac24bcb12185055fac6aca22a7dbcac957 100644 GIT binary patch delta 631 zcmYMw&r8B!7zglo%^#&{rD!1rLTHCFoR>hlRhJ-;JajOEWizL?#pV))lKzAm{Rf?* zLt%#wU7|xB3Z!F@(6L+pK-BlyMn3TDv*+Er_j%vFZ_h_jCI%-UZ_EowFbx(uSTO)@Cox_#4E2tf21{IExju9tCY2)2!R2nr?`0XPgR(H6)#8mIqHWt2Ef^p`VirSR*nrOGHiKVK<3T>k%R?ob}=zp)4-OT>}2fHaR=S?KDP;3TX;*ZJBY)(~BpNVH`}vza-ebAvrP zGhyxxQODg_oN{MVxcez@{WUi}XXwdB=YBdgHyLq03F0Kur#mw8o2|IFo%?l5HMKN0 zmiKL98f8(}Dq3%edP_xGS|cy0b$!p;_9%1F+Gd~^Mv1GJ%3&}HZ*2H+tfSu7u`5$X zKZ->d>4&~edgt=1i{4Uc(UXuTSM|Kf+O^Uu#~t6A(u#`pvaEWQYU!W4{&xOO zu3w%wmFq^#sM$v9>p*t=txZYUPcm@{q0u6=VU+3ydc<$Q$CbGN diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po index 31b4010..fb1d4e2 100644 --- a/prawokultury/locale/pl/LC_MESSAGES/django.po +++ b/prawokultury/locale/pl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: prawokultury\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-30 11:15+0200\n" -"PO-Revision-Date: 2012-08-30 11:15+0100\n" +"POT-Creation-Date: 2012-11-12 10:10+0100\n" +"PO-Revision-Date: 2012-11-12 10:11+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" "Language: \n" @@ -17,15 +17,36 @@ msgstr "" "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" -#: urls.py:23 +#: menu_items.py:21 +msgid "Publications" +msgstr "Publikacje" + +#: menu_items.py:23 +msgid "Events" +msgstr "Wydarzenia" + +#: menu_items.py:27 +msgid "Positions" +msgstr "Stanowiska" + +#: urls.py:31 msgid "events" msgstr "wydarzenia" -#: templates/404.html:5 -msgid "Page not found." -msgstr "Strona nie znaleziona." +#: settings.d/60-custom.py:5 +msgid "news" +msgstr "newsy" + +#: settings.d/60-custom.py:7 +msgid "publications" +msgstr "publikacje" + +#: settings.d/60-custom.py:8 +msgid "info" +msgstr "info" -#: templates/404.html:10 +#: templates/404.html:5 +#: templates/404.html.py:10 msgid "Page not found" msgstr "Strona nie znaleziona" @@ -37,7 +58,7 @@ msgstr "Strona, której szukasz, nie istnieje." #: templates/base.html.py:13 #: templates/base.html:14 #: templates/base.html.py:25 -#: templates/base.html:73 +#: templates/base.html:74 msgid "Culture's right" msgstr "Prawo kultury" @@ -61,58 +82,42 @@ msgstr "" msgid "Search" msgstr "Szukaj" -#: templates/base.html:62 +#: templates/base.html:63 msgid "Upcoming events" msgstr "Nadchodzące wydarzenia" -#: templates/base.html:77 +#: templates/base.html:78 msgid "Latest comments" msgstr "Ostatnie komentarze" -#: templates/base.html:105 +#: templates/base.html:106 msgid "If not explicitly stated otherwise, all texts are licensed under the Creative Commons Attribution-Share Alike free license." msgstr "Jeśli nie oznaczono inaczej, wszystkie teksty są objęte wolną licencją Creative Commons Uznanie autorstwa – Na tych samych warunkach." -#: templates/share.html:5 -#: templates/share.html.py:7 -msgid "Share on Facebook" -msgstr "Podziel się na Facebooku" +#~ msgid "Page not found." +#~ msgstr "Strona nie znaleziona." + +#~ msgid "Share on Facebook" +#~ msgstr "Podziel się na Facebooku" -#: templates/share.html:10 -#: templates/share.html.py:12 -msgid "Share on Google+" -msgstr "Podziel się na Google+" +#~ msgid "Share on Google+" +#~ msgstr "Podziel się na Google+" -#: templates/share.html:15 -#: templates/share.html.py:17 -msgid "Share on Twitter" -msgstr "Podziel się na Twitterze" +#~ msgid "Share on Twitter" +#~ msgstr "Podziel się na Twitterze" -#: templates/share.html:20 -#: templates/share.html.py:22 -msgid "Share on NK.pl" -msgstr "Podziel się na NK.pl" +#~ msgid "Share on NK.pl" +#~ msgstr "Podziel się na NK.pl" -#: templates/prevnext/next.html:13 -msgid "next" -msgstr "następne" +#~ msgid "next" +#~ msgstr "następne" -#: templates/prevnext/previous.html:13 -msgid "previous" -msgstr "poprzednie" +#~ msgid "previous" +#~ msgstr "poprzednie" #~ msgid "About us" #~ msgstr "O nas" -#~ msgid "Publications" -#~ msgstr "Publikacje" - -#~ msgid "Events" -#~ msgstr "Wydarzenia" - -#~ msgid "Positions" -#~ msgstr "Stanowiska" - #~ msgid "First aid" #~ msgstr "Pierwsza pomoc" diff --git a/prawokultury/settings.d/10-paths.conf b/prawokultury/settings.d/10-paths.py similarity index 100% rename from prawokultury/settings.d/10-paths.conf rename to prawokultury/settings.d/10-paths.py diff --git a/prawokultury/settings.d/20-basic.conf b/prawokultury/settings.d/20-basic.py similarity index 100% rename from prawokultury/settings.d/20-basic.conf rename to prawokultury/settings.d/20-basic.py diff --git a/prawokultury/settings.d/30-apps.conf b/prawokultury/settings.d/30-apps.py similarity index 100% rename from prawokultury/settings.d/30-apps.conf rename to prawokultury/settings.d/30-apps.py diff --git a/prawokultury/settings.d/30-locale.conf b/prawokultury/settings.d/30-locale.py similarity index 100% rename from prawokultury/settings.d/30-locale.conf rename to prawokultury/settings.d/30-locale.py diff --git a/prawokultury/settings.d/35-search.conf b/prawokultury/settings.d/35-search.py similarity index 100% rename from prawokultury/settings.d/35-search.conf rename to prawokultury/settings.d/35-search.py diff --git a/prawokultury/settings.d/40-auth.conf b/prawokultury/settings.d/40-auth.py similarity index 100% rename from prawokultury/settings.d/40-auth.conf rename to prawokultury/settings.d/40-auth.py diff --git a/prawokultury/settings.d/40-context.conf b/prawokultury/settings.d/40-context.py similarity index 100% rename from prawokultury/settings.d/40-context.conf rename to prawokultury/settings.d/40-context.py diff --git a/prawokultury/settings.d/40-logging.conf b/prawokultury/settings.d/40-logging.py similarity index 100% rename from prawokultury/settings.d/40-logging.conf rename to prawokultury/settings.d/40-logging.py diff --git a/prawokultury/settings.d/40-middleware.conf b/prawokultury/settings.d/40-middleware.py similarity index 100% rename from prawokultury/settings.d/40-middleware.conf rename to prawokultury/settings.d/40-middleware.py diff --git a/prawokultury/settings.d/50-contrib.conf b/prawokultury/settings.d/50-contrib.py similarity index 100% rename from prawokultury/settings.d/50-contrib.conf rename to prawokultury/settings.d/50-contrib.py diff --git a/prawokultury/settings.d/50-static.conf b/prawokultury/settings.d/50-static.py similarity index 100% rename from prawokultury/settings.d/50-static.conf rename to prawokultury/settings.d/50-static.py diff --git a/prawokultury/settings.d/60-custom.conf b/prawokultury/settings.d/60-custom.conf deleted file mode 100644 index 0f84054..0000000 --- a/prawokultury/settings.d/60-custom.conf +++ /dev/null @@ -1 +0,0 @@ -MENU_MODULE = 'prawokultury.menu_items' diff --git a/prawokultury/settings.d/60-custom.py b/prawokultury/settings.d/60-custom.py new file mode 100644 index 0000000..984a852 --- /dev/null +++ b/prawokultury/settings.d/60-custom.py @@ -0,0 +1,11 @@ +from fnpdjango.utils.settings import LazyUGettextLazy as _ +from migdal.helpers import EntryType + +MIGDAL_TYPES = ( + EntryType('news', _('news'), commentable=True, on_main=True, + promotable=True, categorized=True), + EntryType('publications', _('publications')), + EntryType('info', _('info')), +) + +MENU_MODULE = 'prawokultury.menu_items' diff --git a/prawokultury/settings.py b/prawokultury/settings.py index fc41cb4..74b17be 100644 --- a/prawokultury/settings.py +++ b/prawokultury/settings.py @@ -1,7 +1,7 @@ import os.path import glob -conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.conf')) +conffiles = glob.glob(os.path.join(os.path.dirname(__file__), 'settings.d', '*.py')) conffiles.sort() for f in conffiles: execfile(os.path.abspath(f)) diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html index cae698b..1430cf9 100755 --- a/prawokultury/templates/base.html +++ b/prawokultury/templates/base.html @@ -9,6 +9,7 @@ {% compressed_css 'base' %} + diff --git a/requirements.txt b/requirements.txt index 5915d22..c9045f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ sorl-thumbnail>=11.09,<12 django-pagination -e git+git://github.com/fnp/fnpdjango.git@9a5b05c52311da4f726fec29d8be7d173f695352#egg=fnpdjango --e git+git://github.com/fnp/django-migdal.git@734cd58d3f12c5397b42c1ae122c947500386014#egg=django-migdal +-e git+git://github.com/fnp/django-migdal.git@fe16cac52a33bd593bc8916415dc939d32dfb8f3#egg=django-migdal textile django-markupfield -- 2.20.1