Commits

Yohan Boniface committed 2d979d6

Add a message explaining anonymous map in creation form

Plus more translations.

Comments (0)

Files changed (5)

leaflet_storage/forms.py

     def __init__(self, *args, **kwargs):
         super(AnonymousMapPermissionsForm, self).__init__(*args, **kwargs)
         full_secret_link = "%s%s" % (settings.SITE_URL, self.instance.get_anonymous_edit_url())
-        help_text = 'Secret edit link is %s' % full_secret_link
+        help_text = _('Secret edit link is %s') % full_secret_link
         self.fields['edit_status'].help_text = _(help_text)
 
     STATUS = (
Add a comment to this file

leaflet_storage/locale/fr/LC_MESSAGES/django.mo

Binary file modified.

leaflet_storage/locale/fr/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-05 00:43+0100\n"
+"POT-Creation-Date: 2013-05-01 07:21-0400\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: base_models.py:12
+#: base_models.py:16
 msgid "name"
 msgstr "nom"
 
-#: base_models.py:26
+#: base_models.py:31
 msgid "details"
 msgstr "détails"
 
-#: base_models.py:27
+#: base_models.py:32
 msgid "Link to a page where the licence is detailed."
 msgstr "Lien vers une page détaillant la licence."
 
-#: base_models.py:38
+#: base_models.py:43
 msgid "No licence set"
 msgstr "Aucune licence"
 
-#: base_models.py:45
+#: base_models.py:50
 msgid "URL template using OSM tile format"
 msgstr "Template d'URL au format OSM"
 
-#: base_models.py:71
+#: base_models.py:76 forms.py:116
 msgid "Everyone can edit"
 msgstr "Tout le monde peut éditer"
 
-#: base_models.py:72
+#: base_models.py:77
 msgid "Only editors can edit"
 msgstr "Seuls les éditeurs peuvent éditer"
 
-#: base_models.py:73
+#: base_models.py:78
 msgid "Only owner can edit"
 msgstr "Seul le créateur peut modifier"
 
-#: base_models.py:76 base_models.py:151 base_models.py:221
+#: base_models.py:81 base_models.py:222 base_models.py:268
 msgid "description"
 msgstr "description"
 
-#: base_models.py:77
+#: base_models.py:82
 msgid "center"
 msgstr "centre"
 
-#: base_models.py:78
+#: base_models.py:83
 msgid "zoom"
 msgstr "zoom"
 
-#: base_models.py:79
+#: base_models.py:84
 msgid "locate"
 msgstr "géolocaliser"
 
-#: base_models.py:79
+#: base_models.py:84
 msgid "Locate user on load?"
 msgstr "Géolocaliser l'utilisateur au chargement?"
 
-#: base_models.py:82
+#: base_models.py:87
 msgid "Choose the map licence."
 msgstr "Chosir une licence pour la carte"
 
-#: base_models.py:83
+#: base_models.py:88
 msgid "licence"
 msgstr "licence"
 
-#: base_models.py:88
+#: base_models.py:94
 msgid "owner"
 msgstr "créateur"
 
-#: base_models.py:89
+#: base_models.py:95
 msgid "editors"
 msgstr "éditeurs"
 
-#: base_models.py:90
+#: base_models.py:96
 msgid "edit status"
 msgstr "statut d'édition"
 
-#: base_models.py:156
-msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
-msgstr "Doit être une chaîne CSS valide (ex. DarkBlud ou #123456)"
+#: base_models.py:97
+msgid "settings"
+msgstr "réglages"
 
-#: base_models.py:157 base_models.py:227
-msgid "color"
-msgstr "couleur"
+#: base_models.py:144
+#, python-format
+msgid "Your anonymous map has been attached to your account %s"
+msgstr "La carte a été associée à votre compte %s"
 
-#: base_models.py:163
+#: base_models.py:199
 msgid "pictogram"
 msgstr "picto"
 
-#: base_models.py:173
+#: base_models.py:206
+msgid "icon type"
+msgstr "Type d'icone"
+
+#: base_models.py:207
+msgid "Choose the style of the marker."
+msgstr "Choisir le style du marqueur"
+
+#: base_models.py:224 base_models.py:271
+msgid "options"
+msgstr "options"
+
+#: base_models.py:227
 msgid "display on load"
 msgstr "afficher au chargement."
 
-#: base_models.py:174
+#: base_models.py:228
 msgid "Display this category on load."
 msgstr "Afficher cette catégorie au chargement."
 
-#: base_models.py:179
-msgid "Rank to order the categories"
-msgstr "Rang pour trier les catégories."
-
-#: base_models.py:180
-msgid "rank"
-msgstr "rang"
-
-#: base_models.py:211
+#: base_models.py:258
 msgid "My data"
 msgstr "Mes données"
 
-#: base_models.py:228
-msgid "Optional. Uses category color if not set. "
-msgstr "Laisser vide pour utiliser la couleur de la catégorie."
-
-#: base_models.py:230 forms.py:105
+#: base_models.py:270 forms.py:149
 msgid "category"
 msgstr "catégorie"
 
-#: forms.py:64
-msgid "You already have a map with this name."
-msgstr "Vous avez déjà une carte portant ce nom."
+#: forms.py:112
+#, python-format
+msgid "Secret edit link is %s"
+msgstr "Lien d'édition secret: %s"
+
+#: forms.py:117
+msgid "Only editable with secret edit link"
+msgstr "Editable seulement avec le lien d'édition secret"
 
-#: forms.py:102
+#: forms.py:141
 msgid "Content type"
 msgstr "Type de contenu"
 
-#: forms.py:103
+#: forms.py:142
 msgid "file"
 msgstr "fichier"
 
-#: forms.py:104
+#: forms.py:145
 msgid "URL"
 msgstr "URL"
 
-#: forms.py:128
+#: forms.py:146
+msgid "Supported values that will dynamically replaced: "
+msgstr "Valeurs qui seront dynamiquement remplacées: "
+
+#: forms.py:169
 msgid "Unable to fetch content from URL."
 msgstr "Impossible de récupérer le contenu de cette URL."
 
-#: forms.py:140
+#: forms.py:181
 msgid "You must provide an URL or a file."
 msgstr "Vous devez définir au moins une URL ou un fichier."
 
-#: forms.py:142
+#: forms.py:183
 msgid "You can't provide both a file and an URL."
 msgstr "Vous ne pouvez pas définir à la fois une URL et un fichier."
 
-#: forms.py:154
+#: forms.py:195
 #, python-format
 msgid "Unsupported content_type: %s"
 msgstr "Content-Type non pris en charge: %s"
 
-#: forms.py:159
+#: forms.py:200
 #, python-format
 msgid "Invalid %(content_type)s"
 msgstr "Fichier %(content_type)s invalide"
 
-#: views.py:189
+#: forms.py:209
+msgid "Path smooth factor"
+msgstr ""
+
+#: forms.py:210
+msgid ""
+"How much to simplify the polyline on each zoom level (more = better "
+"performance and smoother look, less = more accurate)"
+msgstr ""
+"Valeur de simplification des lignes pour chaque niveau de zoom (grand nombre "
+"= meilleure performance, petit nombre = plus précis)"
+
+#: forms.py:217
+msgid "Path opacity"
+msgstr "Opacité du trait"
+
+#: forms.py:218
+msgid "Opacity, from 0.1 to 1.0 (opaque)."
+msgstr "Opacité, de 0.1 à 1.0 (opaque)"
+
+#: forms.py:223
+msgid "Polygon stroke"
+msgstr "Contour du polygon"
+
+#: forms.py:224
+msgid "Whether to display or not the Polygon path."
+msgstr "Afficher ou non le trait du polygon"
+
+#: forms.py:230
+msgid "Path weight"
+msgstr "Épaisseur du trait"
+
+#: forms.py:231
+msgid "Path weight in pixels. Max: 10."
+msgstr "Épaisseur du trait, en pixels. Max: 10."
+
+#: forms.py:236
+msgid "Path fill"
+msgstr "Coloriage du fond"
+
+#: forms.py:237
+msgid "Whether to fill the path with color."
+msgstr "Colorier la fond"
+
+#: forms.py:243
+msgid "Fill opacity"
+msgstr "Opacité du fond"
+
+#: forms.py:244
+msgid "Fill opacity, from 0.1 to 1.0 (opaque)."
+msgstr "Opacité du fond, de 0.1 à 1.0 (opaque)."
+
+#: forms.py:248
+#, fuzzy
+msgid "Fill color"
+msgstr "couleur"
+
+#: forms.py:249
+#, fuzzy
+msgid "Optional. Same as color if not set."
+msgstr "Laisser vide pour utiliser la couleur de la catégorie."
+
+#: forms.py:253
+msgid "Dash array"
+msgstr "Pointillés du trait"
+
+#: forms.py:254
+msgid "A string that defines the stroke dash pattern. Ex.: '5, 10, 15'."
+msgstr "Une chaîne définissant les pointillés du trait. Ex: '5, 10, 15'."
+
+#: forms.py:262 forms.py:279
+msgid "color"
+msgstr "couleur"
+
+#: forms.py:263
+msgid "Must be a CSS valid name (eg.: DarkBlue or #123456)"
+msgstr "Doit être une chaîne CSS valide (ex. DarkBlud ou #123456)"
+
+#: forms.py:280
+msgid "Optional. Category color is used if not set."
+msgstr "Laisser vide pour utiliser la couleur de la catégorie."
+
+#: forms.py:324
+msgid "Do you want to display the locate control?"
+msgstr "Voulez-vous affichez le bouton de géolocalisation?"
+
+#: forms.py:325
+msgid "Do you want to display the 'quick search' control?"
+msgstr "Voulez-vous afficher le bouton de recherche rapide?"
+
+#: forms.py:326
+msgid "Do you want to display the 'back to home page' control?"
+msgstr "Voulez-vous affichez le bouton de retour à la page d'accueil?"
+
+#: forms.py:327
+msgid "Do you want to display the embed control?"
+msgstr "Voulez-vous afficher le bouton d'export?"
+
+#: forms.py:328
+msgid "Do you want to display the scale control?"
+msgstr "Voulez-vous afficher l'échelle?"
+
+#: forms.py:329
+msgid "Do you want to locate user on load?"
+msgstr "Géolocaliser l'utilisateur au chargement?"
+
+#: forms.py:330
+msgid "Do you want to display a minimap?"
+msgstr "Voulez-vous afficher la minicarte?"
+
+#: forms.py:331
+msgid "Do you want to display control with links to edit in OSM?"
+msgstr "Voulez-vous afficher le bouton d'édition dans OSM?"
+
+#: forms.py:332
+msgid "Do you want to enable Marker drawing?"
+msgstr "Autoriser l'ajout de marqueurs?"
+
+#: forms.py:333
+msgid "Do you want to enable Polyline drawing?"
+msgstr "Autoriser l'ajout de lignes?"
+
+#: forms.py:334
+msgid "Do you want to enable Polygon drawing?"
+msgstr "Autoriser l'ajout de polygones?"
+
+#: views.py:161
+#, python-format
+msgid ""
+"Your map has been created! If you want to edit this map from another "
+"computer, please use this link: %(anonymous_url)s"
+msgstr ""
+"Votre carte a été créée! Si vous souhaitez l'éditer depuis un autre "
+"ordinateur, veuillez utiliser ce lien: %(anonymous_url)s"
+
+#: views.py:166
+msgid ""
+"Congratulations, your map has been created! To start editing, click on the "
+"pen icon."
+msgstr ""
+"Votre carte a été créée! Pour commencer à la modifier, cliquez sur le stylo."
+
+#: views.py:211
 msgid "Zoom and center updated with success!"
 msgstr "Zoom et centre mis à jour!"
 
-#: views.py:207
+#: views.py:234
 msgid "Map editors updated with success!"
 msgstr "Éditeurs de la carte mis à jour!"
 
-#: views.py:373
+#: views.py:437
 msgid "Only its owner can delete the map."
 msgstr "Seul le créateur de la carte peut la supprimer."
 
 #. Translators: "feature" is a feature type: Marker, Polyline, Polygon
-#: views.py:498
+#: views.py:601
 #, python-format
 msgid "%(feature)s successfully deleted."
 msgstr "%(feature)s supprimé(e)."
 
-#: views.py:643
+#: views.py:752
 msgid "Category successfully deleted."
 msgstr "Catégorie supprimée."
 
 #: templates/leaflet_storage/category_confirm_delete.html:2
 #: templates/leaflet_storage/category_form.html:7
 #: templates/leaflet_storage/feature_confirm_delete.html:2
-#: templates/leaflet_storage/feature_form.html:7
+#: templates/leaflet_storage/feature_form.html:8
 #: templates/leaflet_storage/map_confirm_delete.html:2
-#: templates/leaflet_storage/map_form.html:6
+#: templates/leaflet_storage/map_form.html:9
 msgid "Delete"
 msgstr "Supprimer"
 
 #: templates/leaflet_storage/category_confirm_delete.html:4
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "This will also delete all the %(category_count)s feature(s) of this category."
 msgstr ""
-"Ceci va aussi supprimer les %(category_count)s catégorie(s) de cette carte "
-"et leurs POI."
+"Ceci va aussi supprimer le(s) %(category_count)s POI(s) de cette catégorie."
 
 #: templates/leaflet_storage/category_confirm_delete.html:9
 #: templates/leaflet_storage/feature_confirm_delete.html:6
 msgid "yes"
 msgstr "oui"
 
+#: templates/leaflet_storage/login_popup_end.html:2
+msgid "You are logged in. Continuing..."
+msgstr "Vous êtes maintenant identifiés. Merci de patienter..."
+
 #: templates/leaflet_storage/map_confirm_delete.html:4
 #, python-format
 msgid ""
 msgid "Embed this map"
 msgstr "Exporter cette carte"
 
+#: templates/leaflet_storage/map_embed.html:4
+msgid "Short URL"
+msgstr "URL courte"
+
+#: templates/leaflet_storage/map_form.html:6
+msgid ""
+"You are creating a map without being authenticated. A cookie will be set on "
+"this browser to make possible for you to edit the map in the future. If you "
+"want to edit the map from another computer, use the \"edit url\" displayed "
+"in the \"permissions\" window. If you log in and load the map, the map will "
+"be attached to your account."
+msgstr ""
+"Vous créez une carte sans être authentifié. Un cookie sera enregistré sur ce "
+"navigateur, vous permettant d'éditer la map plus tard. Si vous voulez éditer "
+"la carte depuis un autre ordinateur, utilisez l'url d'édition, visible dans "
+"la fenêtre de gestion des permissions. Si vous vous identifiez par la suite "
+"et chargez la carte, celle-ci sera automatiquement associée à votre compte."
+
 #: templates/leaflet_storage/map_infos.html:8
 msgid "User content credits"
 msgstr "Crédits des POI de la carte"
 msgid "Map permissions"
 msgstr "Permissions de la carte"
 
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr "Réglages de la carte"
+
 #: templates/leaflet_storage/upload_form.html:2
 msgid "Upload features"
 msgstr "Importer des POI"
 
 #: templates/registration/login.html:4
 msgid "Your username and password didn't match. Please try again."
-msgstr "Nom d'utilisateur ou mot de passe incorrect. Merci de corriger."
+msgstr "Nom d'utilisateur ou mot de passe incorrect. Merci de corriger."
+
+#~ msgid "Rank to order the categories"
+#~ msgstr "Rang pour trier les catégories."
+
+#~ msgid "rank"
+#~ msgstr "rang"
+
+#~ msgid "You already have a map with this name."
+#~ msgstr "Vous avez déjà une carte portant ce nom."

leaflet_storage/templates/leaflet_storage/map_form.html

 <form action="." method="post">
     {{ form }}
     <input type="submit" />
+    {% if not map and not user.is_authenticated %}
+    <small class="helptext">{% trans 'You are creating a map without being authenticated. A cookie will be set on this browser to make possible for you to edit the map in the future. If you want to edit the map from another computer, use the "edit url" displayed in the "permissions" window. If you log in and load the map, the map will be attached to your account.' %}</small>
+    {% endif %}
     {% if delete_url and map and user == map.owner %}
         <a href="{{ delete_url }}" id="delete_map_button" >{% trans "Delete" %}</a>
     {% endif %}

leaflet_storage/views.py

         if not self.request.user.is_authenticated():
             key, value = self.object.signed_cookie_elements
             response.set_signed_cookie(key, value)
+            anonymous_url = "%s%s" % (
+                settings.SITE_URL,
+                self.object.get_anonymous_edit_url()
+            )
             msg = _(
                 "Your map has been created! If you want to edit this map from "
-                "another computer, please use this link: %s%s" % (
-                    settings.SITE_URL,
-                    self.object.get_anonymous_edit_url()
-                )
+                "another computer, please use this link: %(anonymous_url)s"
+                % {"anonymous_url": anonymous_url}
             )
         else:
             msg = _("Congratulations, your map has been created! To start editing, click on the pen icon.")
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.