From 734cd58d3f12c5397b42c1ae122c947500386014 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Mon, 5 Nov 2012 10:53:16 +0100 Subject: [PATCH 1/1] initial commit --- .gitignore | 28 + LICENSE | 661 ++++++++++++++++++ migdal/__init__.py | 52 ++ migdal/admin.py | 102 +++ migdal/api.py | 28 + migdal/feeds.py | 56 ++ migdal/fields.py | 25 + migdal/forms.py | 61 ++ migdal/helpers.py | 16 + migdal/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 4626 bytes migdal/locale/pl/LC_MESSAGES/django.po | 317 +++++++++ migdal/migrations/0001_initial.py | 130 ++++ ...chg_field_entry_title_pl__chg_field_ent.py | 79 +++ .../0003_auto__add_field_category_taxonomy.py | 70 ++ ..._entry_slug_pl__chg_field_entry_slug_en.py | 74 ++ ...t__add_field_entry_published_at_pl__add.py | 99 +++ migdal/migrations/__init__.py | 0 migdal/models.py | 145 ++++ migdal/readme.md | 1 + migdal/search_indexes.py | 27 + migdal/templates/comments/form.html | 29 + .../templates/comments/migdal/entry/list.html | 26 + .../comments/migdal/entry/preview.html | 45 ++ .../email_followup_comment.html | 19 + .../email_followup_comment.txt | 15 + migdal/templates/migdal/categories.html | 7 + .../templates/migdal/entry/entry_begin.html | 33 + .../templates/migdal/entry/entry_detail.html | 52 ++ migdal/templates/migdal/entry/entry_list.html | 55 ++ .../migdal/entry/entry_promobox.html | 30 + .../templates/migdal/entry/entry_short.html | 38 + .../migdal/entry/info/entry_begin.html | 22 + .../entry/publications/entry_begin.html | 38 + migdal/templates/migdal/entry/submit.html | 26 + .../templates/migdal/entry/submit_thanks.html | 18 + migdal/templates/migdal/last_comments.html | 13 + .../migdal/mail/manager_new_entry.txt | 14 + migdal/templates/migdal/mail/new_comment.txt | 15 + migdal/templates/migdal/mail/published.txt | 11 + migdal/templates/search/search.html | 32 + migdal/templatetags/__init__.py | 0 migdal/templatetags/migdal_tags.py | 77 ++ migdal/tests.py | 16 + migdal/urls.py | 44 ++ migdal/views.py | 105 +++ setup.py | 35 + 46 files changed, 2786 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 migdal/__init__.py create mode 100644 migdal/admin.py create mode 100644 migdal/api.py create mode 100644 migdal/feeds.py create mode 100644 migdal/fields.py create mode 100644 migdal/forms.py create mode 100644 migdal/helpers.py create mode 100644 migdal/locale/pl/LC_MESSAGES/django.mo create mode 100644 migdal/locale/pl/LC_MESSAGES/django.po create mode 100644 migdal/migrations/0001_initial.py create mode 100644 migdal/migrations/0002_auto__chg_field_entry_slug_pl__chg_field_entry_title_pl__chg_field_ent.py create mode 100644 migdal/migrations/0003_auto__add_field_category_taxonomy.py create mode 100644 migdal/migrations/0004_auto__chg_field_entry_slug_pl__chg_field_entry_slug_en.py create mode 100644 migdal/migrations/0005_auto__add_field_entry_changed_at__add_field_entry_published_at_pl__add.py create mode 100644 migdal/migrations/__init__.py create mode 100644 migdal/models.py create mode 100644 migdal/readme.md create mode 100644 migdal/search_indexes.py create mode 100644 migdal/templates/comments/form.html create mode 100644 migdal/templates/comments/migdal/entry/list.html create mode 100644 migdal/templates/comments/migdal/entry/preview.html create mode 100644 migdal/templates/django_comments_xtd/email_followup_comment.html create mode 100644 migdal/templates/django_comments_xtd/email_followup_comment.txt create mode 100644 migdal/templates/migdal/categories.html create mode 100644 migdal/templates/migdal/entry/entry_begin.html create mode 100644 migdal/templates/migdal/entry/entry_detail.html create mode 100644 migdal/templates/migdal/entry/entry_list.html create mode 100644 migdal/templates/migdal/entry/entry_promobox.html create mode 100644 migdal/templates/migdal/entry/entry_short.html create mode 100644 migdal/templates/migdal/entry/info/entry_begin.html create mode 100644 migdal/templates/migdal/entry/publications/entry_begin.html create mode 100644 migdal/templates/migdal/entry/submit.html create mode 100644 migdal/templates/migdal/entry/submit_thanks.html create mode 100644 migdal/templates/migdal/last_comments.html create mode 100644 migdal/templates/migdal/mail/manager_new_entry.txt create mode 100644 migdal/templates/migdal/mail/new_comment.txt create mode 100644 migdal/templates/migdal/mail/published.txt create mode 100644 migdal/templates/search/search.html create mode 100644 migdal/templatetags/__init__.py create mode 100644 migdal/templatetags/migdal_tags.py create mode 100644 migdal/tests.py create mode 100644 migdal/urls.py create mode 100644 migdal/views.py create mode 100755 setup.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea2e8e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +*~ +*.orig +*.log + +# Python garbage +*.pyc +.coverage +pip-log.txt +nosetests.xml +build +dist +*.egg-info + +# Mac OS X garbage +.DS_Store + +# Windows garbage +thumbs.db + +# Eclipse +.project +.settings +.pydevproject +.tmp_* + +# Tags file +TAGS + diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2def0e8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/migdal/__init__.py b/migdal/__init__.py new file mode 100644 index 0000000..fe90406 --- /dev/null +++ b/migdal/__init__.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +""" +Migdal (מִגְדָּל) is a multilingual blog Django app. + +Author: Radek Czajka +""" +from django.conf import settings +from fnpdjango.utils.app import AppSettings +from django.utils.translation import ugettext_lazy as _ +from migdal.helpers import EntryType + + +class Settings(AppSettings): + # Types of entries: + # (slug, commentable, on main) + TYPES = ( + EntryType('news', _('news'), commentable=True, on_main=True, promotable=True), + EntryType('publications', _('publications')), + EntryType('info', _('info')), + ) + TYPE_SUBMIT = 'news' + TAXONOMIES = ( + ('topics', _('topics')), + ('types', _('types')), + ) + LAST_COMMENTS = 5 + + MAIN_PAGE_ENTRY = None + + TYPES_DICT = None + def _more_TYPES_DICT(self, value): + return dict((t.db, t) for t in self.TYPES) + + TYPES_ON_MAIN = None + def _more_TYPES_ON_MAIN(self, value): + return tuple(t.db for t in self.TYPES if t.on_main) + + TYPES_PROMOTABLE = None + def _more_TYPES_PROMOTABLE(self, value): + return tuple(t.db for t in self.TYPES if t.promotable) + + OBLIGATORY_LANGUAGES = None + def _more_OBLIGATORY_LANGUAGES(self, value): + return value or tuple(lang for lang in settings.LANGUAGES + if lang[0] == settings.LANGUAGE_CODE) + + OPTIONAL_LANGUAGES = None + def _more_OPTIONAL_LANGUAGES(self, value): + return tuple(lang for lang in settings.LANGUAGES + if lang not in self.OBLIGATORY_LANGUAGES) + +app_settings = Settings('MIGDAL') diff --git a/migdal/admin.py b/migdal/admin.py new file mode 100644 index 0000000..6bdfb59 --- /dev/null +++ b/migdal/admin.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.conf import settings +from django.contrib import admin +from django.utils.translation import ugettext_lazy as _ +from migdal.models import Entry, Attachment +from migdal import app_settings +from fnpdjango.utils.models import filtered_model +from fnpdjango.utils.models.translation import translated_fields + + +class AttachmentInline(admin.TabularInline): + model = Attachment + readonly_fields = ['url'] + + +def filtered_entry_admin(typ): + class EntryAdmin(admin.ModelAdmin): + def queryset(self, request): + return self.model.objects.filter(type=typ) + + def has_add_permission(self, request): + return request.user.has_perm('migdal.add_entry') + + def has_change_permission(self, request, obj=None): + return request.user.has_perm('migdal.change_entry') + + def has_delete_permission(self, request, obj=None): + return request.user.has_perm('migdal.delete_entry') + + date_hierarchy = 'date' + readonly_fields = ('date', 'changed_at') + \ + translated_fields(('published_at',)) + _promo_if_necessary = ('promo',) if typ.promotable else () + + fieldsets = ( + (None, { + 'fields': _promo_if_necessary + ( + 'author', 'author_email', 'image', 'date', 'changed_at') + }), + ) + tuple( + (ln, {'fields': ( + ('published_%s' % lc), + 'published_at_%s' % lc, + 'title_%s' % lc, + 'slug_%s' % lc, + 'lead_%s' % lc, + 'body_%s' % lc, + )}) + for lc, ln in app_settings.OBLIGATORY_LANGUAGES + ) + tuple( + (ln, {'fields': ( + ('needed_%s' % lc, 'published_%s' % lc), + 'published_at_%s' % lc, + 'title_%s' % lc, + 'slug_%s' % lc, + 'lead_%s' % lc, + 'body_%s' % lc, + )}) + for lc, ln in app_settings.OPTIONAL_LANGUAGES + ) + + if typ.categorized: + fieldsets += ( + (_('Categories'), {'fields': ('categories',)}), + ) + prepopulated_fields = dict([ + ("slug_%s" % lang_code, ("title_%s" % lang_code,)) + for lang_code, lang_name in settings.LANGUAGES + ]) + + list_display = translated_fields(('title',), + app_settings.OBLIGATORY_LANGUAGES) + \ + ('date', 'author') + \ + _promo_if_necessary + \ + translated_fields(('published_at',)) + \ + translated_fields(('needed',), app_settings.OPTIONAL_LANGUAGES) + list_filter = _promo_if_necessary + \ + translated_fields(('published',)) + \ + translated_fields(('needed',), app_settings.OPTIONAL_LANGUAGES) + inlines = (AttachmentInline,) + search_fields = ('title_pl', 'title_en') + return EntryAdmin + + +for typ in app_settings.TYPES: + newmodel = filtered_model("Entry_%s" % typ.db, Entry, 'type', typ.db, typ.slug) + admin.site.register(newmodel, filtered_entry_admin(typ)) + + +if app_settings.TAXONOMIES: + from migdal.models import Category + + class CategoryAdmin(admin.ModelAdmin): + list_display = translated_fields(('title', 'slug')) + ('taxonomy',) + prepopulated_fields = dict([ + ("slug_%s" % lang_code, ("title_%s" % lang_code,)) + for lang_code, lang_name in settings.LANGUAGES + ]) + admin.site.register(Category, CategoryAdmin) diff --git a/migdal/api.py b/migdal/api.py new file mode 100644 index 0000000..d4f031e --- /dev/null +++ b/migdal/api.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from itertools import chain +from migdal.models import Entry +from migdal import app_settings +from django.utils.translation import get_language + + +def entry_list(entry_type=None, category=None, promobox=False): + lang = get_language() + object_list = Entry.objects.filter(**{"published_%s" % lang: True} + ).order_by('-published_at_%s' % lang) + if entry_type: + object_list = object_list.filter(type=entry_type.db) + else: + object_list = object_list.filter( + type__in=[t.db for t in app_settings.TYPES if t.on_main]) + if category: + object_list = object_list.filter(categories=category) + + if promobox: + promo = list(object_list.filter(promo=True)[:promobox]) + #object_list = object_list.exclude(pk__in=[p.pk for p in promo]) + object_list.promobox = promo + + return object_list diff --git a/migdal/feeds.py b/migdal/feeds.py new file mode 100644 index 0000000..33e9e0b --- /dev/null +++ b/migdal/feeds.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.contrib.syndication.views import Feed +from django.core.urlresolvers import reverse +from django.shortcuts import get_object_or_404 +from django.utils.translation import ugettext as _, string_concat +from migdal import api +from migdal.models import Category +from migdal import app_settings + + +class EntriesFeed(Feed): + def get_object(self, request, type_db=None, category_slug=None): + lang = request.LANGUAGE_CODE + if category_slug: + category = get_object_or_404(Category, **{'slug_%s' % lang: category_slug}) + else: + category = None + if type_db: + entry_type = app_settings.TYPES_DICT[type_db] + else: + entry_type = None + return {'entry_type': entry_type, 'category': category} + + def title(self, obj): + t = "Prawo kultury, " + _("latest") + " " + if obj['entry_type']: + t += unicode(obj['entry_type'].slug) + else: + t += _("entries") + if obj['category']: + t += " " + _("in category") + " " + obj['category'].title + return t + + def link(self, obj): + if obj['category']: + return reverse('migdal_category', args=[obj['category'].slug]) + if obj['entry_type']: + return reverse('migdal_entry_list_%s' % obj['entry_type'].db) + return reverse('migdal_main') + + def items(self, obj): + return api.entry_list(**obj) + + def item_title(self, item): + return item.title + + def item_description(self, item): + return item.lead + image = item.image.url if item.image else "/static/img/square-logo.png" + return string_concat("" % image, item.lead) + + def item_pubdate(self, item): + return item.published_at diff --git a/migdal/fields.py b/migdal/fields.py new file mode 100644 index 0000000..843c44e --- /dev/null +++ b/migdal/fields.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.db import models + +class SlugNullField(models.SlugField): + description = "SlugField that stores NULL instead of blank value." + + def to_python(self, value, **kwargs): + value = super(SlugNullField, self).to_python(value, **kwargs) + return value if value is not None else u"" + + def get_prep_value(self, value, **kwargs): + value = super(SlugNullField, self).get_prep_value(value, **kwargs) + return value or None + + +try: + # check for south + from south.modelsinspector import add_introspection_rules +except ImportError: + pass +else: + add_introspection_rules([], ["^migdal\.fields\.SlugNullField"]) diff --git a/migdal/forms.py b/migdal/forms.py new file mode 100644 index 0000000..e7d6394 --- /dev/null +++ b/migdal/forms.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django import forms +from django.utils.translation import ugettext_lazy as _, get_language +from migdal.models import Entry +from migdal import app_settings +from fnpdjango.utils.text import slughifi +from django.core.mail import mail_managers +from django import template + + +def get_submit_form(*args, **kwargs): + lang = get_language() + + class SubmitForm(forms.ModelForm): + class Meta: + model = Entry + fields = ['title_%s' % lang, 'lead_%s' % lang, + 'author', 'author_email', 'categories'] + required = ['title_%s' % lang] + + def __init__(self, *args, **kwargs): + super(SubmitForm, self).__init__(*args, **kwargs) + title = self.fields['title_%s' % lang] + title.required = True + title.label = _('Title') + lead = self.fields['lead_%s' % lang] + lead.required = True + lead.label = _('Content') + + def clean(self): + data = super(SubmitForm, self).clean() + data['type'] = app_settings.TYPE_SUBMIT + orig_slug = slughifi(data.get('title_%s' % lang, '')) + slug = orig_slug + number = 2 + while Entry.objects.filter(**{'slug_%s' % lang: slug}).exists(): + slug = "%s-%s" % (orig_slug, number) + number += 1 + data['slug_%s' % lang] = slug + self.cleaned_data = data + return data + + def save(self, *args, **kwargs): + entry = super(SubmitForm, self).save(commit=False) + # Something's wrong with markup fields, they choke on None here. + for f in 'lead_en', 'lead_pl', 'body_en', 'body_pl': + if getattr(entry, f) is None: + setattr(entry, f, '') + for f in 'slug_%s' % lang, 'type': + setattr(entry, f, self.cleaned_data[f]) + entry.save() + entry = super(SubmitForm, self).save(*args, **kwargs) + mail_managers(u"Nowy wpis", + template.loader.get_template( + 'migdal/mail/manager_new_entry.txt').render( + template.Context({'object': entry}))) + + return SubmitForm(*args, **kwargs) \ No newline at end of file diff --git a/migdal/helpers.py b/migdal/helpers.py new file mode 100644 index 0000000..8c06c16 --- /dev/null +++ b/migdal/helpers.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +class EntryType(object): + def __init__(self, db, slug, commentable=False, on_main=False, + promotable=False, categorized=False): + self.db = db + self.slug = slug + self.commentable = commentable + self.on_main = on_main + self.promotable = promotable + self.categorized = categorized + + def __unicode__(self): + return unicode(self.slug) diff --git a/migdal/locale/pl/LC_MESSAGES/django.mo b/migdal/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..f222f82b6cc76ad91447767f4f23d0adac30bb3e GIT binary patch literal 4626 zcmbW3UyK_^9mj{J<&PUEgcJz0<(JUQ<;dA*Us4FpT|#n6L>h8AB@Q8PjJ;!f?DdYj zGkcr0f{3Dq@&HmP;vp&sA=Eb>DwU_wiig}iR01jx4+s^6KnQ^%As#CAfl7RTyR*I{ z0wEZA_A@iPGxPg5^Yia^-T!TYavb#$)ZO<9aTVNoKOQLK2ZZQNA%h<%=O;3v?pgC77};CsL>$ls4a{6vDsZt%R`X?a7A@FnH`@!qr!{9f-8Sn=nR1vR%_=(r?I0gP1d;)wF zLOc#$0(re_An*GXkmdS1$ohU0{u0xF2NyCtwYH8DzWs1%#^NZy>M#HpucnfM8`l1ae&M0eQa#kmnr- z+25x_tX@cplXY@cU+|9Rhk0c1U11bP2gL6}DT z3}iju@cbjl^Z)AmZ+ia2bH}biz6uDp=d$wr{is}^cE0Xj@GuXc@VVVy9z%zH#f5d` z{XT}u@|9%<4fX@ulndLaj(P<3AZiu$GpJnHu18V%JnliALoLgP(b$Lj5!Br7;5_Q5 zP`NZw`7Yx-f(!eUP-jug@^Lg4Q5&d_qkbBd3;Tn8P!^adzY~x70rm^W)DGWge8{&S z^~CilmQZ2N{NCc2T85$?;P}@Ff zM@bZ@m|P#@Djr!fUG7wtB=uv}U7qbbH*PL0bYdl)URND68kxw}Ox#-tbw@>3*@bpi zwQ}K5t-dgOY{h>_E5(;|!ns(t6Q@m7z0{Ynq7$JWs-*>atkPw9{4zCBY4v3^%q8ub zc)KdDuPsF?Ei{^k+_RQasdGK~+mV455YR-m%Gqwd#5gwVI#2=0h}1~xaGp{%8-}DK z%or60X`94R2ix|P#fxHL>!eF;MMeR!x+-$ERuMA?I&-!h_}88lCxYp>VnsUDGqF~- zY-WOu!Rw$AIW)v66De_eJs(?D3UZ27=;!zIUV+bGhTMtL(TuH$RYS3|N$4zf4O~|f zYsSJ1a0$1ZSc}!VR%uDrGA>sYYwY$;ZYF$Q!~hHgArL0EZ;~*ezFb!vI$_ddgTyLS z>oRf_!bXYgDLOD?=W61Tl5wYB3L`E-NGMF~UhfMP%#%f^g-TjQZB-d#V{Da&BKx7O zC^AlWHAG1J${XK@rh;mh@>uqOOxpq=4@X5SutX9o1j9w$>pM!d>r-O)mUE^vL>^jf zwC!<)QN&fDeqY*X)k^sqh2i6rIRs2HXy6;C=BFXRufmZ z0s`{hE3A(ZnYg}*MS&vpMcV|Kz%pfE`XSTxMYIK+5vS+7pfvHfzGTPz1IkN`mxD`E2> z6UCh-U^f$)Q6?N;6IQs~EzXQ}2c2vTdDmhyP#sr28&tobVvA$Zq+o!^HPw;s1u~?1 ztx>tC#wK>v^R}mh>dB;Mt1Z){%G!liwYa@-Q=NidO-eyG5sLBh|M9y9zWcniuG)%aWML%}H|e4b)R0ytaxj#%6wAQiOZ1D}mdYC02T zBRMvq9ZJ4qYvb@3)+vr&wWZ{!NoQ8qXsL_CFFOPI-)A*x&G2PkIe+&2=`FJ~YW0f0 zjH)dduZjErnp;2|>gXt6iLq5~`Eu(_^~lzDtV>tL)zeYO1jsQ>I?~pzvKA(>46A2w zt=c9<~4y9vl=V{WD!9>~#S-o+aA~`_R7iW41 zljTE59&r+(+o#loks1_Ps58+2Z{`bdIlx>0CIMcaL^9I2R1*Y&b*ZF3-1ru)N^%*t zw{pao%EPw=QsJoyWFIC2HOgorDS(E&24aMjVLg+1&e(E7h#7>FiJ+;!ds)dEJ*hUI z4>gT>sv#NRW+GKBGGTk;b}-Sr_zK&oNQowu_}q!j z%qPQXU)?*9A>F}4TdRn3CS|6<&`YJ_A1g6iO!+b z#^9<+v#nKGRcfV1k8%U45nIH%*s$d|d!CHtkkTyD!#gjf$S)3tNi~idR%crcuyoK1 zH*N*f#@6cCmop}ZkP;X2i);vsMOnTX_D(hSiD;zN#xq6!Ovwa1u7U_M!6}n$nD_*G zg~ia2#!ix<#yU{!3fziBym71WBd@M%bQ1DxzDymh;&G_cY@S&EY{U`HtK%BMo~+}x zDA%>APKE8EX(1`XCcX1gJfXE%riRYtDKsNQ5)3wh$wqpw_t$iexF;MZz0I4(vNzx> z=*;m*EWrf-LFDF58YnwKT$0&lCnVC$C7UTIey70>8O`Ke~7_J&_-jpyE?neLb z^M6gR$g7*LWVusZ77meFaaQ13xBw}fS1wbmL{P)_8Fu91Ejw;L4LM<;L7`Ns&~`=c z4XgZMi{fY%r(6o>BX~Fs^s*&IfE-V3C1`^iLYl&P2zV_z wlg!}+r?@RTY9Kgh, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: django-migdal 0.1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-10-04 12:58+0200\n" +"PO-Revision-Date: 2012-10-04 12:58+0100\n" +"Last-Translator: Radek Czajka \n" +"Language-Team: FNP \n" +"Language: Polish\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" + +#: __init__.py:17 +msgid "news" +msgstr "newsy" + +#: __init__.py:18 +msgid "publications" +msgstr "publikacje" + +#: __init__.py:19 +msgid "info" +msgstr "info" + +#: __init__.py:23 +msgid "topics" +msgstr "tematy" + +#: __init__.py:24 +msgid "types" +msgstr "rodzaje" + +#: admin.py:44 +msgid "Categories" +msgstr "Kategorie" + +#: feeds.py:28 +msgid "latest" +msgstr "ostatnie" + +#: feeds.py:32 +#: models.py:56 +msgid "entries" +msgstr "wpisy" + +#: feeds.py:34 +msgid "in category" +msgstr "w kategorii" + +#: forms.py:28 +msgid "Title" +msgstr "Tytuł" + +#: forms.py:31 +msgid "Content" +msgstr "Treść" + +#: models.py:20 +msgid "taxonomy" +msgstr "taksonomia" + +#: models.py:24 +msgid "category" +msgstr "kategoria" + +#: models.py:25 +#: models.py:52 +#: urls.py:41 +#: urls.py:43 +msgid "categories" +msgstr "kategorie" + +#: models.py:45 +msgid "created at" +msgstr "data utworzenia" + +#: models.py:46 +msgid "changed at" +msgstr "data ostatniej zmiany" + +#: models.py:47 +msgid "author" +msgstr "autor" + +#: models.py:48 +msgid "author email" +msgstr "e-mail autora" + +#: models.py:49 +msgid "Used only to display gravatar and send notifications." +msgstr "Używany tylko do wyświetlenia gravatara i wysyłania powiadomień." + +#: models.py:50 +msgid "image" +msgstr "obrazek" + +#: models.py:51 +msgid "promoted" +msgstr "promowane" + +#: models.py:55 +msgid "entry" +msgstr "wpis" + +#: models.py:80 +#, python-format +msgid "Published entry should have a slug in relevant language (%s)." +msgstr "Opublikowany wpis powinien mieć slug w odpowiednim języku (%s)." + +#: models.py:99 +#, python-format +msgid "Your story has been published at %s." +msgstr "Twój wpis został opublikowany na stronie %s." + +#: models.py:105 +msgid "needed" +msgstr "potrzebne" + +#: models.py:106 +msgid "Unneeded" +msgstr "Niepotrzebne" + +#: models.py:106 +msgid "Needed" +msgstr "Potrzebne" + +#: models.py:106 +msgid "Done" +msgstr "Ukończone" + +#: models.py:112 +msgid "title" +msgstr "tytuł" + +#: models.py:113 +msgid "lead" +msgstr "lead" + +#: models.py:114 +#: models.py:116 +msgid "Use Textile syntax." +msgstr "Włączona składnia Textile." + +#: models.py:115 +msgid "body" +msgstr "treść" + +#: models.py:117 +msgid "published" +msgstr "opublikowane" + +#: models.py:118 +msgid "published at" +msgstr "data publikacji" + +#: models.py:123 +msgid "file" +msgstr "plik" + +#: models.py:141 +#, python-format +msgid "New comment under your story at %s." +msgstr "Nowy komentarz pod Twoim wpisem na stronie %s." + +#: urls.py:38 +#: urls.py:39 +msgid "submit" +msgstr "wyslij" + +#: urls.py:39 +msgid "thanks" +msgstr "dzieki" + +#: urls.py:45 +msgid "search" +msgstr "szukaj" + +#: templates/comments/form.html:3 +msgid "Add comment" +msgstr "Dodaj komentarz" + +#: templates/comments/form.html:24 +msgid "Post" +msgstr "Wyślij" + +#: templates/comments/form.html:25 +msgid "Preview" +msgstr "Podgląd" + +#: templates/comments/migdal/entry/list.html:5 +msgid "Comments" +msgstr "Komentarze" + +#: templates/comments/migdal/entry/preview.html:26 +msgid "Preview your comment" +msgstr "Podgląd komentarza" + +#: templates/migdal/entry/entry_detail.html:27 +msgid "This entry hasn't been published yet." +msgstr "Ten wpis nie został jeszcze opublikowany." + +#: templates/migdal/entry/entry_list.html:22 +msgid "Category" +msgstr "Kategoria" + +#: templates/migdal/entry/entry_list.html:55 +msgid "Submit a new story, create Culture's Right with us!" +msgstr "Dodaj nowy wpis, twórz Prawo Kultury razem z nami!" + +#: templates/migdal/entry/entry_short.html:19 +#, python-format +msgid "%(c)s comment" +msgid_plural "%(c)s comments" +msgstr[0] "%(c)s komentarz" +msgstr[1] "%(c)s komentarze" +msgstr[2] "%(c)s komentarzy" + +#: templates/migdal/entry/entry_short.html:24 +msgid "read more" +msgstr "czytaj więcej" + +#: templates/migdal/entry/submit.html:7 +msgid "Submit new story" +msgstr "Dodaj nowy wpis" + +#: templates/migdal/entry/submit.html:9 +msgid "" +"\n" +"By submitting a story here, you agree to publish it under the terms of the\n" +"Creative Commons Attribution-Share Alike\n" +"free license." +msgstr "" +"\n" +"Dodając wpis, zgadzasz się najego publikację na warunkach wolnej licencji\n" +"Creative Commons Uznanie autorstwa – Na tych samych warunkach." + +#: templates/migdal/entry/submit.html:14 +msgid "" +"Stories are moderated, so please be\n" +"patient, you'll be notified when it's published." +msgstr "Wpisy są moderowane. Bądź cierpliwy, otrzymasz powiadomienie o publikacji." + +#: templates/migdal/entry/submit.html:21 +msgid "Submit" +msgstr "Wyślij" + +#: templates/migdal/entry/submit_thanks.html:6 +msgid "Thanks for submitting" +msgstr "Dziękujemy za zgłoszenie" + +#: templates/migdal/entry/submit_thanks.html:9 +msgid "" +"\n" +"Thank you for submitting this new story, it's waiting for moderation.\n" +"If you provided an email, we'll inform you about changes in it's status\n" +"and comments.\n" +msgstr "" +"\n" +"Dziękujemy za dodanie nowego wpisu, teraz czeka on na moderację. Jeśli podano adres e-mail, będziemy Cię informowali o zmianach statusu i komentarzach\n" + +#: templates/search/search.html:9 +msgid "Search results" +msgstr "Wyniki wyszukiwania" + +#: templates/search/search.html:18 +msgid "No results found." +msgstr "Brak wyników." + +#: templates/search/search.html:25 +msgid "previous" +msgstr "poprzednie" + +#: templates/search/search.html:28 +msgid "next" +msgstr "następne" + +#: templatetags/migdal_tags.py:128 +msgid "Publications" +msgstr "Publikacje" + +#: templatetags/migdal_tags.py:129 +msgid "Events" +msgstr "Wydarzenia" + +#: templatetags/migdal_tags.py:131 +msgid "Positions" +msgstr "Stanowiska" + +#~ msgid "Please correct the error below" + +#~ msgid_plural "Please correct the errors below" +#~ msgstr[0] "Proszę poprawić poniższy błąd" +#~ msgstr[1] "Proszę poprawić poniższe błędy" +#~ msgstr[2] "Proszę poprawić poniższe błędy" + +#~ msgid "and" +#~ msgstr "i" + +#~ msgid "Post your comment" +#~ msgstr "Wyślij komentarz" + +#~ msgid "or make changes" +#~ msgstr "lub zmień" + +#~ msgid "Latest news" +#~ msgstr "Ostatnie newsy" + +#~ msgid "Submit a new story." +#~ msgstr "Przyślij nowego newsa." diff --git a/migdal/migrations/0001_initial.py b/migdal/migrations/0001_initial.py new file mode 100644 index 0000000..3af9e00 --- /dev/null +++ b/migdal/migrations/0001_initial.py @@ -0,0 +1,130 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'Category' + db.create_table('migdal_category', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('slug_pl', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50)), + ('slug_en', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50)), + ('title_pl', self.gf('django.db.models.fields.CharField')(unique=True, max_length=64, db_index=True)), + ('title_en', self.gf('django.db.models.fields.CharField')(unique=True, max_length=64, db_index=True)), + )) + db.send_create_signal('migdal', ['Category']) + + # Adding model 'Entry' + db.create_table('migdal_entry', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('type', self.gf('django.db.models.fields.CharField')(max_length=16, db_index=True)), + ('date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, db_index=True, blank=True)), + ('author', self.gf('django.db.models.fields.CharField')(max_length=128)), + ('author_email', self.gf('django.db.models.fields.EmailField')(max_length=128, null=True, blank=True)), + ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)), + ('promo', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('slug_pl', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50)), + ('title_pl', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('lead_pl', self.gf('markupfield.fields.MarkupField')(rendered_field=True)), + ('lead_pl_markup_type', self.gf('django.db.models.fields.CharField')(default='textile_pl', max_length=30)), + ('_lead_pl_rendered', self.gf('django.db.models.fields.TextField')()), + ('slug_en', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True, null=True, blank=True)), + ('title_en', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), + ('lead_en', self.gf('markupfield.fields.MarkupField')(null=True, rendered_field=True, blank=True)), + ('needed_en', self.gf('django.db.models.fields.CharField')(default='n', max_length=1, db_index=True)), + ('lead_en_markup_type', self.gf('django.db.models.fields.CharField')(default='textile_pl', max_length=30, blank=True)), + ('_lead_en_rendered', self.gf('django.db.models.fields.TextField')()), + ('body_pl', self.gf('markupfield.fields.MarkupField')(null=True, rendered_field=True, blank=True)), + ('body_en', self.gf('markupfield.fields.MarkupField')(null=True, rendered_field=True, blank=True)), + ('body_pl_markup_type', self.gf('django.db.models.fields.CharField')(default='textile_pl', max_length=30, blank=True)), + ('body_en_markup_type', self.gf('django.db.models.fields.CharField')(default='textile_pl', max_length=30, blank=True)), + ('published_pl', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('published_en', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('_body_pl_rendered', self.gf('django.db.models.fields.TextField')()), + ('_body_en_rendered', self.gf('django.db.models.fields.TextField')()), + )) + db.send_create_signal('migdal', ['Entry']) + + # Adding M2M table for field categories on 'Entry' + db.create_table('migdal_entry_categories', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('entry', models.ForeignKey(orm['migdal.entry'], null=False)), + ('category', models.ForeignKey(orm['migdal.category'], null=False)) + )) + db.create_unique('migdal_entry_categories', ['entry_id', 'category_id']) + + # Adding model 'Attachment' + db.create_table('migdal_attachment', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=100)), + ('entry', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['migdal.Entry'])), + )) + db.send_create_signal('migdal', ['Attachment']) + + + def backwards(self, orm): + # Deleting model 'Category' + db.delete_table('migdal_category') + + # Deleting model 'Entry' + db.delete_table('migdal_entry') + + # Removing M2M table for field categories on 'Entry' + db.delete_table('migdal_entry_categories') + + # Deleting model 'Attachment' + db.delete_table('migdal_attachment') + + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/migrations/0002_auto__chg_field_entry_slug_pl__chg_field_entry_title_pl__chg_field_ent.py b/migdal/migrations/0002_auto__chg_field_entry_slug_pl__chg_field_entry_title_pl__chg_field_ent.py new file mode 100644 index 0000000..1caced4 --- /dev/null +++ b/migdal/migrations/0002_auto__chg_field_entry_slug_pl__chg_field_entry_title_pl__chg_field_ent.py @@ -0,0 +1,79 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'Entry.slug_pl' + db.alter_column('migdal_entry', 'slug_pl', self.gf('django.db.models.fields.SlugField')(max_length=50, unique=True, null=True)) + + # Changing field 'Entry.title_pl' + db.alter_column('migdal_entry', 'title_pl', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) + + # Changing field 'Entry.lead_pl' + db.alter_column('migdal_entry', 'lead_pl', self.gf('markupfield.fields.MarkupField')(null=True, rendered_field=True)) + + def backwards(self, orm): + + # Changing field 'Entry.slug_pl' + db.alter_column('migdal_entry', 'slug_pl', self.gf('django.db.models.fields.SlugField')(default='', max_length=50, unique=True)) + + # Changing field 'Entry.title_pl' + db.alter_column('migdal_entry', 'title_pl', self.gf('django.db.models.fields.CharField')(default='', max_length=255)) + + # Changing field 'Entry.lead_pl' + db.alter_column('migdal_entry', 'lead_pl', self.gf('markupfield.fields.MarkupField')(default='', rendered_field=True)) + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/migrations/0003_auto__add_field_category_taxonomy.py b/migdal/migrations/0003_auto__add_field_category_taxonomy.py new file mode 100644 index 0000000..7368441 --- /dev/null +++ b/migdal/migrations/0003_auto__add_field_category_taxonomy.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Category.taxonomy' + db.add_column('migdal_category', 'taxonomy', + self.gf('django.db.models.fields.CharField')(default='topics', max_length=32), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Category.taxonomy' + db.delete_column('migdal_category', 'taxonomy') + + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'taxonomy': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/migrations/0004_auto__chg_field_entry_slug_pl__chg_field_entry_slug_en.py b/migdal/migrations/0004_auto__chg_field_entry_slug_pl__chg_field_entry_slug_en.py new file mode 100644 index 0000000..a546e52 --- /dev/null +++ b/migdal/migrations/0004_auto__chg_field_entry_slug_pl__chg_field_entry_slug_en.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'Entry.slug_pl' + db.alter_column('migdal_entry', 'slug_pl', self.gf('migdal.fields.SlugNullField')(max_length=50, unique=True, null=True)) + + # Changing field 'Entry.slug_en' + db.alter_column('migdal_entry', 'slug_en', self.gf('migdal.fields.SlugNullField')(max_length=50, unique=True, null=True)) + + def backwards(self, orm): + + # Changing field 'Entry.slug_pl' + db.alter_column('migdal_entry', 'slug_pl', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50, null=True)) + + # Changing field 'Entry.slug_en' + db.alter_column('migdal_entry', 'slug_en', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50, null=True)) + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'taxonomy': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/migrations/0005_auto__add_field_entry_changed_at__add_field_entry_published_at_pl__add.py b/migdal/migrations/0005_auto__add_field_entry_changed_at__add_field_entry_published_at_pl__add.py new file mode 100644 index 0000000..f8e8ee8 --- /dev/null +++ b/migdal/migrations/0005_auto__add_field_entry_changed_at__add_field_entry_published_at_pl__add.py @@ -0,0 +1,99 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Entry.changed_at' + db.add_column('migdal_entry', 'changed_at', + self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=datetime.datetime(2000, 1, 1, 0, 0), db_index=True, blank=True), + keep_default=False) + + # Adding field 'Entry.published_at_pl' + db.add_column('migdal_entry', 'published_at_pl', + self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), + keep_default=False) + + # Adding field 'Entry.published_at_en' + db.add_column('migdal_entry', 'published_at_en', + self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True), + keep_default=False) + + if not db.dry_run: + for entry in orm['migdal.Entry'].objects.all(): + update_info = {} + if entry.published_pl: + update_info['published_at_pl'] = entry.date + if entry.published_en: + update_info['published_at_en'] = entry.date + update_info['changed_at'] = entry.date + orm['migdal.Entry'].objects.filter(pk=entry.pk).update(**update_info) + + + def backwards(self, orm): + # Deleting field 'Entry.changed_at' + db.delete_column('migdal_entry', 'changed_at') + + # Deleting field 'Entry.published_at_pl' + db.delete_column('migdal_entry', 'published_at_pl') + + # Deleting field 'Entry.published_at_en' + db.delete_column('migdal_entry', 'published_at_en') + + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'taxonomy': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'changed_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_at_en': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'published_at_pl': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/migrations/__init__.py b/migdal/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/migdal/models.py b/migdal/models.py new file mode 100644 index 0000000..54091e4 --- /dev/null +++ b/migdal/models.py @@ -0,0 +1,145 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from datetime import datetime +from django.conf import settings +from django.contrib.sites.models import Site +from django.core.exceptions import ValidationError +from django.core.mail import send_mail +from django.db import models +from django.template import loader, Context +from django.utils.translation import get_language, ugettext_lazy as _, ugettext +from django_comments_xtd.models import XtdComment +from markupfield.fields import MarkupField +from migdal import app_settings +from fnpdjango.utils.models.translation import add_translatable +from migdal.fields import SlugNullField + +class Category(models.Model): + taxonomy = models.CharField(_('taxonomy'), max_length=32, + choices=app_settings.TAXONOMIES) + + class Meta: + verbose_name = _('category') + verbose_name_plural = _('categories') + + def __unicode__(self): + return self.title + + @models.permalink + def get_absolute_url(self): + return ('migdal_category', [self.slug]) + + +add_translatable(Category, { + 'title': models.CharField(max_length=64, unique=True, db_index=True), + 'slug': models.SlugField(unique=True, db_index=True), +}) + + +class Entry(models.Model): + type = models.CharField(max_length=16, + choices=((t.db, t.slug) for t in app_settings.TYPES), + db_index=True) + date = models.DateTimeField(_('created at'), auto_now_add=True, db_index=True) + changed_at = models.DateTimeField(_('changed at'), auto_now=True, db_index=True) + author = models.CharField(_('author'), max_length=128) + author_email = models.EmailField(_('author email'), max_length=128, null=True, blank=True, + help_text=_('Used only to display gravatar and send notifications.')) + image = models.ImageField(_('image'), upload_to='entry/image/', null=True, blank=True) + promo = models.BooleanField(_('promoted'), default=False) + categories = models.ManyToManyField(Category, null=True, blank=True, verbose_name=_('categories')) + + class Meta: + verbose_name = _('entry') + verbose_name_plural = _('entries') + ordering = ['-date'] + + def __unicode__(self): + return self.title + + def save(self, *args, **kwargs): + if self.pk is not None: + orig = type(self).objects.get(pk=self.pk) + published_now = False + for lc, ln in settings.LANGUAGES: + if (getattr(self, "published_%s" % lc) + and getattr(self, "published_at_%s" % lc) is None): + setattr(self, "published_at_%s" % lc, datetime.now()) + published_now = True + if published_now: + self.notify_author_published() + super(Entry, self).save(*args, **kwargs) + + def clean(self): + for lc, ln in settings.LANGUAGES: + if (getattr(self, "published_%s" % lc) and + not getattr(self, "slug_%s" % lc)): + raise ValidationError( + ugettext("Published entry should have a slug in relevant language (%s).") % lc) + + @models.permalink + def get_absolute_url(self): + return ('migdal_entry_%s' % self.type, [self.slug]) + + def get_type(self): + return dict(app_settings.TYPES_DICT)[self.type] + + def notify_author_published(self): + if not self.author_email: + return + site = Site.objects.get_current() + mail_text = loader.get_template('migdal/mail/published.txt').render( + Context({ + 'entry': self, + 'site': site, + })) + send_mail( + ugettext(u'Your story has been published at %s.') % site.domain, + mail_text, settings.SERVER_EMAIL, [self.author_email] + ) + + +add_translatable(Entry, languages=app_settings.OPTIONAL_LANGUAGES, fields={ + 'needed': models.CharField(_('needed'), max_length=1, db_index=True, choices=( + ('n', _('Unneeded')), ('w', _('Needed')), ('y', _('Done'))), + default='n'), +}) + +add_translatable(Entry, { + 'slug': SlugNullField(unique=True, db_index=True, null=True, blank=True), + 'title': models.CharField(_('title'), max_length=255, null=True, blank=True), + 'lead': MarkupField(_('lead'), markup_type='textile_pl', null=True, blank=True, + help_text=_('Use Textile syntax.')), + 'body': MarkupField(_('body'), markup_type='textile_pl', null=True, blank=True, + help_text=_('Use Textile syntax.')), + 'published': models.BooleanField(_('published'), default=False), + 'published_at': models.DateTimeField(_('published at'), null=True, blank=True), +}) + + +class Attachment(models.Model): + file = models.FileField(_('file'), upload_to='entry/attach/') + entry = models.ForeignKey(Entry) + + def url(self): + return self.file.url if self.file else '' + + + +def notify_new_comment(sender, instance, created, **kwargs): + if (created and isinstance(instance.content_object, Entry) and + instance.content_object.author_email): + site = Site.objects.get_current() + mail_text = loader.get_template('migdal/mail/new_comment.txt').render( + Context({ + 'comment': instance, + 'site': site, + })) + send_mail( + ugettext(u'New comment under your story at %s.') % site.domain, + mail_text, settings.SERVER_EMAIL, + [instance.content_object.author_email] + ) +models.signals.post_save.connect(notify_new_comment, sender=XtdComment) \ No newline at end of file diff --git a/migdal/readme.md b/migdal/readme.md new file mode 100644 index 0000000..c125966 --- /dev/null +++ b/migdal/readme.md @@ -0,0 +1 @@ +Why not LocaleMiddleware? (consistent lang, url to lang) diff --git a/migdal/search_indexes.py b/migdal/search_indexes.py new file mode 100644 index 0000000..27169f3 --- /dev/null +++ b/migdal/search_indexes.py @@ -0,0 +1,27 @@ +import datetime +from django.conf import settings +from haystack import indexes +from fnpdjango.utils.models.translation import add_translatable_index +from migdal.models import Entry + + +class EntryIndex(indexes.RealTimeSearchIndex, indexes.Indexable): + date = indexes.DateTimeField(indexed=True, model_attr="date") + author = indexes.CharField(model_attr="author") + + def get_model(self): + return Entry + + def index_queryset(self): + """Used when the entire index for model is updated.""" + return self.get_model().objects.all() # filter(date__lte=datetime.datetime.now()) + + +add_translatable_index(EntryIndex, { + 'title': indexes.CharField(null=True), + 'lead': indexes.CharField(null=True), + 'body': indexes.CharField(null=True) + }) + + +getattr(EntryIndex, "body_%s" % settings.LANGUAGE_CODE).document = True diff --git a/migdal/templates/comments/form.html b/migdal/templates/comments/form.html new file mode 100644 index 0000000..341750f --- /dev/null +++ b/migdal/templates/comments/form.html @@ -0,0 +1,29 @@ +{% load comments i18n %} +
+

{% trans "Add comment" %}

+
{% csrf_token %} + {% if next %}{% endif %} + {% for field in form %} + {% if field.is_hidden %} + {{ field }} + {% endif %} + {% endfor %} + + {% for field in form %} + {% if not field.is_hidden %} + + + {% endif %} + {% endfor %} + +
{{ field.label_tag }} + + {% if field.errors %}

{{ field.errors }}

{% endif %} + {{ field }} +
+ + +
+
+
diff --git a/migdal/templates/comments/migdal/entry/list.html b/migdal/templates/comments/migdal/entry/list.html new file mode 100644 index 0000000..59510ee --- /dev/null +++ b/migdal/templates/comments/migdal/entry/list.html @@ -0,0 +1,26 @@ +{% load i18n %} +{% load gravatar %} +{% load fnp_markup %} + +

{% trans "Comments" %}

+
+ {% for comment in comment_list %} +
+ Avatar +
+
+ {% if comment.url %} + + {% endif %} + {{ comment.name }} + {% if comment.url %} + + {% endif %} +
+
{{ comment.submit_date }}
+
+
{{ comment.comment|textile_restricted_pl }}
+
+ {% endfor %} +
+
\ No newline at end of file diff --git a/migdal/templates/comments/migdal/entry/preview.html b/migdal/templates/comments/migdal/entry/preview.html new file mode 100644 index 0000000..ae3eb92 --- /dev/null +++ b/migdal/templates/comments/migdal/entry/preview.html @@ -0,0 +1,45 @@ +{% extends "base.html" %} +{% load comments gravatar i18n %} +{% load migdal_tags fnp_markup %} + + +{% block "main_menu" %} + {% main_menu 'object' entry %} +{% endblock "main_menu" %} + + +{% block "body" %} + +
+
+ +{% entry_begin form.target_object 1 %} +
+{{ form.target_object.body }} +
+ +{% if form.target_object.get_type.commentable %} +
+ + {% render_comment_list for form.target_object %} + +

{% trans "Preview your comment" %}

+
+ +
+ Avatar +
+
{{ form.name.value }}
+
+
{{ comment|textile_restricted_pl }}
+
+
+ + {% include "comments/form.html" %} + +
+{% endif %} +
+
+ +{% endblock %} diff --git a/migdal/templates/django_comments_xtd/email_followup_comment.html b/migdal/templates/django_comments_xtd/email_followup_comment.html new file mode 100644 index 0000000..2e5e858 --- /dev/null +++ b/migdal/templates/django_comments_xtd/email_followup_comment.html @@ -0,0 +1,19 @@ +{% load i18n %} +

{{ user_name }},

+ +

Pojawił się nowy komentarz w wątku z Twoim udziałem.

+ +

+{% language 'pl' %} + „{{ content_object.title }}” +{% endlanguage %} +

+ +

{{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}:

+
+{{ comment.comment }} +
+ +

--
+{{ site }} +

diff --git a/migdal/templates/django_comments_xtd/email_followup_comment.txt b/migdal/templates/django_comments_xtd/email_followup_comment.txt new file mode 100644 index 0000000..834c60e --- /dev/null +++ b/migdal/templates/django_comments_xtd/email_followup_comment.txt @@ -0,0 +1,15 @@ +{% load i18n %}{{ user_name }}, + +Pojawił się nowy komentarz w wątku z Twoim udziałem. + +{% language 'pl' %}„{{ content_object.title }}” +http://{{ site.domain }}{{ content_object.get_absolute_url }}{% endlanguage %} + + +{{ comment.name }}, {{ comment.submit_date|date:"SHORT_DATE_FORMAT" }}: +-------- +{{ comment.comment }} + + +-- +{{ site }} diff --git a/migdal/templates/migdal/categories.html b/migdal/templates/migdal/categories.html new file mode 100644 index 0000000..75c0805 --- /dev/null +++ b/migdal/templates/migdal/categories.html @@ -0,0 +1,7 @@ +
    + {% for cat in object_list %} +
  • + {{ cat }} +
    • + {% endfor %} +
\ No newline at end of file diff --git a/migdal/templates/migdal/entry/entry_begin.html b/migdal/templates/migdal/entry/entry_begin.html new file mode 100644 index 0000000..161e359 --- /dev/null +++ b/migdal/templates/migdal/entry/entry_begin.html @@ -0,0 +1,33 @@ +{% load i18n %} +{% load gravatar thumbnail %} + +Avatar +{% if detail %} +

{{ object.title }}

+{% else %} +

{{ object.title }}

+{% endif %} + +
+
{{ object.published_at }}
+
{{ object.author }}
+ +
+{% for category in object.categories.all %} + {% if forloop.counter != 1 %}/{% endif %} + {{ category }} +{% endfor %} +
+ +
+ +{% if object.image %} + +{% endif %} +
+{{ object.lead }} +
diff --git a/migdal/templates/migdal/entry/entry_detail.html b/migdal/templates/migdal/entry/entry_detail.html new file mode 100644 index 0000000..c19b49b --- /dev/null +++ b/migdal/templates/migdal/entry/entry_detail.html @@ -0,0 +1,52 @@ +{% extends "base.html" %} +{% load comments i18n %} +{% load fnp_common migdal_tags fnp_share %} + + +{% block "titleextra" %}{{ entry.title }} :: {% endblock %} +{% block "ogtitle" %}{{ entry.title }}{% endblock %} +{% block "ogtype" %}article{% endblock %} +{% block "ogdescription"%}{{ entry.lead|striptags|truncatewords:10 }}{% endblock %} +{% block "ogimage" %}{% spaceless %} +{% if entry.image %} + {{ entry.image.url|build_absolute_uri:request }} +{% else %} + {{ block.super }} +{% endif %} +{% endspaceless %}{% endblock %} + + +{% block "body" %} + +{% if not entry.published %} +

{% trans "This entry hasn't been published yet." %}

+{% endif %} + +
+
+ +{% entry_begin entry 1 %} +
+{{ entry.body }} +
+ +
+ +
+ +
+ +
+ +{% if entry.get_type.commentable %} + {% render_comment_list for entry %} +
+ {% entry_comment_form entry %} +
+{% endif %} +
+
+ +{% endblock %} \ No newline at end of file diff --git a/migdal/templates/migdal/entry/entry_list.html b/migdal/templates/migdal/entry/entry_list.html new file mode 100644 index 0000000..e144533 --- /dev/null +++ b/migdal/templates/migdal/entry/entry_list.html @@ -0,0 +1,55 @@ +{% extends "base.html" %} +{% load url from future %} +{% load i18n %} +{% load pagination_tags fnp_prevnext %} +{% load migdal_tags %} + + +{% block "body" %} + +{% if category %} +

{% trans "Category" %}: {{ category }} + +

+{% elif entry_type %} +

{{ entry_type|capfirst }} + +

+{% endif %} + +{% if object_list.promobox and request.page == 1 %} +
+ + +
+
    +{% for object in object_list.promobox %} + {% entry_promobox object forloop.counter %} +{% endfor %} +
+
+ +
+{% endif %} + +{% if submit %} +

+ {% trans "Submit a new story, create Culture's Right with us!" %} +

+{% endif %} + + +{% autopaginate object_list 10 %} +{% for object in object_list %} + {% entry_short object %} +{% endfor %} +{% prevnext %} + +{% endblock %} \ No newline at end of file diff --git a/migdal/templates/migdal/entry/entry_promobox.html b/migdal/templates/migdal/entry/entry_promobox.html new file mode 100644 index 0000000..f68b487 --- /dev/null +++ b/migdal/templates/migdal/entry/entry_promobox.html @@ -0,0 +1,30 @@ +{% load i18n thumbnail %} + + +
  • + + + + +
    +
    +

    {{ object.title }}

    + +
    +{{ object.lead|striptags|truncatewords:8 }} +
    +
    +
    + +     +
    • diff --git a/migdal/templates/migdal/entry/entry_short.html b/migdal/templates/migdal/entry/entry_short.html new file mode 100644 index 0000000..7a5eb25 --- /dev/null +++ b/migdal/templates/migdal/entry/entry_short.html @@ -0,0 +1,38 @@ +{% load i18n %} +{% load comments %} +{% load migdal_tags fnp_share %} + + +
    +
    + +{% entry_begin object %} + +
    + +
    +
    + +{% if object.get_type.commentable %} +{% get_comment_count for object as comment_count %} + +{% blocktrans count comment_count as c %}{{c}} comment{% plural %}{{c}} comments{% endblocktrans %} + +{% endif %} + +{% if object.body.raw %} + {% trans "read more" %} +{% endif %} + +
    + + +
    + + + +
    +
    +
    diff --git a/migdal/templates/migdal/entry/info/entry_begin.html b/migdal/templates/migdal/entry/info/entry_begin.html new file mode 100644 index 0000000..1d934bc --- /dev/null +++ b/migdal/templates/migdal/entry/info/entry_begin.html @@ -0,0 +1,22 @@ +{% load i18n %} +{% load thumbnail %} + +{% if detail %} +

    {{ object.title }}

    +{% else %} +

    {{ object.title }}

    +{% endif %} + + +{% if object.image %} + + + +{% endif %} +
    +{{ object.lead }} +
    diff --git a/migdal/templates/migdal/entry/publications/entry_begin.html b/migdal/templates/migdal/entry/publications/entry_begin.html new file mode 100644 index 0000000..e9eae95 --- /dev/null +++ b/migdal/templates/migdal/entry/publications/entry_begin.html @@ -0,0 +1,38 @@ +{% load i18n %} +{% load thumbnail %} + +{% if detail %} +

    {{ object.title }}

    +{% else %} +

    {{ object.title }}

    +{% endif %} + + +{% comment %} +
    +{% if request.LANGUAGE_CODE == 'pl' %} + {% if object.published_en %} + {% language 'en' %} + English version + {% endlanguage %} + {% endif %} +{% elif object.published_pl %} + {{ request.LANGUAGE_CODE }} + {% language 'pl' %} + polska wersja + {% endlanguage %} +{% endif %} +
    +{% endcomment %} + + +{% if object.image %} + +{% endif %} +
    +{{ object.lead }} +
    diff --git a/migdal/templates/migdal/entry/submit.html b/migdal/templates/migdal/entry/submit.html new file mode 100644 index 0000000..cc376d7 --- /dev/null +++ b/migdal/templates/migdal/entry/submit.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% load url from future %} +{% load i18n %} + +{% block "body" %} + +

    {% trans "Submit new story" %}

    + +

    {% blocktrans %} +By submitting a story here, you agree to publish it under the terms of the +Creative Commons Attribution-Share Alike +free license.{% endblocktrans %}

    + +

    {% blocktrans %}Stories are moderated, so please be +patient, you'll be notified when it's published.{% endblocktrans %}

    + +
    +{% csrf_token %} + + {{ submit_form.as_table }} + +
    +
    + + +{% endblock %} \ No newline at end of file diff --git a/migdal/templates/migdal/entry/submit_thanks.html b/migdal/templates/migdal/entry/submit_thanks.html new file mode 100644 index 0000000..99cecaf --- /dev/null +++ b/migdal/templates/migdal/entry/submit_thanks.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block "body" %} + +

    {% trans "Thanks for submitting" %}

    + +

    +{% blocktrans %} +Thank you for submitting this new story, it's waiting for moderation. +If you provided an email, we'll inform you about changes in it's status +and comments. +{% endblocktrans %} +

    + + + +{% endblock %} \ No newline at end of file diff --git a/migdal/templates/migdal/last_comments.html b/migdal/templates/migdal/last_comments.html new file mode 100644 index 0000000..8deba13 --- /dev/null +++ b/migdal/templates/migdal/last_comments.html @@ -0,0 +1,13 @@ +{% load gravatar %} +{% load fnp_markup %} + \ No newline at end of file diff --git a/migdal/templates/migdal/mail/manager_new_entry.txt b/migdal/templates/migdal/mail/manager_new_entry.txt new file mode 100644 index 0000000..59703e2 --- /dev/null +++ b/migdal/templates/migdal/mail/manager_new_entry.txt @@ -0,0 +1,14 @@ +{% load url from future %}W serwisie pojawił się nowy wpis. +http://localhost:8000{% url 'admin:migdal_entry_change' object.pk %} + +Autor: {{ object.author|default_if_none:"" }} +E-mail: {{ object.author_email|default_if_none:"" }} +Tytuł [pl]: {{ object.title_pl|default_if_none:"" }} +Tytuł [en]: {{ object.title_en|default_if_none:"" }} +Kategorie: {{ object.categories.all|join:", " }} + +--- +{{ object.lead_pl.raw }} +--- +{{ object.lead_en.raw }} +--- \ No newline at end of file diff --git a/migdal/templates/migdal/mail/new_comment.txt b/migdal/templates/migdal/mail/new_comment.txt new file mode 100644 index 0000000..d7074c2 --- /dev/null +++ b/migdal/templates/migdal/mail/new_comment.txt @@ -0,0 +1,15 @@ +{% load i18n %}{{ comment.content_object.author }}, + +Pod Twoim wpisem pojawił się nowy komentarz. + +{% language 'pl' %}{{ comment.content_object.title }} +http://{{ site.domain }}{{ comment.get_absolute_url }}{% endlanguage %} + + +Autor: {{ comment.name }} + +{{ comment.comment }} + + +-- +{{ site }} diff --git a/migdal/templates/migdal/mail/published.txt b/migdal/templates/migdal/mail/published.txt new file mode 100644 index 0000000..b99e1f3 --- /dev/null +++ b/migdal/templates/migdal/mail/published.txt @@ -0,0 +1,11 @@ +{% load i18n %}{{ entry.author }}, + +Twój wpis został opublikowany: + +{% language 'pl' %}{{ entry.title }} +http://{{ site.domain }}{{ entry.get_absolute_url }}{% endlanguage %} + +Dziękujemy! + +-- +{{ site }} diff --git a/migdal/templates/search/search.html b/migdal/templates/search/search.html new file mode 100644 index 0000000..31be738 --- /dev/null +++ b/migdal/templates/search/search.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% load url from future %} +{% load i18n %} +{% load migdal_tags %} +{#% load events_tags %#} + + +{% block "body" %} +

    {% trans "Search results" %}

    + +{% for result in page.object_list %} + {% if result.model_name == "entry" %} + {% entry_short result.object %} + {#% elif result.model_name == "event" %#} + {#% event_short result.object %#} + {% endif %} +{% empty %} +

    {% trans "No results found." %}

    +{# Show some example queries to run, maybe query syntax, something else? #} +{% endfor %} + +{% if page.has_previous or page.has_next %} +

    + {% if page.has_previous %} + {% trans "previous" %} + {% endif %} + {% if page.has_next %} + {% trans "next" %} + {% endif %} +{% endif %} + +{% endblock "body" %} diff --git a/migdal/templatetags/__init__.py b/migdal/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/migdal/templatetags/migdal_tags.py b/migdal/templatetags/migdal_tags.py new file mode 100644 index 0000000..c1b824c --- /dev/null +++ b/migdal/templatetags/migdal_tags.py @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django_comments_xtd.models import XtdComment +from django.contrib import comments +from django import template +from migdal import app_settings +from migdal.models import Category, Entry +from django.utils.translation import ugettext_lazy as _ + +register = template.Library() + + +@register.simple_tag(takes_context=True) +def entry_begin(context, entry, detail=False): + t = template.loader.select_template(( + 'migdal/entry/%s/entry_begin.html' % entry.type, + 'migdal/entry/entry_begin.html', + )) + context = { + 'request': context['request'], + 'object': entry, + 'detail': detail, + } + return t.render(template.Context(context)) + + +@register.simple_tag(takes_context=True) +def entry_short(context, entry): + t = template.loader.select_template(( + 'migdal/entry/%s/entry_short.html' % entry.type, + 'migdal/entry/entry_short.html', + )) + context = { + 'request': context['request'], + 'object': entry, + } + return t.render(template.Context(context)) + + +@register.simple_tag(takes_context=True) +def entry_promobox(context, entry, counter): + t = template.loader.select_template(( + 'migdal/entry/%s/entry_promobox.html' % entry.type, + 'migdal/entry/entry_promobox.html', + )) + context = { + 'request': context['request'], + 'object': entry, + 'counter': counter, + } + return t.render(template.Context(context)) + + +@register.inclusion_tag('migdal/categories.html', takes_context=True) +def categories(context, taxonomy): + context = { + 'request': context['request'], + 'object_list': Category.objects.filter(taxonomy=taxonomy + ).exclude(entry__isnull=True) + } + return context + + +@register.inclusion_tag('migdal/last_comments.html') +def last_comments(limit=app_settings.LAST_COMMENTS): + return {'object_list': + XtdComment.objects.filter(is_public=True, is_removed=False).order_by('-submit_date')[:limit]} + + +@register.inclusion_tag(['comments/form.html']) +def entry_comment_form(entry): + return { + 'form': comments.get_form()(entry), + 'next': entry.get_absolute_url(), + } diff --git a/migdal/tests.py b/migdal/tests.py new file mode 100644 index 0000000..501deb7 --- /dev/null +++ b/migdal/tests.py @@ -0,0 +1,16 @@ +""" +This file demonstrates writing tests using the unittest module. These will pass +when you run "manage.py test". + +Replace this with more appropriate tests for your application. +""" + +from django.test import TestCase + + +class SimpleTest(TestCase): + def test_basic_addition(self): + """ + Tests that 1 + 1 always equals 2. + """ + self.assertEqual(1 + 1, 2) diff --git a/migdal/urls.py b/migdal/urls.py new file mode 100644 index 0000000..49a4346 --- /dev/null +++ b/migdal/urls.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.conf.urls import patterns, include, url, handler404 +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import string_concat +from migdal import feeds, app_settings +from migdal.views import SearchPublishedView +from fnpdjango.utils.urls import i18n_patterns + +pats = [] +for t in app_settings.TYPES: + pats += [ + # entry list + url(string_concat(r'^', t.slug, r'/$'), + 'migdal.views.entry_list', {'type_db': t.db}, + name='migdal_entry_list_%s' % t.db), + url(string_concat(r'^', t.slug, r'/rss.xml$'), + feeds.EntriesFeed(), {'type_db': t.db}, + name='migdal_entry_list_%s_feed' % t.db), + # single entry + url(string_concat(r'^', t.slug, r'/(?P[^/]+)/$'), + 'migdal.views.entry', {'type_db': t.db}, + name='migdal_entry_%s' % t.db), + ] + + +urlpatterns = i18n_patterns('', + # main page + url(r'^$', 'migdal.views.main', name='migdal_main'), + url(r'^rss.xml$', feeds.EntriesFeed(), name='migdal_main_feed'), + # submit new entry + url(string_concat(r'^', _('submit'), r'/$'), 'migdal.views.submit', name='migdal_submit'), + url(string_concat(r'^', _('submit'), r'/', _('thanks'), r'$'), 'migdal.views.submit_thanks', name='migdal_submit_thanks'), + # category + url(string_concat(r'^', _('categories'), r'/(?P[^/]*)/$'), + 'migdal.views.entry_list', name='migdal_category'), + url(string_concat(r'^', _('categories'), r'/(?P[^/]*)/rss.xml$'), + feeds.EntriesFeed(), name='migdal_category_feed'), + url(string_concat(r'^', _('search')), SearchPublishedView(), name='search'), + # type-specific views + *pats +) diff --git a/migdal/views.py b/migdal/views.py new file mode 100644 index 0000000..1f769a9 --- /dev/null +++ b/migdal/views.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# This file is part of PrawoKultury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.http import Http404 +from django.shortcuts import get_object_or_404, render, redirect +from django.utils.translation import get_language +from fnpdjango.utils.views import set_current_object +from migdal import api +from migdal.forms import get_submit_form +from migdal.models import Category, Entry +from migdal import app_settings +from haystack.views import SearchView + + +def main(request): + if app_settings.MAIN_PAGE_ENTRY is not None: + main_entry = Entry.objects.get(**app_settings.MAIN_PAGE_ENTRY) + return entry(request, entry=main_entry) + else: + return entry_list(request) + + +def entry_list(request, type_db=None, category_slug=None): + lang = request.LANGUAGE_CODE + templates = ["migdal/entry/entry_list.html"] + + if type_db: + if app_settings.TYPES_ON_MAIN == (type_db,): + return redirect('migdal_main') + entry_type = app_settings.TYPES_DICT[type_db] + templates = ["migdal/entry/%s/entry_list.html" % type_db] + templates + submit = type_db == app_settings.TYPE_SUBMIT + else: + submit = app_settings.TYPES_ON_MAIN == (app_settings.TYPE_SUBMIT,) + entry_type = None + + if category_slug: + category = get_object_or_404(Category, **{'slug_%s' % lang: category_slug}) + else: + category = None + + if category: + set_current_object(request, category) + + promobox = 5 if entry_type is None and category is None else None + + object_list = api.entry_list(entry_type=entry_type, category=category, + promobox=promobox) + + return render(request, templates, { + 'object_list': object_list, + 'category': category, + 'entry_type': entry_type, + 'submit': submit, + }) + + +def entry(request, type_db=None, slug=None, entry=None): + if entry is None: + lang = request.LANGUAGE_CODE + args = {'type': type_db, 'slug_%s' % lang: slug} + entry = get_object_or_404(Entry, **args) + if not entry.published and not request.user.has_perm('migdal.change_entry'): + raise Http404 + set_current_object(request, entry, in_url=slug is not None) + + templates = ["migdal/entry/entry_detail.html"] + if entry.type is not None: + templates = ["migdal/entry/%s/entry_detail.html" % type_db] + templates + return render(request, templates, {'entry': entry}) + + +def submit(request): + if request.method == 'POST': + submit_form = get_submit_form(request.POST) + if submit_form.is_valid(): + submit_form.save() + return redirect('migdal_submit_thanks') + else: + submit_form = get_submit_form() + + return render(request, 'migdal/entry/submit.html', { + 'submit_form': submit_form, + }) + +def submit_thanks(request): + return render(request, "migdal/entry/submit_thanks.html") + + +class SearchPublishedView(SearchView): + def __init__(self, *args, **kwargs): + super(SearchPublishedView, self).__init__(*args, **kwargs) + + def get_results(self): + results = super(SearchPublishedView, self).get_results() + lang_code = get_language() + def is_published(entity): + if isinstance(entity, Entry): + return getattr(entity, "published_%s" % lang_code) == True + else: + return True + results = filter(lambda r: is_published(r.object), results) + print results + return results diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..ed6a8c7 --- /dev/null +++ b/setup.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +import os.path +from setuptools import setup, find_packages + +def whole_trees(package_dir, paths): + def whole_tree(prefix, path): + files = [] + for f in (f for f in os.listdir(os.path.join(prefix, path)) if not f[0]=='.'): + new_path = os.path.join(path, f) + if os.path.isdir(os.path.join(prefix, new_path)): + files.extend(whole_tree(prefix, new_path)) + else: + files.append(new_path) + return files + prefix = os.path.join(os.path.dirname(__file__), package_dir) + files = [] + for path in paths: + files.extend(whole_tree(prefix, path)) + return files + +setup( + name='django-migdal', + version='0.1', + author='Radek Czajka', + author_email='radoslaw.czajka@nowoczesnapolska.org.pl', + url = '', + packages=find_packages(), + package_data={'migdal': whole_trees('migdal', + ['templates', 'locale'])}, + license='LICENSE', + description='.', + long_description="", +) -- 2.20.1