Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
etch
nuages
Commits
75d23ba9
Commit
75d23ba9
authored
Dec 06, 2011
by
Christophe Siraut
Browse files
Allow indexation of tranlated pages.
parent
cb25d01f
Changes
9
Hide whitespace changes
Inline
Side-by-side
locale/fr/LC_MESSAGES/django.mo
View file @
75d23ba9
No preview for this file type
locale/fr/LC_MESSAGES/django.po
View file @
75d23ba9
...
...
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-
03-28 17:01
+0
2
00\n"
"POT-Creation-Date: 2011-
12-06 15:58
+0
1
00\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"
...
...
@@ -172,7 +172,7 @@ msgstr "Changer d'email"
#: account/templates/account/email_change.html:8
#: account/templates/account/password_change.html:8
#: templates/sondage/choice_form.html:14
5
#: templates/sondage/choice_form.html:14
7
msgid "Save"
msgstr "Sauver"
...
...
@@ -777,6 +777,10 @@ msgstr "Se déconnecter"
msgid "Examples"
msgstr "Examples"
#: templates/index.html:69
msgid "This page is available in the following languages"
msgstr "Cette page est disponible dans les langues suivantes"
#: templates/nuages.html:6
msgid "About Nuages"
msgstr "À propos de Nuages"
...
...
@@ -833,46 +837,15 @@ msgstr "Appliquer des patches"
#: templates/nuages.html:61
msgid ""
"Anyone can directly commit to the repository. However, we ask you to send "
"bigger changes to the mailing list to discuss them first. To push to the "
"repository, you must follow this procedure:"
"Please send us a mail or join Domaine Public irc to let us know your "
"propositions."
msgstr ""
"Les contributions directes au répertoire sont possibles pour tout le monde. "
"Cependant, nous vous demandons d'envoyer les changements conséquents sur la "
"liste de discussion au préalable. Afin de de faire un push sur le "
"répertoire, les étapes suivantes sont nécessaires."
#: templates/nuages.html:63
msgid "Fetch the public commit key:"
msgstr "Télécharger la clé publique"
#: templates/nuages.html:72
msgid "Add the following section to your openssh-client config:"
msgstr "Ajoutez la section suivante à votre configuration openssh-client:"
#: templates/nuages.html:81
msgid "Check out a clone of the manual through ssh:"
msgstr "Clonez Nuages via ssh:"
#: templates/nuages.html:87
msgid ""
"After sanitizing, commit the changes. Write commit messages that consist of "
"full, useful sentences in English, starting with a capital letter and ending "
"with a full stop."
msgstr ""
"Après nettoyage, soumettre les modifications. Veuillez écrire les "
"commentaires de commit à l'aide de phrases complètes, en commençant par une "
"majuscule et en terminant par un point. "
#: templates/nuages.html:93
msgid "Push the commit to the server:"
msgstr "Envoyez votre commit au serveur:"
#: templates/sondage/choice_form.html:105
#: templates/sondage/choice_form.html:107
msgid "Step 2 : Manage choices"
msgstr "Etape 2: Choisir les dates proposées"
#: templates/sondage/choice_form.html:10
6
#: templates/sondage/choice_form.html:10
8
msgid ""
"Provide possible dates for your meeting. You may add details as meeting "
"hours, places, or else."
...
...
@@ -888,35 +861,39 @@ msgstr "Éffacer le cookie, vous ne pourrez plus modifier votre vote."
msgid "Forget me"
msgstr "Oublie-moi"
#: templates/sondage/poll_detail.html:15
#: templates/sondage/poll_detail.html:8
msgid "Export as csv spreadsheet"
msgstr ""
#: templates/sondage/poll_detail.html:16
msgid "Posted by"
msgstr "Posté par"
#: templates/sondage/poll_detail.html:1
5
#: templates/sondage/poll_detail.html:1
6
msgid "on"
msgstr "le"
#: templates/sondage/poll_detail.html:1
5
#: templates/sondage/poll_detail.html:1
6
msgid "Shared address"
msgstr "Adresse partagée"
#: templates/sondage/poll_detail.html:
49
#: templates/sondage/poll_detail.html:
52
msgid "Your name:"
msgstr "Votre nom:"
#: templates/sondage/poll_detail.html:5
6
#: templates/sondage/poll_detail.html:5
9
msgid " Check the little boxes to add positive answers "
msgstr "Cochez les boîtes pour des réponses positives "
#: templates/sondage/poll_detail.html:7
4
#: templates/sondage/poll_detail.html:7
7
msgid "Point colums to see choice details and comments"
msgstr "Pointez les colonnes pour faire apparaître les détails"
#: templates/sondage/poll_detail.html:7
5
#: templates/sondage/poll_detail.html:7
8
msgid "Check the boxes for positive answers. "
msgstr "Cochez les boîtes pour des réponses positives."
#: templates/sondage/poll_detail.html:7
5
#: templates/sondage/poll_detail.html:7
8
msgid "You may provide a comment for each choice."
msgstr "Vous pouvez ajouter un commentaire pour chaque choix."
...
...
@@ -933,8 +910,8 @@ msgstr ""
"Veuillez fournir les informations de base suivantes pour votre sondage. "
"(Vous n'êtes pas authentifiés et ne pourrez donc pas modifier le sondage "
"après sa création. Vous pouvez <a href=\"/user/login/\">vous authentifier</"
"a> ou <a href=\"/user/registration/\">vous enregistrer</a> si vous n'avez
pas
"
"encore de compte)"
"a> ou <a href=\"/user/registration/\">vous enregistrer</a> si vous n'avez "
"
pas
encore de compte)"
#: templates/sondage/poll_form.html:13
msgid "Enter basic information on your poll."
...
...
@@ -944,3 +921,34 @@ msgstr ""
#: templates/sondage/poll_form.html:25
msgid "Next"
msgstr "Suivant"
#~ msgid ""
#~ "Anyone can directly commit to the repository. However, we ask you to send "
#~ "bigger changes to the mailing list to discuss them first. To push to the "
#~ "repository, you must follow this procedure:"
#~ msgstr ""
#~ "Les contributions directes au répertoire sont possibles pour tout le "
#~ "monde. Cependant, nous vous demandons d'envoyer les changements "
#~ "conséquents sur la liste de discussion au préalable. Afin de de faire un "
#~ "push sur le répertoire, les étapes suivantes sont nécessaires."
#~ msgid "Fetch the public commit key:"
#~ msgstr "Télécharger la clé publique"
#~ msgid "Add the following section to your openssh-client config:"
#~ msgstr "Ajoutez la section suivante à votre configuration openssh-client:"
#~ msgid "Check out a clone of the manual through ssh:"
#~ msgstr "Clonez Nuages via ssh:"
#~ msgid ""
#~ "After sanitizing, commit the changes. Write commit messages that consist "
#~ "of full, useful sentences in English, starting with a capital letter and "
#~ "ending with a full stop."
#~ msgstr ""
#~ "Après nettoyage, soumettre les modifications. Veuillez écrire les "
#~ "commentaires de commit à l'aide de phrases complètes, en commençant par "
#~ "une majuscule et en terminant par un point. "
#~ msgid "Push the commit to the server:"
#~ msgstr "Envoyez votre commit au serveur:"
locale/nl/LC_MESSAGES/django.mo
View file @
75d23ba9
No preview for this file type
locale/nl/LC_MESSAGES/django.po
View file @
75d23ba9
...
...
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-1
1-26 14:13
+0100\n"
"POT-Creation-Date: 2011-1
2-06 15:58
+0100\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"
...
...
@@ -37,8 +37,8 @@ msgid ""
"You can use a-z, 0-9 and underscore. Login length could be from %(min)s to "
"%(max)s chars."
msgstr ""
"U mag a-z, 0-9 and underscore gebruiken. Gebruikersnaam kan tussen %(min)s
en
"
"%(max)s chars zijn."
"U mag a-z, 0-9 and underscore gebruiken. Gebruikersnaam kan tussen %(min)s "
"
en
%(max)s chars zijn."
#: account/forms.py:49 account/forms.py:120
msgid "Email"
...
...
@@ -699,7 +699,7 @@ msgstr "Titel"
msgid "Easy poll sharing"
msgstr "Eenvoudig poll publiceren"
#: templates/base.html:6
3
#: templates/base.html:6
2
msgid "Nuages is brought to you by"
msgstr "Nuages is gemaakt door"
...
...
@@ -707,7 +707,9 @@ msgstr "Nuages is gemaakt door"
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."
msgstr ""
"Eenvoudig maak polls, publiceer ze voor je maten, om vergaderingen te "
"plannen."
#: templates/index.html:22
msgid "Make an event"
...
...
@@ -765,6 +767,10 @@ msgstr "Logout"
msgid "Examples"
msgstr "Voorbelden"
#: templates/index.html:69
msgid "This page is available in the following languages"
msgstr "Deze pagina is beschikbaar in de volgende talen"
#: templates/nuages.html:6
msgid "About Nuages"
msgstr "Over Nuages"
...
...
@@ -776,10 +782,10 @@ msgid ""
"is easier when its cloudy. It is build in python, using the django framework "
"and a little of javascript."
msgstr ""
"Een gezamenlijke bijeenkomst poll-systeem, vergelijkbaar met doodle of rdvz.
Deze
"
"applicatie is vernoemd naar beroemde Django's lied en omdat computer
werk
"
"gemakkelijker is wanneer het bewolkt is. Het is gebouwd in python, met
behulp van het Django framework
"
"en een beetje javascript."
"Een gezamenlijke bijeenkomst poll-systeem, vergelijkbaar met doodle of rdvz. "
"
Deze
applicatie is vernoemd naar beroemde Django's lied en omdat computer "
"
werk
gemakkelijker is wanneer het bewolkt is. Het is gebouwd in python, met "
"
behulp van het Django framework
en een beetje javascript."
#: templates/nuages.html:12
msgid "Feedback and collaboration are welcome at"
...
...
@@ -884,9 +890,10 @@ msgid ""
"able to modify your poll after creation. You may <a href=\"/user/login/"
"\">login</a> or <a href=\"/user/registration/\">register</a> first)"
msgstr ""
"Geef basisinformatie over uw poll. (U bent niet ingelogd, zodat u niet "
"in staat om uw poll te wijzigen na de schepping. U kunt <a href = \" / user / login / "
"\"> login </ a> of <a href=\"/user/registration/\"> registreer </ a> eerste) "
"Geef basisinformatie over uw poll. (U bent niet ingelogd, zodat u niet in "
"staat om uw poll te wijzigen na de schepping. U kunt <a href = \" / user / "
"login / \"> login </ a> of <a href=\"/user/registration/\"> registreer </ a> "
"eerste) "
#: templates/sondage/poll_form.html:13
msgid "Enter basic information on your poll."
...
...
sondage/views.py
View file @
75d23ba9
...
...
@@ -15,13 +15,10 @@ from django.contrib.auth.decorators import login_required
from
django.conf
import
settings
def
new
(
request
):
if
request
.
method
==
'POST'
:
# If the form has been submitted...
instance
=
Poll
(
author
=
str
(
request
.
user
))
form
=
PollForm
(
request
.
POST
,
instance
=
instance
)
# A form bound to the POST data
if
form
.
is_valid
():
# All validation rules pass
poll_id
=
form
.
cleaned_data
.
get
(
'title'
)
# Process the data in form.cleaned_data
new_poll
=
form
.
save
()
...
...
@@ -48,6 +45,9 @@ 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
)
...
...
static/css/nuages.css
View file @
75d23ba9
...
...
@@ -66,7 +66,6 @@ form label {
.menu
a
{
border
:
1px
solid
#fff
;
padding
:
3px
7px
;
}
.menu
a
:hover
{
...
...
@@ -81,7 +80,7 @@ form label {
#content
{
margin-left
:
12%
;
margin-bottom
:
6
4px
;
margin-bottom
:
2
4px
;
}
.comment
{
...
...
templates/base.html
View file @
75d23ba9
...
...
@@ -59,7 +59,6 @@
<div
class=
"menu"
>
{% block footer %}{% endblock %}
<span
class=
"notify"
>
Update from 2011.11.21 allows multiple meetings scheduled on the same day. Old polls can look distorted.
</span><br
/><br
/>
<span
class=
"notify"
>
{% trans "Nuages is brought to you by" %}
<a
href=
"http://www.domainepublic.net"
>
Domaine Public
</a></span>
</div>
...
...
templates/index.html
View file @
75d23ba9
...
...
@@ -64,7 +64,13 @@
</ul>
{% endif %}
<br
/><br
/><br
/>
<br
/><br
/><br
/><br
/>
<span
class=
"notify"
style=
"font-size:0.875em"
>
{% trans "This page is available in the following languages" %}:
<a
href=
"/en/nuages"
>
English
</a>
<a
href=
"/fr/nuages"
>
Français
</a>
<a
href=
"/nl/nuages"
>
Nederlands
</a>
</span>
{% endblock %}
urls.py
View file @
75d23ba9
...
...
@@ -27,6 +27,7 @@ urlpatterns = patterns('',
(
r
'^$'
,
'django.views.generic.list_detail.object_list'
,
dict
(
info_dict
,
template_name
=
'index.html'
)),
(
r
'^nuages$'
,
'django.views.generic.simple.direct_to_template'
,
{
'template'
:
'nuages.html'
}),
(
r
'^(?P<lang_id>\w{2})/nuages$'
,
'sondage.views.translation'
),
(
r
'^(?P<poll_id>\w{4})/$'
,
'sondage.views.vote'
),
(
r
'^new/$'
,
'sondage.views.new'
),
(
r
'^(?P<object_id>\w+)/edit/$'
,
'sondage.views.secure_update_object'
,
dict
(
poll_dict
,
post_save_redirect
=
'choices/'
)),
...
...
@@ -45,7 +46,6 @@ urlpatterns = patterns('',
(
r
'^(?P<poll_id>\w{4})/clear/'
,
'sondage.userviews.clear_cookie'
),
)
from
django.conf
import
settings
if
settings
.
DEBUG
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment