diff --git a/umap/locale/da/LC_MESSAGES/django.mo b/umap/locale/da/LC_MESSAGES/django.mo index e07a44cd..34a6ebc4 100644 Binary files a/umap/locale/da/LC_MESSAGES/django.mo and b/umap/locale/da/LC_MESSAGES/django.mo differ diff --git a/umap/locale/da/LC_MESSAGES/django.po b/umap/locale/da/LC_MESSAGES/django.po index 960804e9..93aa26cb 100644 --- a/umap/locale/da/LC_MESSAGES/django.po +++ b/umap/locale/da/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Danish (http://www.transifex.com/projects/p/umap/language/da/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,19 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Browse %(current_user)s's kort" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Mere" diff --git a/umap/locale/de/LC_MESSAGES/django.mo b/umap/locale/de/LC_MESSAGES/django.mo index 5ddf458b..d4b74b3f 100644 Binary files a/umap/locale/de/LC_MESSAGES/django.mo and b/umap/locale/de/LC_MESSAGES/django.mo differ diff --git a/umap/locale/de/LC_MESSAGES/django.po b/umap/locale/de/LC_MESSAGES/django.po index fe7d5b76..159154a5 100644 --- a/umap/locale/de/LC_MESSAGES/django.po +++ b/umap/locale/de/LC_MESSAGES/django.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 16:52+0000\n" -"Last-Translator: Klumbumbus \n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" +"Last-Translator: yohanboniface \n" "Language-Team: German (http://www.transifex.com/projects/p/umap/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,15 +18,19 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "von" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Schaue dir %(current_user)s's Karten an" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "von" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Mehr" diff --git a/umap/locale/en/LC_MESSAGES/django.mo b/umap/locale/en/LC_MESSAGES/django.mo index baf55018..5384bdb3 100644 Binary files a/umap/locale/en/LC_MESSAGES/django.mo and b/umap/locale/en/LC_MESSAGES/django.mo differ diff --git a/umap/locale/en/LC_MESSAGES/django.po b/umap/locale/en/LC_MESSAGES/django.po index 659dbd78..715df84f 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: 2014-02-10 14:50+0100\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,15 +17,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "" diff --git a/umap/locale/es/LC_MESSAGES/django.mo b/umap/locale/es/LC_MESSAGES/django.mo index 1bbadfd5..65e8422e 100644 Binary files a/umap/locale/es/LC_MESSAGES/django.mo and b/umap/locale/es/LC_MESSAGES/django.mo differ diff --git a/umap/locale/es/LC_MESSAGES/django.po b/umap/locale/es/LC_MESSAGES/django.po index 71be435d..4f472052 100644 --- a/umap/locale/es/LC_MESSAGES/django.po +++ b/umap/locale/es/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/umap/language/es/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,19 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Mapas de %(current_user)s" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Más" diff --git a/umap/locale/fi/LC_MESSAGES/django.mo b/umap/locale/fi/LC_MESSAGES/django.mo index 807ee796..770007f9 100644 Binary files a/umap/locale/fi/LC_MESSAGES/django.mo and b/umap/locale/fi/LC_MESSAGES/django.mo differ diff --git a/umap/locale/fi/LC_MESSAGES/django.po b/umap/locale/fi/LC_MESSAGES/django.po index ad1aba58..323acfc3 100644 --- a/umap/locale/fi/LC_MESSAGES/django.po +++ b/umap/locale/fi/LC_MESSAGES/django.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/umap/language/fi/)\n" "MIME-Version: 1.0\n" @@ -19,15 +19,19 @@ msgstr "" "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Selaa %(current_user)s:n karttoja" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Lisää" diff --git a/umap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo index 293bf723..ffd45c9d 100644 Binary files a/umap/locale/fr/LC_MESSAGES/django.mo and b/umap/locale/fr/LC_MESSAGES/django.mo differ diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po index c2f13662..5a285b8e 100644 --- a/umap/locale/fr/LC_MESSAGES/django.po +++ b/umap/locale/fr/LC_MESSAGES/django.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:53+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:36+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: French (http://www.transifex.com/projects/p/umap/language/fr/)\n" "MIME-Version: 1.0\n" @@ -21,15 +21,19 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "par" + +#: views.py:158 +msgid "View the map" +msgstr "Voir la carte" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Consulter les cartes de %(current_user)s" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "par" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Plus" diff --git a/umap/locale/it/LC_MESSAGES/django.mo b/umap/locale/it/LC_MESSAGES/django.mo index a54cc166..0009f901 100644 Binary files a/umap/locale/it/LC_MESSAGES/django.mo and b/umap/locale/it/LC_MESSAGES/django.mo differ diff --git a/umap/locale/it/LC_MESSAGES/django.po b/umap/locale/it/LC_MESSAGES/django.po index 7c58305f..b7550cc0 100644 --- a/umap/locale/it/LC_MESSAGES/django.po +++ b/umap/locale/it/LC_MESSAGES/django.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Italian (http://www.transifex.com/projects/p/umap/language/it/)\n" "MIME-Version: 1.0\n" @@ -20,15 +20,19 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Vedi %(current_user)s delle mappe" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Altre mappe" diff --git a/umap/locale/ja/LC_MESSAGES/django.mo b/umap/locale/ja/LC_MESSAGES/django.mo index 46abce1e..99190375 100644 Binary files a/umap/locale/ja/LC_MESSAGES/django.mo and b/umap/locale/ja/LC_MESSAGES/django.mo differ diff --git a/umap/locale/ja/LC_MESSAGES/django.po b/umap/locale/ja/LC_MESSAGES/django.po index 62ac3822..bacbdc9e 100644 --- a/umap/locale/ja/LC_MESSAGES/django.po +++ b/umap/locale/ja/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/umap/language/ja/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,19 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "%(current_user)sのマップを閲覧" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "次" diff --git a/umap/locale/lt/LC_MESSAGES/django.mo b/umap/locale/lt/LC_MESSAGES/django.mo index 1b67a68b..9ac3110a 100644 Binary files a/umap/locale/lt/LC_MESSAGES/django.mo and b/umap/locale/lt/LC_MESSAGES/django.mo differ diff --git a/umap/locale/lt/LC_MESSAGES/django.po b/umap/locale/lt/LC_MESSAGES/django.po index 982ea64a..f3866d32 100644 --- a/umap/locale/lt/LC_MESSAGES/django.po +++ b/umap/locale/lt/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/umap/language/lt/)\n" "MIME-Version: 1.0\n" @@ -18,15 +18,19 @@ msgstr "" "Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Peržiūrėti %(current_user)s žemėlapius" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Daugiau" diff --git a/umap/locale/nl/LC_MESSAGES/django.mo b/umap/locale/nl/LC_MESSAGES/django.mo index 513b4e82..f56708da 100644 Binary files a/umap/locale/nl/LC_MESSAGES/django.mo and b/umap/locale/nl/LC_MESSAGES/django.mo differ diff --git a/umap/locale/nl/LC_MESSAGES/django.po b/umap/locale/nl/LC_MESSAGES/django.po index a77c5994..bb7e9c45 100644 --- a/umap/locale/nl/LC_MESSAGES/django.po +++ b/umap/locale/nl/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/umap/language/nl/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,19 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "" diff --git a/umap/locale/pt/LC_MESSAGES/django.mo b/umap/locale/pt/LC_MESSAGES/django.mo index cf12a944..150e402b 100644 Binary files a/umap/locale/pt/LC_MESSAGES/django.mo and b/umap/locale/pt/LC_MESSAGES/django.mo differ diff --git a/umap/locale/pt/LC_MESSAGES/django.po b/umap/locale/pt/LC_MESSAGES/django.po index 4ea52655..031dfcb8 100644 --- a/umap/locale/pt/LC_MESSAGES/django.po +++ b/umap/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: uMap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-10 14:50+0100\n" -"PO-Revision-Date: 2014-02-10 13:50+0000\n" +"POT-Creation-Date: 2014-02-10 21:29+0100\n" +"PO-Revision-Date: 2014-02-10 20:29+0000\n" "Last-Translator: yohanboniface \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/umap/language/pt/)\n" "MIME-Version: 1.0\n" @@ -17,15 +17,19 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: views.py:154 templates/leaflet_storage/map_list.html:7 +msgid "by" +msgstr "" + +#: views.py:158 +msgid "View the map" +msgstr "" + #: templates/auth/user_detail.html:7 #, python-format msgid "Browse %(current_user)s's maps" msgstr "Consulta os mapas de %(current_user)s" -#: templates/leaflet_storage/map_list.html:7 -msgid "by" -msgstr "" - #: templates/leaflet_storage/map_list.html:11 msgid "More" msgstr "Mais" diff --git a/umap/views.py b/umap/views.py index 79888678..a28c526f 100644 --- a/umap/views.py +++ b/umap/views.py @@ -8,6 +8,8 @@ from django.contrib.gis.measure import D from django.conf import settings from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.http import HttpResponse +from django.utils.translation import ugettext as _ +from django.core.urlresolvers import reverse from sesql.shortquery import shortquery @@ -145,7 +147,15 @@ class MapsShowCase(View): maps = Map.public.filter(center__distance_gt=(DEFAULT_CENTER, D(km=1))).order_by('-modified_at')[:2000] def make(m): - description = u"{}\n\n[[{}|{}]]".format(m.description or "", m.get_absolute_url(), "View the map") + description = m.description or "" + if m.owner: + description = u"{description}\n{by} [[{url}|{name}]]".format( + description=description, + by=_("by"), + url=reverse('user_maps', kwargs={"username": m.owner.username}), + name=m.owner, + ) + description = u"{}\n[[{}|{}]]".format(description, m.get_absolute_url(), _("View the map")) geometry = m.settings['geometry'] if "geometry" in m.settings else simplejson.loads(m.center.geojson) return { "type": "Feature",