From 94e324b0d79e5841a15c357b0ab4535252f76aaf Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Thu, 5 Dec 2013 22:57:49 +0100 Subject: [PATCH] Remove useless templates --- umap/locale/de/LC_MESSAGES/django.po | 45 +++++++++++++----------- umap/locale/en/LC_MESSAGES/django.po | 10 +----- umap/locale/es/LC_MESSAGES/django.po | 12 +++---- umap/locale/fi/LC_MESSAGES/django.po | 44 +++++++++++++---------- umap/locale/fr/LC_MESSAGES/django.po | 12 +++---- umap/locale/it/LC_MESSAGES/django.po | 10 +----- umap/locale/nl/LC_MESSAGES/django.po | 10 +----- umap/locale/pt/LC_MESSAGES/django.po | 12 +++---- umap/templates/umap/field.html | 10 ------ umap/templates/umap/styles_fieldset.html | 31 ---------------- umap/templatetags/umap_tags.py | 7 ---- 11 files changed, 68 insertions(+), 135 deletions(-) delete mode 100644 umap/templates/umap/field.html delete mode 100644 umap/templates/umap/styles_fieldset.html diff --git a/umap/locale/de/LC_MESSAGES/django.po b/umap/locale/de/LC_MESSAGES/django.po index f35b9973..cb40b19c 100644 --- a/umap/locale/de/LC_MESSAGES/django.po +++ b/umap/locale/de/LC_MESSAGES/django.po @@ -1,21 +1,22 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Klumbumbus , 2013 msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-22 15:14+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-12-05 19:46+0000\n" "Last-Translator: Klumbumbus \n" -"Language-Team: German (http://www.transifex.com/projects/p/umap/language/de/)\n" +"Language-Team: German (http://www.transifex.com/projects/p/umap/language/" +"de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/auth/user_detail.html:7 @@ -52,16 +53,23 @@ msgstr "Was ist uMap" msgid "" "uMap let you create maps with OpenStreetMap " "layers in a minute and embed them in your site." -msgstr "Mit uMap kannst du in einer Minute Karten erstellen mit OpenStreetMap-Ebenen und sie in deine eigene Internetseite einbinden." +msgstr "" +"Mit uMap kannst du in einer Minute Karten erstellen mit OpenStreetMap-Ebenen und sie in deine eigene Internetseite " +"einbinden." #: templates/umap/about_summary.html:8 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " -"need a stable instance, please use %(stable_url)s. You can also host your own " -"instance, it's open source!" -msgstr "Dies ist eine Demo-Instanz und wird benutzt für Tests und Vorveröffentlichungen. Wenn du eine stabile Instanz benötigst, benutze bitte %(stable_url)s. Du kannst auch deine eigene Instanz hosten, es ist open source!" +"need a stable instance, please use " +"%(stable_url)s. You can also host your own instance, it's open source!" +msgstr "" +"Dies ist eine Demo-Instanz und wird benutzt für Tests und " +"Vorveröffentlichungen. Wenn du eine stabile Instanz benötigst, benutze bitte " +"%(stable_url)s. Du kannst auch deine eigene " +"Instanz hosten, es ist open source!" #: templates/umap/about_summary.html:10 #, python-format @@ -86,11 +94,14 @@ msgstr "Verwalte Farben und Icons der POIs" #: templates/umap/about_summary.html:20 msgid "Manage map options: display a minimap, locate user on load…" -msgstr "Verwalte Karteneinstellungen: eine Übersichtskarte anzeigen, den Nutzer beim Seitenaufruf lokalisieren,..." +msgstr "" +"Verwalte Karteneinstellungen: eine Übersichtskarte anzeigen, den Nutzer beim " +"Seitenaufruf lokalisieren,..." #: templates/umap/about_summary.html:21 msgid "Batch import geostructured data (GEOJson...)" -msgstr "Stapelverarbeitung beim Importieren von geotechnischen Daten (GEOJson,...)" +msgstr "" +"Stapelverarbeitung beim Importieren von geotechnischen Daten (GEOJson,...)" #: templates/umap/about_summary.html:22 msgid "Choose the license for your data" @@ -104,11 +115,11 @@ msgstr "Teile und binde deine Karte ein" msgid "Play with the demo" msgstr "Spiele mit der Demo" -#: templates/umap/content.html:26 templates/umap/search_bar.html:6 +#: templates/umap/content.html:24 templates/umap/search_bar.html:6 msgid "Search maps" msgstr "Karten suchen" -#: templates/umap/content.html:35 +#: templates/umap/content.html:33 msgid "Last maps" msgstr "Neueste Karten" @@ -156,11 +167,3 @@ msgstr "Keine Karte gefunden." #: templates/umap/search_bar.html:9 msgid "Search" msgstr "Suchen" - -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "" - -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "" diff --git a/umap/locale/en/LC_MESSAGES/django.po b/umap/locale/en/LC_MESSAGES/django.po index 15bae64f..503e1384 100644 --- a/umap/locale/en/LC_MESSAGES/django.po +++ b/umap/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -155,11 +155,3 @@ msgstr "" #: templates/umap/search_bar.html:9 msgid "Search" msgstr "" - -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "" - -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "" diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po index 04bd016d..b0cc4274 100644 --- a/umap/locale/es/LC_MESSAGES/django.po +++ b/umap/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-11-22 14:17+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/umap/language/" @@ -162,10 +162,8 @@ msgstr "No se encontraron mapas." msgid "Search" msgstr "Buscar" -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "Opciones de estilo" +#~ msgid "Styles options" +#~ msgstr "Opciones de estilo" -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "Cambiar forma y símbolo del marcador." +#~ msgid "Change marker shape and symbol." +#~ msgstr "Cambiar forma y símbolo del marcador." diff --git a/umap/locale/fi/LC_MESSAGES/django.po b/umap/locale/fi/LC_MESSAGES/django.po index 9b2c4cd1..689a67e8 100644 --- a/umap/locale/fi/LC_MESSAGES/django.po +++ b/umap/locale/fi/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # jaakkoh , 2013 # jaakkoh , 2013 @@ -9,14 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-22 15:14+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-12-05 06:27+0000\n" "Last-Translator: jaakkoh \n" -"Language-Team: Finnish (http://www.transifex.com/projects/p/umap/language/fi/)\n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/umap/language/" +"fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/auth/user_detail.html:7 @@ -53,16 +54,23 @@ msgstr "Mikä uMap on?" msgid "" "uMap let you create maps with OpenStreetMap " "layers in a minute and embed them in your site." -msgstr "uMap mahdollistaa OpenStreetMap-pohjaisten räätälöityjen karttojen luomisen ja liittämisen verkkosivuusi muutamassa minuutissa." +msgstr "" +"uMap mahdollistaa OpenStreetMap-pohjaisten " +"räätälöityjen karttojen luomisen ja liittämisen verkkosivuusi muutamassa " +"minuutissa." #: templates/umap/about_summary.html:8 #, python-format msgid "" "This is a demo instance, used for tests and pre-rolling releases. If you " -"need a stable instance, please use %(stable_url)s. You can also host your own " -"instance, it's open source!" -msgstr "Tämä on uMapin demo-instanssi, jota käytetään testaamiseen ja väliversioille. Jos tarvitset vakaan version, niin käytäthän %(stable_url)s :a. Voit myös tarjota oman instanssin - avoin lähdekoodi rulettaa!" +"need a stable instance, please use " +"%(stable_url)s. You can also host your own instance, it's open source!" +msgstr "" +"Tämä on uMapin demo-instanssi, jota käytetään testaamiseen ja " +"väliversioille. Jos tarvitset vakaan version, niin käytäthän %(stable_url)s :a. Voit myös tarjota oman instanssin " +"- avoin lähdekoodi rulettaa!" #: templates/umap/about_summary.html:10 #, python-format @@ -87,7 +95,9 @@ msgstr "Valitse ja hallinnoi POI-merkintöjen värit ja karttakuvakkeet" #: templates/umap/about_summary.html:20 msgid "Manage map options: display a minimap, locate user on load…" -msgstr "Hallitse kartta-optiot: näytä mini-kartta, paikanna käyttäjä sivun latauksessa, ..." +msgstr "" +"Hallitse kartta-optiot: näytä mini-kartta, paikanna käyttäjä sivun " +"latauksessa, ..." #: templates/umap/about_summary.html:21 msgid "Batch import geostructured data (GEOJson...)" @@ -105,11 +115,11 @@ msgstr "Jaa karttasi muille ja/tai liitä se muihin sivustoihin" msgid "Play with the demo" msgstr "Tongi demoa sielusi kyllyydestä!" -#: templates/umap/content.html:26 templates/umap/search_bar.html:6 +#: templates/umap/content.html:24 templates/umap/search_bar.html:6 msgid "Search maps" msgstr "Etsi karttoja" -#: templates/umap/content.html:35 +#: templates/umap/content.html:33 msgid "Last maps" msgstr "Viimeisimmät kartat" @@ -158,10 +168,8 @@ msgstr "Karttaa ei löytynyt." msgid "Search" msgstr "Etsi" -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "Tyylivaihtoehdot" +#~ msgid "Styles options" +#~ msgstr "Tyylivaihtoehdot" -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "Muuta karttamerkin tyyliä ja symbolia" +#~ msgid "Change marker shape and symbol." +#~ msgstr "Muuta karttamerkin tyyliä ja symbolia" diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po index 16d29a85..c58b7266 100644 --- a/umap/locale/fr/LC_MESSAGES/django.po +++ b/umap/locale/fr/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-12-04 20:59+0000\n" "Last-Translator: Buggi \n" "Language-Team: French (http://www.transifex.com/projects/p/umap/language/" @@ -169,10 +169,8 @@ msgstr "Aucune carte trouvée." msgid "Search" msgstr "Chercher" -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "Options de mise en forme" +#~ msgid "Styles options" +#~ msgstr "Options de mise en forme" -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "Changer la forme du marqueur et le picto" +#~ msgid "Change marker shape and symbol." +#~ msgstr "Changer la forme du marqueur et le picto" diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po index d3da15a7..8ac4cb55 100644 --- a/umap/locale/it/LC_MESSAGES/django.po +++ b/umap/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-11-22 14:17+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Italian (http://www.transifex.com/projects/p/umap/language/" @@ -157,11 +157,3 @@ msgstr "Nessuna mappa trovata." #: templates/umap/search_bar.html:9 msgid "Search" msgstr "" - -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "" - -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "" diff --git a/umap/locale/nl/LC_MESSAGES/django.po b/umap/locale/nl/LC_MESSAGES/django.po index 926e3f4f..35c5b3da 100644 --- a/umap/locale/nl/LC_MESSAGES/django.po +++ b/umap/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-11-22 14:16+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/umap/language/" @@ -156,11 +156,3 @@ msgstr "" #: templates/umap/search_bar.html:9 msgid "Search" msgstr "" - -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "" - -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "" diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po index 65858f68..d4282535 100644 --- a/umap/locale/pt/LC_MESSAGES/django.po +++ b/umap/locale/pt/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-04 23:35+0100\n" +"POT-Creation-Date: 2013-12-05 22:57+0100\n" "PO-Revision-Date: 2013-11-22 14:17+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/umap/language/" @@ -157,10 +157,8 @@ msgstr "Nenhum mapa encontrado." msgid "Search" msgstr "Procurar" -#: templates/umap/styles_fieldset.html:3 -msgid "Styles options" -msgstr "Opções de estilo" +#~ msgid "Styles options" +#~ msgstr "Opções de estilo" -#: templates/umap/styles_fieldset.html:11 -msgid "Change marker shape and symbol." -msgstr "Mudar forma e pictograma do marco." +#~ msgid "Change marker shape and symbol." +#~ msgstr "Mudar forma e pictograma do marco." diff --git a/umap/templates/umap/field.html b/umap/templates/umap/field.html deleted file mode 100644 index d4d19da3..00000000 --- a/umap/templates/umap/field.html +++ /dev/null @@ -1,10 +0,0 @@ -{% if field.label %} - -{% endif %} -{{ field }} -{% for error in field.errors %} - {{ error|escape }} -{% endfor %} -{% if field.help_text %} -{{ field.help_text }} -{% endif %} \ No newline at end of file diff --git a/umap/templates/umap/styles_fieldset.html b/umap/templates/umap/styles_fieldset.html deleted file mode 100644 index 0cd765ad..00000000 --- a/umap/templates/umap/styles_fieldset.html +++ /dev/null @@ -1,31 +0,0 @@ -{% load umap_tags i18n %} -
- {% trans "Styles options" %} - {% foundation_field form.color %} - {% if form.icon_class and form.pictogram %} -
- {{ form.icon_class }} - {{ form.pictogram }} -
-
- {% trans "Change marker shape and symbol." %} - {% endif %} - {% foundation_field form.weight %} - {% if form.stroke %} -
- {{ form.stroke.label }}{{ form.stroke }} -
- {{ form.stroke.help_text }} - {% endif %} - {% foundation_field form.smoothFactor %} - {% foundation_field form.opacity %} - {% if form.fill %} -
- {{ form.fill.label }}{{ form.fill }} -
- {{ form.fill.help_text }} - {% endif %} - {% foundation_field form.fillOpacity %} - {% foundation_field form.fillColor %} - {% foundation_field form.dashArray %} -
\ No newline at end of file diff --git a/umap/templatetags/umap_tags.py b/umap/templatetags/umap_tags.py index fa836940..b86c8a62 100644 --- a/umap/templatetags/umap_tags.py +++ b/umap/templatetags/umap_tags.py @@ -5,13 +5,6 @@ from django import template register = template.Library() -@register.inclusion_tag('umap/field.html') -def foundation_field(field): - return { - 'field': field, - } - - @register.simple_tag(takes_context=True) def paginate_querystring(context, page): qs = copy(context["request"].GET)