{% trans "Table of contents" %}

, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-05-10 10:38+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \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" + +#: models.py:8 models.py:26 +msgid "name" +msgstr "nazwa" + +#: models.py:9 +msgid "slug" +msgstr "" + +#: models.py:12 +msgid "catalog" +msgstr "katalog" + +#: models.py:13 +msgid "catalogs" +msgstr "katalogi" + +#: models.py:28 +msgid "url" +msgstr "url" + +#: models.py:29 +msgid "description" +msgstr "opis" + +#: models.py:32 +msgid "library" +msgstr "biblioteka" + +#: models.py:33 +msgid "libraries" +msgstr "biblioteki" + +#: templates/libraries/library_view.html:4 +#: templates/libraries/library_view.html:8 +msgid "Libraries directory" +msgstr "Katalog bibliotek" + +#: templates/libraries/main_view.html:4 templates/libraries/main_view.html:8 +msgid "Library directories" +msgstr "Katalogi bibliotek" + diff --git a/apps/libraries/migrations/0001_initial.py b/apps/libraries/migrations/0001_initial.py new file mode 100644 index 000000000..0411c878a --- /dev/null +++ b/apps/libraries/migrations/0001_initial.py @@ -0,0 +1,36 @@ +# -*- 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 'Library' + db.create_table(u'libraries_library', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)), + ('url', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)), + ('description', self.gf('django.db.models.fields.TextField')(blank=True)), + )) + db.send_create_signal(u'libraries', ['Library']) + + + def backwards(self, orm): + # Deleting model 'Library' + db.delete_table(u'libraries_library') + + + models = { + u'libraries.library': { + 'Meta': {'object_name': 'Library'}, + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}) + } + } + + complete_apps = ['libraries'] \ No newline at end of file diff --git a/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py b/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py new file mode 100644 index 000000000..c37abf526 --- /dev/null +++ b/apps/libraries/migrations/0002_auto__add_catalog__add_field_library_catalog.py @@ -0,0 +1,50 @@ +# -*- 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 'Catalog' + db.create_table(u'libraries_catalog', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=120)), + ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=120)), + )) + db.send_create_signal(u'libraries', ['Catalog']) + + # Adding field 'Library.catalog' + db.add_column(u'libraries_library', 'catalog', + self.gf('django.db.models.fields.related.ForeignKey')(default=None, related_name='libraries', on_delete=models.PROTECT, to=orm['libraries.Catalog']), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'Catalog' + db.delete_table(u'libraries_catalog') + + # Deleting field 'Library.catalog' + db.delete_column(u'libraries_library', 'catalog_id') + + + models = { + u'libraries.catalog': { + 'Meta': {'object_name': 'Catalog'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120'}) + }, + u'libraries.library': { + 'Meta': {'object_name': 'Library'}, + 'catalog': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'libraries'", 'on_delete': 'models.PROTECT', 'to': u"orm['libraries.Catalog']"}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}) + } + } + + complete_apps = ['libraries'] \ No newline at end of file diff --git a/apps/libraries/migrations/0003_auto__add_field_library_slug.py b/apps/libraries/migrations/0003_auto__add_field_library_slug.py new file mode 100644 index 000000000..de0cdf0b1 --- /dev/null +++ b/apps/libraries/migrations/0003_auto__add_field_library_slug.py @@ -0,0 +1,40 @@ +# -*- 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 'Library.slug' + db.add_column(u'libraries_library', 'slug', + self.gf('django.db.models.fields.SlugField')(max_length=120, unique=True, null=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Library.slug' + db.delete_column(u'libraries_library', 'slug') + + + models = { + u'libraries.catalog': { + 'Meta': {'object_name': 'Catalog'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '120'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '120'}) + }, + u'libraries.library': { + 'Meta': {'object_name': 'Library'}, + 'catalog': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'libraries'", 'on_delete': 'models.PROTECT', 'to': u"orm['libraries.Catalog']"}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'unique': 'True', 'null': 'True'}), + 'url': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}) + } + } + + complete_apps = ['libraries'] \ No newline at end of file diff --git a/apps/libraries/migrations/__init__.py b/apps/libraries/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/libraries/models.py b/apps/libraries/models.py new file mode 100644 index 000000000..5f92421fc --- /dev/null +++ b/apps/libraries/models.py @@ -0,0 +1,41 @@ +from django.db import models +from django.utils.translation import ugettext_lazy as _ + + +class Catalog(models.Model): + """Represents a dictionary of libraries""" + + name = models.CharField(_('name'), max_length = 120, null = False) + slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True) + + class Meta: + verbose_name = _('catalog') + verbose_name_plural = _('catalogs') + + def __unicode__(self): + return self.name + + @models.permalink + def get_absolute_url(self): + return ('libraries_catalog_view', [self.slug]) + + +class Library(models.Model): + """Represent a single library in the libraries dictionary""" + + name = models.CharField(_('name'), max_length = 120, blank = True) + slug = models.SlugField(_('slug'), max_length = 120, unique = True, db_index = True, null = True) + catalog = models.ForeignKey(Catalog, null = False, related_name = 'libraries', on_delete = models.PROTECT) + url = models.CharField(_('url'), max_length = 120, blank = True) + description = models.TextField(_('description'), blank = True) + + class Meta: + verbose_name = _('library') + verbose_name_plural = _('libraries') + + def __unicode__(self): + return self.name + + @models.permalink + def get_absolute_url(self): + return ('libraries_library_view', [self.catalog.slug, self.slug]) \ No newline at end of file diff --git a/apps/libraries/templates/libraries/catalog_view.html b/apps/libraries/templates/libraries/catalog_view.html new file mode 100644 index 000000000..5d35fd973 --- /dev/null +++ b/apps/libraries/templates/libraries/catalog_view.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{% trans 'Libraries directory' %}{% endblock %} + + +{% block body %} +

{{library.name}}

+ +{% endblock %} \ No newline at end of file diff --git a/apps/libraries/templates/libraries/library_view.html b/apps/libraries/templates/libraries/library_view.html new file mode 100644 index 000000000..a97282987 --- /dev/null +++ b/apps/libraries/templates/libraries/library_view.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{{ library.name }}{% endblock %} + + +{% block body %} +

Adres strony www: {{library.url}}

+ {% autoescape off %}{{library.description}}{% endautoescape%} +

+{% endblock %} \ No newline at end of file diff --git a/apps/libraries/templates/libraries/main_view.html b/apps/libraries/templates/libraries/main_view.html new file mode 100644 index 000000000..55e5f0249 --- /dev/null +++ b/apps/libraries/templates/libraries/main_view.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block titleextra %}{% trans 'Library directories' %}{% endblock %} + + +{% block body %} +

{% trans 'Library directories' %}

{{catalog}}

+ +{% endblock %} \ No newline at end of file diff --git a/apps/libraries/urls.py b/apps/libraries/urls.py new file mode 100644 index 000000000..01531a9ed --- /dev/null +++ b/apps/libraries/urls.py @@ -0,0 +1,10 @@ +from django.conf.urls.defaults import patterns, url +from django.http import HttpResponseRedirect + + +urlpatterns = patterns('libraries.views', + url(r'^$', 'main_view', name='libraries_main_view'), + url(r'^/$', lambda x: HttpResponseRedirect(x.path[:-1])), + url(r'^/(?P[a-zA-Z0-9_-]+)$', 'catalog_view', name='libraries_catalog_view'), + url(r'^/(?P[a-zA-Z0-9_-]+)/(?P[a-zA-Z0-9_-]+)$', 'library_view', name='libraries_library_view'), +) \ No newline at end of file diff --git a/apps/libraries/views.py b/apps/libraries/views.py new file mode 100644 index 000000000..f79f2a1ea --- /dev/null +++ b/apps/libraries/views.py @@ -0,0 +1,20 @@ +from django.shortcuts import render_to_response, get_object_or_404 +from django.template import RequestContext, Template, TemplateSyntaxError + +from libraries.models import Catalog, Library + + +def main_view(request): + context = RequestContext(request) + context['catalogs'] = Catalog.objects.all() + return render_to_response('libraries/main_view.html', context_instance = context) + +def catalog_view(request, slug): + context = RequestContext(request) + context['catalog'] = get_object_or_404(Catalog.objects.filter(slug = slug).select_related()) + return render_to_response('libraries/catalog_view.html', context_instance = context) + +def library_view(request, catalog_slug, slug): + context = RequestContext(request) + context['library'] = get_object_or_404(Library.objects.filter(slug = slug).filter(catalog__slug = catalog_slug)) + return render_to_response('libraries/library_view.html', context_instance = context) \ No newline at end of file diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo index ddd53cbfb..a4a1feb23 100644 Binary files a/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo and b/apps/pdcounter/locale/pl/LC_MESSAGES/django.mo differ diff --git a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po index a2d082e91..3231b8f83 100644 --- a/apps/pdcounter/locale/pl/LC_MESSAGES/django.po +++ b/apps/pdcounter/locale/pl/LC_MESSAGES/django.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-19 11:39+0200\n" -"PO-Revision-Date: 2012-01-27 16:40+0100\n" +"POT-Creation-Date: 2013-06-11 15:46+0200\n" +"PO-Revision-Date: 2013-06-11 15:47+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Translated-Using: django-rosetta 0.5.6\n" +"X-Generator: Poedit 1.5.4\n" #: models.py:13 msgid "name" @@ -65,17 +65,22 @@ msgstr "zapowiedÅº ksiÄÅ¼ki" msgid "book stubs" msgstr "zapowiedzi ksiÄÅ¼ek" +#: templates/pdcounter/author_detail.html:6 +#: templates/pdcounter/book_stub_detail.html:6 +msgid "Public domain counter" +msgstr "Licznik domeny publicznej" + #: templates/pdcounter/author_detail.html:25 msgid "Read work's study of this author on Lektury.Gazeta.pl" -msgstr "" +msgstr "Przeczytaj omÃ³wienia utworÃ³w autora w serwisie Lektury.Gazeta.pl" #: templates/pdcounter/author_detail.html:30 msgid "Read article about this author on Wikipedia" -msgstr "" +msgstr "Przeczytaj artykuÅ o autorze w Wikipedii" #: templates/pdcounter/author_detail.html:35 msgid "This author's works are copyrighted." -msgstr "" +msgstr "DzieÅa tego autora objÄte sÄ prawem autorskim." #: templates/pdcounter/author_detail.html:36 #: templates/pdcounter/author_detail.html:44 @@ -83,30 +88,41 @@ msgid "" "Find out why Internet libraries can't publish this author's works." msgstr "" +"Dowiedz " +"siÄ, dlaczego biblioteki internetowe nie mogÄ udostÄpniaÄ dzieÅ tego " +"autora." #: templates/pdcounter/author_detail.html:39 msgid "" "This author's works are in public domain and will be published on Internet " -"school library of Wolne Lektury soon." +"library of Wolne Lektury soon." msgstr "" +"DzieÅa tego autora znajdujÄ siÄ w domenie publicznej i niedÅugo zostanÄ " +"opublikowane w bibliotece internetowej Wolne Lektury." #: templates/pdcounter/author_detail.html:42 msgid "" "This author's works will become part of public domain and will be allowed to " "be published without restrictions in" msgstr "" +"DzieÅa tego autora przejdÄ do zasobÃ³w domeny publicznej i bÄdÄ mogÅy byÄ " +"publikowane bez Å¼adnych ograniczeÅ za" #: templates/pdcounter/book_stub_detail.html:16 msgid "" -"This work is in public domain and will be published on Internet school " -"library of Wolne Lektury soon." +"This work is in public domain and will be published on Internet library of " +"Wolne Lektury soon." msgstr "" +"Ten utwÃ³r znajduje siÄ w domenie publicznej i niedÅugo zostanie opublikowany " +"w bibliotece internetowej Wolne Lektury." #: templates/pdcounter/book_stub_detail.html:19 msgid "" "This work will become part of public domain and will be allowed to be " "published without restrictions in" msgstr "" +"Ten utwÃ³r przejdzie do zasobÃ³w domeny publicznej i bÄdzie mÃ³gÅ byÄ " +"publikowany bez Å¼adnych ograniczeÅ za" #: templates/pdcounter/book_stub_detail.html:21 #: templates/pdcounter/book_stub_detail.html:24 @@ -114,10 +130,12 @@ msgid "" "Find out why Internet libraries can't publish this work." msgstr "" +"Dowiedz " +"siÄ, dlaczego biblioteki internetowe nie mogÄ udostÄpniaÄ tego utworu." #: templates/pdcounter/book_stub_detail.html:23 msgid "This work is copyrighted." -msgstr "" +msgstr "Ten utwÃ³r objÄty jest prawem autorskim." #~ msgid "year of translator's death" #~ msgstr "rok Åmierci tÅumacza" diff --git a/apps/pdcounter/templates/pdcounter/author_detail.html b/apps/pdcounter/templates/pdcounter/author_detail.html index 3810a4578..fc3bd5b8c 100644 --- a/apps/pdcounter/templates/pdcounter/author_detail.html +++ b/apps/pdcounter/templates/pdcounter/author_detail.html @@ -3,7 +3,7 @@ {% block titleextra %}{{ author.name }}{% endblock %} -{% block metadescription %}Licznik domeny publicznej: {{author.name}}.{% endblock %} +{% block metadescription %}{% trans "Public domain counter" %}: {{author.name}}.{% endblock %} {% block bodyid %}author-detail{% endblock %} @@ -36,7 +36,7 @@ {% trans "Find out why Internet libraries can't publish this author's works." %}

{% else %} {% if author.in_pd %} -

{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}

{% trans "This author's works are in public domain and will be published on Internet library of Wolne Lektury soon." %}

{% else %}

{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in" %}

diff --git a/apps/pdcounter/templates/pdcounter/book_stub_detail.html b/apps/pdcounter/templates/pdcounter/book_stub_detail.html index f76edd17a..40ddbd8ee 100644 --- a/apps/pdcounter/templates/pdcounter/book_stub_detail.html +++ b/apps/pdcounter/templates/pdcounter/book_stub_detail.html @@ -3,7 +3,7 @@ {% block titleextra %}{{ book.title }}{% endblock %} -{% block metadescription %}Licznik domeny publicznej: {{ book.title }}.{% endblock %} +{% block metadescription %}{% trans "Public domain counter" %}: {{ book.title }}.{% endblock %} {% block bodyid %}book-stub-detail{% endblock %} @@ -13,7 +13,7 @@

{% if book.in_pd %} -

{% trans "This work is in public domain and will be published on Internet school library of Wolne Lektury soon." %}

{% trans "This work is in public domain and will be published on Internet library of Wolne Lektury soon." %}

{% else %} {% if book.pd %}

{% trans "This work will become part of public domain and will be allowed to be published without restrictions in" %}

diff --git a/apps/wolnelektury_core/templates/superbase.html b/apps/wolnelektury_core/templates/superbase.html index 182d2b096..3eaf96216 100644 --- a/apps/wolnelektury_core/templates/superbase.html +++ b/apps/wolnelektury_core/templates/superbase.html @@ -32,7 +32,6 @@ {% endblock %} - {% include "annoy.html" %} {% block bodycontent %} diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py index 1f0d1d2b8..caec10b82 100644 --- a/wolnelektury/settings/__init__.py +++ b/wolnelektury/settings/__init__.py @@ -65,6 +65,7 @@ INSTALLED_APPS_OUR = [ 'waiter', 'search', 'oai', + 'libraries', ] INSTALLED_APPS_CONTRIB = [ diff --git a/wolnelektury/settings/static.py b/wolnelektury/settings/static.py index 4e104c4e7..2ed7b3887 100644 --- a/wolnelektury/settings/static.py +++ b/wolnelektury/settings/static.py @@ -33,8 +33,6 @@ PIPELINE_CSS = { 'css/social/shelf_tags.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', - - 'css/annoy.css', ], 'output_filename': 'css/compressed/all.css', }, @@ -47,8 +45,6 @@ PIPELINE_CSS = { 'book': { 'source_filenames': [ 'css/master.book.css', - - 'css/annoy.css', ], 'output_filename': 'css/compressed/book.css', }, @@ -85,8 +81,6 @@ PIPELINE_JS = { 'sponsors/js/sponsors.js', 'player/openplayer.js', 'js/search.js', - - 'js/annoy.js', ), 'output_filename': 'js/base.min.js', }, @@ -105,8 +99,6 @@ PIPELINE_JS = { 'js/jquery.highlightfade.js', 'js/book.js', 'player/openplayer.js', - - 'js/annoy.js', ], 'output_filename': 'js/book.min.js', }, diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 7224b20ed..e99b0816a 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -35,6 +35,7 @@ urlpatterns += patterns('', url(r'^ludzie/', include('social.urls')), url(r'^uzytkownik/', include('allauth.urls')), url(r'^czekaj/', include('waiter.urls')), + url(r'^biblioteki', include('libraries.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),

{{ catalog.name }}

{{ library.name }}

{% trans 'Library directories' %}