Commit 87bcac37 authored by Christophe Siraut's avatar Christophe Siraut

Better internationalization.

parent 862b65ac
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-13 10:04+0200\n"
"POT-Creation-Date: 2013-05-13 15:04+0200\n"
"PO-Revision-Date: 2010-10-24 22:27+0100\n"
"Last-Translator: Christophe Siraut <chris@tobald.eu.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -54,35 +54,35 @@ msgstr ""
"Vous n'êtes pas authentifié et ne pourrez donc pas modifier le sondage après "
"sa création ou recevoir des notifications."
#: meetingpoll/views.py:114
#: meetingpoll/views.py:110
msgid "There are some errors in the form you posted."
msgstr ""
#: meetingpoll/views.py:214
#: meetingpoll/views.py:210
msgid "Your vote has been counted, thank you."
msgstr "Votre vote a été compté, merci."
#: meetingpoll/views.py:216
#: meetingpoll/views.py:212
msgid "Your vote has been updated, thank you."
msgstr "Votre vote a été mis-à-jour, merci."
#: meetingpoll/views.py:224 meetingpoll/views.py:226
#: meetingpoll/views.py:220 meetingpoll/views.py:222
msgid "Did you forget to provide your name?"
msgstr "Auriez-vous oublié de renseigner votre nom?"
#: meetingpoll/views.py:227
#: meetingpoll/views.py:223
msgid "your name"
msgstr "votre nom:"
#: meetingpoll/views.py:242
#: meetingpoll/views.py:238
msgid "You have voted."
msgstr "Vous avez voté."
#: meetingpoll/views.py:256
#: meetingpoll/views.py:252
msgid "Login let you modify your vote anytime."
msgstr "S'authentifier permet de modifier le vote ulterieurement."
#: meetingpoll/views.py:264
#: meetingpoll/views.py:260
#, python-format
msgid "%s has voted"
msgstr "%s a voté."
......@@ -104,93 +104,34 @@ msgstr "Sondages"
msgid "There are no polls available."
msgstr "Il n'y a aucun sondage disponible"
#: registration/admin.py:23
msgid "Activate users"
msgstr ""
#: registration/admin.py:43
msgid "Re-send activation emails"
msgstr ""
#: registration/forms.py:35 templates/index.html:51
msgid "Username"
msgstr "Nom d'utilisateur"
#: registration/forms.py:36
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
msgstr ""
#: registration/forms.py:39
msgid "E-mail"
msgstr ""
#: registration/forms.py:41
#, fuzzy
msgid "Password"
msgstr "Le mot-de-passe a été changé."
#: registration/forms.py:43
#, fuzzy
msgid "Password (again)"
msgstr "Le mot-de-passe a été changé."
#: registration/forms.py:53
msgid "A user with that username already exists."
msgstr ""
#: registration/forms.py:67
msgid "The two password fields didn't match."
msgstr ""
#: registration/forms.py:78
msgid "I have read and agree to the Terms of Service"
msgstr ""
#: registration/forms.py:79
msgid "You must agree to the terms to register"
msgstr ""
#: templates/base.html:4 templates/base.html.py:6
msgid "Easy poll sharing"
msgstr "Rendez-vous partagés"
#: registration/forms.py:95
#: templates/base.html:6 templates/index.html:9
msgid ""
"This email address is already in use. Please supply a different email "
"address."
"Create polls easily, and publish them for your mates, in order to plan "
"meetings and activities."
msgstr ""
"Créez des sondages facilement et publiez les à vos proches afin de planifier "
"vos activités."
#: registration/forms.py:122
#: templates/base.html:7
msgid ""
"Registration using free email addresses is prohibited. Please supply a "
"different email address."
msgstr ""
#: registration/models.py:176
msgid "user"
msgstr ""
#: registration/models.py:177
msgid "activation key"
msgstr ""
#: registration/models.py:182
msgid "registration profile"
msgstr ""
#: registration/models.py:183
msgid "registration profiles"
"meeting, shared, poll, plan, GPL, alternative, free, django, domaine public"
msgstr ""
"rendez-vous, partagé, sondage, planifier, GPL, alternative, gratuit, django, "
"domaine public"
#: templates/base.html:8
msgid "Easy poll sharing"
msgstr "Rendez-vous partagés"
#: templates/base.html:34 templates/index.html:55
#: templates/base.html:32 templates/index.html:47
msgid "Logout"
msgstr "Se déconnecter"
#: templates/base.html:36
#: templates/base.html:34
msgid "Login"
msgstr "S'authentifier"
#: templates/base.html:65
#: templates/base.html:63
msgid "Nuages is brought to you by"
msgstr "Un outil proposé par"
......@@ -198,71 +139,67 @@ msgstr "Un outil proposé par"
msgid "Send"
msgstr "Envoyer"
#: templates/index.html:17
msgid ""
"Create polls easily, and publish them for your mates, in order to plan "
"meetings or else."
msgstr ""
"Créez des sondages facilement et publiez les à vos proches afin de planifier "
"vos activités."
#: templates/index.html:23
#: templates/index.html:15
msgid "Make an event"
msgstr "Lancer un sondage"
#: templates/index.html:23
#: templates/index.html:15
msgid "Shedule an event"
msgstr "Lancer un sondage"
#: templates/index.html:25
#: templates/index.html:17
msgid "About nuages"
msgstr "À propos de nuages"
#: templates/index.html:25
#: templates/index.html:17
msgid "Learn more"
msgstr "En savoir plus"
#: templates/index.html:32
#: templates/index.html:24
msgid "My polls"
msgstr "Mes sondages"
#: templates/index.html:39
#: templates/index.html:31
msgid "edit"
msgstr "éditer"
#: templates/index.html:40
#: templates/index.html:32
msgid "Are you sure you want to delete this poll?"
msgstr "Êtes-vous sûre de vouloir supprimer ce sondage?"
#: templates/index.html:40
#: templates/index.html:32
msgid "delete"
msgstr "supprimer"
#: templates/index.html:44
#: templates/index.html:36
msgid "No poll created yet."
msgstr "Aucun sondage créé jusqu'à présent."
#: templates/index.html:49
#: templates/index.html:41
msgid "My account"
msgstr "Mon compte"
#: templates/index.html:52
#: templates/index.html:43
msgid "Username"
msgstr "Nom d'utilisateur"
#: templates/index.html:44
msgid "Email notifications"
msgstr "Notification par email"
#: templates/index.html:53
#: templates/index.html:45
msgid "Change password"
msgstr "Changer de mot-de-passe"
#: templates/index.html:54
#: templates/index.html:46
msgid "Change email address"
msgstr "Changer d'adresse email"
#: templates/index.html:58
#: templates/index.html:50
msgid "Examples"
msgstr "Examples"
#: templates/index.html:69
#: templates/index.html:61
msgid "This page is available in the following languages"
msgstr "Cette page est disponible dans les langues suivantes"
......@@ -331,13 +268,12 @@ msgid "Step 2 : Manage choices"
msgstr "Etape 2: Choisir les dates proposées"
#: templates/meetingpoll/choice_form.html:108
#, fuzzy
msgid ""
"Provide possible dates for your meeting. You may adjust the time and add "
"other details in the text field"
"other details in the text field."
msgstr ""
"Proposez quelques dates pour votre rendez-vous. Vous pouvez ajouter l'heure, "
"le lieu ou autre dans le champ \"détails\"."
"Proposez quelques dates pour votre rendez-vous. Vous pouvez ajuster l'heure "
"et ajouter d'autres détails dans le champ texte."
#: templates/meetingpoll/choice_form.html:120
msgid "Dates"
......@@ -498,88 +434,3 @@ msgstr ""
#: templates/registration/registration_complete.html:5
msgid "You are now registered. Activation email sent."
msgstr "Vous êtes maintenant enregistré. Un email d'activation a été envoyé."
#: tracking/models.py:63
msgid "unknown"
msgstr ""
#: tracking/models.py:108
msgid "keyword"
msgstr ""
#: tracking/models.py:108
msgid ""
"Part or all of a user-agent string. For example, \"Googlebot\" here will be "
"found in \"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/"
"bot.html)\" and that visitor will not be tracked."
msgstr ""
#: tracking/models.py:115
msgid "Untracked User-Agent"
msgstr ""
#: tracking/models.py:116
msgid "Untracked User-Agents"
msgstr ""
#: tracking/models.py:119
msgid "The IP address that should be banned"
msgstr ""
#: tracking/models.py:126
msgid "Banned IP"
msgstr ""
#: tracking/models.py:127
msgid "Banned IPs"
msgstr ""
#: tracking/views.py:90
#, python-format
msgid "%(minutes)i minute"
msgid_plural "%(minutes)i minutes"
msgstr[0] ""
msgstr[1] ""
#: tracking/views.py:96
#, python-format
msgid "%(seconds)i second"
msgid_plural "%(seconds)i seconds"
msgstr[0] ""
msgstr[1] ""
#: tracking/templates/tracking/_active_users.html:2
#, python-format
msgid "1 active user"
msgid_plural "%(counter)s active users"
msgstr[0] ""
msgstr[1] ""
#: tracking/templates/tracking/_active_users.html:5
#, python-format
msgid "1 guest user"
msgid_plural "%(counter)s guest users"
msgstr[0] ""
msgstr[1] ""
#: tracking/templates/tracking/_active_users.html:15
#, python-format
msgid "1 registered user"
msgid_plural "%(counter)s registered users"
msgstr[0] ""
msgstr[1] ""
#: tracking/templates/tracking/visitor_map.html:4
msgid "Active Visitors Map"
msgstr ""
#: tracking/templates/tracking/visitor_map.html:15
msgid "Active Users"
msgstr ""
#: tracking/templates/tracking/visitor_map.html:18
msgid ""
"Below is a map and a list of recently active users on this site. It updates "
"itself every 5 seconds or so, adding and removing pins in the map as "
"necessary. Stick around for a few minutes to see it in action!"
msgstr ""
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-13 10:04+0200\n"
"POT-Creation-Date: 2013-05-13 15:04+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"
......@@ -59,36 +59,36 @@ msgstr ""
"login / \"> login </ a> of <a href=\"/user/registration/\"> registreer </ a> "
"eerste) "
#: meetingpoll/views.py:114
#: meetingpoll/views.py:110
msgid "There are some errors in the form you posted."
msgstr ""
#: meetingpoll/views.py:214
#: meetingpoll/views.py:210
msgid "Your vote has been counted, thank you."
msgstr ""
#: meetingpoll/views.py:216
#: meetingpoll/views.py:212
msgid "Your vote has been updated, thank you."
msgstr ""
#: meetingpoll/views.py:224 meetingpoll/views.py:226
#: meetingpoll/views.py:220 meetingpoll/views.py:222
msgid "Did you forget to provide your name?"
msgstr ""
#: meetingpoll/views.py:227
#: meetingpoll/views.py:223
#, fuzzy
msgid "your name"
msgstr "Uw naam:"
#: meetingpoll/views.py:242
#: meetingpoll/views.py:238
msgid "You have voted."
msgstr ""
#: meetingpoll/views.py:256
#: meetingpoll/views.py:252
msgid "Login let you modify your vote anytime."
msgstr ""
#: meetingpoll/views.py:264
#: meetingpoll/views.py:260
#, python-format
msgid "%s has voted"
msgstr ""
......@@ -112,95 +112,34 @@ msgstr "Mijn polls"
msgid "There are no polls available."
msgstr "Geen poll is beschikbaar"
#: registration/admin.py:23
msgid "Activate users"
msgstr ""
#: registration/admin.py:43
msgid "Re-send activation emails"
msgstr ""
#: registration/forms.py:35 templates/index.html:51
msgid "Username"
msgstr "Gebruikersnaam"
#: registration/forms.py:36
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
msgstr ""
#: registration/forms.py:39
#, fuzzy
msgid "E-mail"
msgstr "Email"
#: registration/forms.py:41
msgid "Password"
msgstr "Wachtwoord"
#: registration/forms.py:43
#, fuzzy
msgid "Password (again)"
msgstr "Password (bevestiging)"
#: registration/forms.py:53
msgid "A user with that username already exists."
msgstr ""
#: templates/base.html:4 templates/base.html.py:6
msgid "Easy poll sharing"
msgstr "Eenvoudig poll publiceren"
#: registration/forms.py:67
#: templates/base.html:6 templates/index.html:9
#, fuzzy
msgid "The two password fields didn't match."
msgstr "De wachtwoorden zijn niet gelijk"
#: registration/forms.py:78
msgid "I have read and agree to the Terms of Service"
msgstr ""
#: registration/forms.py:79
msgid "You must agree to the terms to register"
msgstr ""
#: registration/forms.py:95
msgid ""
"This email address is already in use. Please supply a different email "
"address."
"Create polls easily, and publish them for your mates, in order to plan "
"meetings and activities."
msgstr ""
"Eenvoudig maak polls, publiceer ze voor je maten, om vergaderingen te "
"plannen."
#: registration/forms.py:122
#: templates/base.html:7
msgid ""
"Registration using free email addresses is prohibited. Please supply a "
"different email address."
msgstr ""
#: registration/models.py:176
msgid "user"
"meeting, shared, poll, plan, GPL, alternative, free, django, domaine public"
msgstr ""
#: registration/models.py:177
msgid "activation key"
msgstr ""
#: registration/models.py:182
msgid "registration profile"
msgstr ""
#: registration/models.py:183
msgid "registration profiles"
msgstr ""
#: templates/base.html:8
msgid "Easy poll sharing"
msgstr "Eenvoudig poll publiceren"
#: templates/base.html:34 templates/index.html:55
#: templates/base.html:32 templates/index.html:47
msgid "Logout"
msgstr "Logout"
#: templates/base.html:36
#: templates/base.html:34
#, fuzzy
msgid "Login"
msgstr "Login"
#: templates/base.html:65
#: templates/base.html:63
msgid "Nuages is brought to you by"
msgstr "Nuages is gemaakt door"
......@@ -208,72 +147,68 @@ msgstr "Nuages is gemaakt door"
msgid "Send"
msgstr ""
#: templates/index.html:17
msgid ""
"Create polls easily, and publish them for your mates, in order to plan "
"meetings or else."
msgstr ""
"Eenvoudig maak polls, publiceer ze voor je maten, om vergaderingen te "
"plannen."
#: templates/index.html:23
#: templates/index.html:15
msgid "Make an event"
msgstr "Maak een poll"
#: templates/index.html:23
#: templates/index.html:15
msgid "Shedule an event"
msgstr "Plan een meeting"
#: templates/index.html:25
#: templates/index.html:17
msgid "About nuages"
msgstr "Over Nuages"
#: templates/index.html:25
#: templates/index.html:17
msgid "Learn more"
msgstr "Leer wat meer"
#: templates/index.html:32
#: templates/index.html:24
msgid "My polls"
msgstr "Mijn polls"
#: templates/index.html:39
#: templates/index.html:31
msgid "edit"
msgstr "editeren"
#: templates/index.html:40
#: templates/index.html:32
msgid "Are you sure you want to delete this poll?"
msgstr "Bent U zeker U wil deze poll verwijderen"
#: templates/index.html:40
#: templates/index.html:32
msgid "delete"
msgstr "verwijderen"
#: templates/index.html:44
#: templates/index.html:36
#, fuzzy
msgid "No poll created yet."
msgstr "Geen poll is beschikbaar"
#: templates/index.html:49
#: templates/index.html:41
msgid "My account"
msgstr "Mijn profile"
#: templates/index.html:52
#: templates/index.html:43
msgid "Username"
msgstr "Gebruikersnaam"
#: templates/index.html:44
msgid "Email notifications"
msgstr ""
#: templates/index.html:53
#: templates/index.html:45
msgid "Change password"
msgstr "Wachtwoord wijzigen"
#: templates/index.html:54
#: templates/index.html:46
msgid "Change email address"
msgstr "Email adres wijzigen"
#: templates/index.html:58
#: templates/index.html:50
msgid "Examples"
msgstr "Voorbeelden"
#: templates/index.html:69
#: templates/index.html:61
msgid "This page is available in the following languages"
msgstr "Deze pagina is beschikbaar in de volgende talen"
......@@ -339,7 +274,7 @@ msgstr "Stap 2 : Beheer keuses"
#: templates/meetingpoll/choice_form.html:108
msgid ""
"Provide possible dates for your meeting. You may adjust the time and add "
"other details in the text field"
"other details in the text field."
msgstr ""
#: templates/meetingpoll/choice_form.html:120
......@@ -506,90 +441,30 @@ msgstr ""
msgid "You are now registered. Activation email sent."
msgstr ""
#: tracking/models.py:63
msgid "unknown"
msgstr ""
#: tracking/models.py:108
msgid "keyword"
msgstr ""
#: tracking/models.py:108
msgid ""
"Part or all of a user-agent string. For example, \"Googlebot\" here will be "
"found in \"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/"
"bot.html)\" and that visitor will not be tracked."
msgstr ""
#: tracking/models.py:115
msgid "Untracked User-Agent"
msgstr ""
#: tracking/models.py:116
msgid "Untracked User-Agents"
msgstr ""
#: tracking/models.py:119
msgid "The IP address that should be banned"
msgstr ""
#: tracking/models.py:126
msgid "Banned IP"
msgstr ""
#: tracking/models.py:127
msgid "Banned IPs"
msgstr ""
#: tracking/views.py:90
#, python-format
msgid "%(minutes)i minute"
msgid_plural "%(minutes)i minutes"
msgstr[0] ""
msgstr[1] ""
#: tracking/views.py:96
#, python-format
msgid "%(seconds)i second"
msgid_plural "%(seconds)i seconds"
msgstr[0] ""
msgstr[1] ""
#: tracking/templates/tracking/_active_users.html:2
#, python-format
msgid "1 active user"
msgid_plural "%(counter)s active users"
msgstr[0] ""
msgstr[1] ""
#, fuzzy
#~ msgid "easy poll sharing"
#~ msgstr "Eenvoudig poll publiceren"
#: tracking/templates/tracking/_active_users.html:5
#, python-format
msgid "1 guest user"
msgid_plural "%(counter)s guest users"
msgstr[0] ""
msgstr[1] ""
#, fuzzy
#~ msgid "E-mail"
#~ msgstr "Email"
#: tracking/templates/tracking/_active_users.html:15
#, fuzzy, python-format
msgid "1 registered user"
msgid_plural "%(counter)s registered users"
msgstr[0] "registreer"
msgstr[1] "registreer"
#~ msgid "Password"
#~ msgstr "Wachtwoord"
#: tracking/templates/tracking/visitor_map.html:4
msgid "Active Visitors Map"
msgstr ""
#, fuzzy
#~ msgid "Password (again)"
#~ msgstr "Password (bevestiging)"
#: tracking/templates/tracking/visitor_map.html:15
msgid "Active Users"
msgstr ""
#, fuzzy
#~ msgid "The two password fields didn't match."
#~ msgstr "De wachtwoorden zijn niet gelijk"
#: tracking/templates/tracking/visitor_map.html:18
msgid ""
"Below is a map and a list of recently active users on this site. It updates "
"itself every 5 seconds or so, adding and removing pins in the map as "
"necessary. Stick around for a few minutes to see it in action!"
msgstr ""
#, fuzzy
#~ msgid "1 registered user"
#~ msgid_plural "%(counter)s registered users"
#~ msgstr[0] "registreer"
#~ msgstr[1] "registreer"
#~ msgid "Password length is less than %(min)d"
#~ msgstr "Wachtwoord lengte is minder dan %(min)d"
......
......@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse
from django.forms.formsets import formset_factory
from django.forms.models import inlineformset_factory, BaseInlineFormSet
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render_to_response
from django.shortcuts import get_object_or_404, render_to_response, render
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
from django.views.generic.create_update import update_object
......@@ -46,10 +46,6 @@ def secure_update_object(*args, **kwargs):
"""
return update_object(*args, **kwargs)
def translation(request, lang_id):
request.session['django_language'] = lang_id
return HttpResponseRedirect('/nuages')
def get_ordereditem_formset(form, formset=BaseInlineFormSet, **kwargs):
return inlineformset_factory(Poll, Choice, form, formset, **kwargs)
......
......@@ -100,10 +100,10 @@ TEMPLATE_LOADERS = (
)
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
#'request.middleware.RequestMiddleware',
......
from django.conf.urls.defaults import *
from django.conf.urls.defaults import patterns, include, url
from django.conf.urls.i18n import i18n_patterns
from django.contrib.auth.views import login, logout
from meetingpoll.models import Poll
from meetingpoll.forms import PollForm
......@@ -22,8 +23,8 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^$', 'django.views.generic.list_detail.object_list', dict(info_dict, template_name='index.html'), name='home'),
url(r'^nuages$', 'django.views.generic.simple.direct_to_template', {'template': 'nuages.html'}, name='documentation'),