Donner explicitement le lien à distribuer (bug 479) + traductions

apache/settings.py-dp

@@ -21,6 +21,8 @@ DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
+SITE = 'http://nuages.domainepublic.net/'
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.

locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-21 21:53+0200\n"
+"POT-Creation-Date: 2010-06-21 23:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,8 +29,8 @@ msgid ""
 "Create polls easily, and publish them for your mates. You may poll on dates "
 "or any subject, in order to plan meetings or get a group opinion."
 msgstr ""
-"Créez facilement des sondages en ligne et publiez les à vos amis. Vous pouvez "
-"sonder pour un rendez-vous sur un quelconque sujet."
+"Créez facilement des sondages en ligne et publiez les à vos amis. Vous "
+"pouvez sonder pour un rendez-vous sur un quelconque sujet."
 
 #: templates/index.html:17
 msgid "New poll"
@@ -83,3 +83,23 @@ msgstr "Nous avons une page de projet à"
 #: templates/nuages.html:12
 msgid "Sources are freely available under"
 msgstr "Les sources sont libre sous"
+
+#: templates/sondage/poll_detail.html:8
+msgid "Posted by"
+msgstr "Posté par"
+
+#: templates/sondage/poll_detail.html:8
+msgid "Shared address"
+msgstr "Adresse partagée"
+
+#: templates/sondage/poll_detail.html:28
+msgid "Point colums to see choice details and comments"
+msgstr "Pointez les colones pour faire apparaître les détails"
+
+#: templates/sondage/poll_detail.html:101
+msgid ""
+"Check the boxes for positive answers, you may provide a comment for each "
+"choice"
+msgstr ""
+"Cochez les boîtes pour des réponses positives, vous pouvez laisser un commentaire pour "
+"chaque vote"

settings.py

@@ -20,6 +20,8 @@ DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
+SITE = 'http://127.0.0.1:8000/' 
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.

sondage/views.py

@@ -12,6 +12,8 @@ from nuage.sondage.models import Poll, Choice, Vote, Bulletin
 from nuage.sondage.forms import PollForm, ChoiceForm, VoteForm, BulletinForm
 from django.views.generic.create_update import update_object
 from django.contrib.auth.decorators import login_required
+#from django.contrib.sites.models import Site
+from django.conf import settings
 
 def new(request):
 
@@ -254,6 +256,7 @@ def vote(request, poll_id):
                     pass
 
     form = BulletinForm(instance=poll,initial={'voter': voter})
-    return render_to_response('sondage/poll_detail.html', {'object': poll, 'form': form, 'vforms':vforms, 'error_message':error_message}, context_instance=RequestContext(request))
+    current_site = settings.SITE + poll.id
+    return render_to_response('sondage/poll_detail.html', {'object': poll, 'form': form, 'vforms':vforms, 'error_message':error_message, 'current_site': current_site}, context_instance=RequestContext(request))
 
 

static/css/nuages.css

@@ -164,7 +164,7 @@ form label {
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     border: 1px solid #ddd;
-    background-color: #fff;
+    background-color: #efefff;
     text-align: right;
     font-size: 11px;
 }

templates/sondage/poll_detail.html

 {% extends "base.html" %}
+{% load i18n %}
 
-{% block title %}nuage - {{object}}{% endblock %}
-
-
+{% block title %}nuages - {{object}}{% endblock %}
 
 {% block chapeau %}
     <h3>{{object}}</h3>
-    <p class="info">{{object.description}} <br />Posted by <code>{{object.author}}</code> on <code>{{object.pub_date}}</code></p>
+    <p class="info">{{object.description}} <br />{% trans "Posted by" %} <code>{{object.author}}</code> on <code>{{object.pub_date}}</code>. {% trans "Shared address" %}: <input type="text" name="link" value="{{ current_site }}" readonly="readonly" /> </p>
 
 {% endblock %}
 
@@ -26,7 +25,7 @@
             <td></td>
             <td>
                 <div class="blue" style="text-align:left">
-                    <small>Point colums to see choice details and comments</small><br/>
+                    <small>{% trans "Point colums to see choice details and comments" %}</small><br/>
                 </div>      
             </td>
         </tr>
@@ -99,7 +98,7 @@
             <td></td>
             <td>
                 <div class="blue" style="text-align:left">
-                    <small>Check the boxes for positive answers, you may provide a comment for each choice</small><br/>
+                    <small>{% trans "Check the boxes for positive answers, you may provide a comment for each choice" %}</small><br/>
                     <input type="submit" value="vote" />
                 </div>
         

urls.py

@@ -18,7 +18,6 @@ poll_dict = {
     'post_save_redirect' : '/'
 }
 
-
 urlpatterns = patterns('',
     # Example:
     # (r'^nuage/', include('nuage.foo.urls')),