소스 검색

Merge branch 'master' of github.com:denismerigoux/seum-counter

Denis Merigoux 9 년 전
부모
커밋
5a9c95d7fe
3개의 변경된 파일124개의 추가작업 그리고 167개의 파일을 삭제
  1. 5 0
      README.md
  2. 21 21
      locale/en/LC_MESSAGES/django.po
  3. 98 146
      locale/fr/LC_MESSAGES/django.po

+ 5 - 0
README.md

@@ -11,6 +11,11 @@ Then copy and paste the settings file template located in folder `seum`:
11 11
 cd seum && cp settings.py.default settings.py
12 12
 ```
13 13
 
14
+In order to use correctly the internationalisation, compile the locale files:
15
+```
16
+python manage.py compilemessages
17
+```
18
+
14 19
 ## Running the server
15 20
 
16 21
 ### Developement

+ 21 - 21
locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: PACKAGE VERSION\n"
10 10
 "Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2017-01-22 14:19+0100\n"
11
+"POT-Creation-Date: 2017-01-22 18:05+0000\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,9 +221,9 @@ msgid ""
221 221
 msgstr ""
222 222
 
223 223
 #: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
224
-#: counter/views/home.py:203 counter/views/home.py:209
225
-#: counter/views/home.py:247 counter/views/home.py:253
226
-#: counter/views/home.py:285 counter/views/home.py:291
224
+#: counter/views/home.py:200 counter/views/home.py:206
225
+#: counter/views/home.py:244 counter/views/home.py:250
226
+#: counter/views/home.py:282 counter/views/home.py:288
227 227
 msgid "Trigram"
228 228
 msgstr ""
229 229
 
@@ -490,17 +490,17 @@ msgid ""
490 490
 "password."
491 491
 msgstr ""
492 492
 
493
-#: counter/templates/resetEmail.txt:3
493
+#: counter/templates/resetEmail.txt:2
494 494
 msgid ""
495 495
 "You have lost your password and you've got the seum. You have to follow this "
496 496
 "link (or copy-paste it in your browser) to reinitialise it:"
497 497
 msgstr ""
498 498
 
499
-#: counter/templates/resetEmail.txt:7
499
+#: counter/templates/resetEmail.txt:6
500 500
 msgid "Your login is {{ user.username }} in case you have forgotten it too."
501 501
 msgstr ""
502 502
 
503
-#: counter/templates/resetEmail.txt:18
503
+#: counter/templates/resetEmail.txt:11
504 504
 msgid ""
505 505
 "P.S.: If you don't want to receive these mails anymore, contact us at denis."
506 506
 "merigoux@gmail.com"
@@ -515,50 +515,50 @@ msgstr ""
515 515
 msgid "From %(who)s: %(reason)s"
516 516
 msgstr ""
517 517
 
518
-#: counter/views/home.py:161
518
+#: counter/views/home.py:158
519 519
 #, python-format
520 520
 msgid "%(counter)s: %(reason)s"
521 521
 msgstr ""
522 522
 
523
-#: counter/views/home.py:163
523
+#: counter/views/home.py:160
524 524
 #, python-format
525 525
 msgid "%(who)s to %(counter)s: %(reason)s"
526 526
 msgstr ""
527 527
 
528
-#: counter/views/home.py:167
528
+#: counter/views/home.py:164
529 529
 msgid "Seum"
530 530
 msgstr ""
531 531
 
532
-#: counter/views/home.py:184
532
+#: counter/views/home.py:181
533 533
 msgid "24h ago"
534 534
 msgstr ""
535 535
 
536
-#: counter/views/home.py:185
536
+#: counter/views/home.py:182
537 537
 msgid "Now"
538 538
 msgstr ""
539 539
 
540
-#: counter/views/home.py:203 counter/views/home.py:208
541
-#: counter/views/home.py:228 counter/views/home.py:233
540
+#: counter/views/home.py:200 counter/views/home.py:205
541
+#: counter/views/home.py:225 counter/views/home.py:230
542 542
 msgid "Number of seums"
543 543
 msgstr ""
544 544
 
545
-#: counter/views/home.py:228 counter/views/home.py:234
545
+#: counter/views/home.py:225 counter/views/home.py:231
546 546
 msgid "Month"
547 547
 msgstr ""
548 548
 
549
-#: counter/views/home.py:247 counter/views/home.py:252
549
+#: counter/views/home.py:244 counter/views/home.py:249
550 550
 msgid "Number of given likes"
551 551
 msgstr ""
552 552
 
553
-#: counter/views/home.py:266 counter/views/home.py:272
553
+#: counter/views/home.py:263 counter/views/home.py:269
554 554
 msgid "Hashtag"
555 555
 msgstr ""
556 556
 
557
-#: counter/views/home.py:266 counter/views/home.py:271
557
+#: counter/views/home.py:263 counter/views/home.py:268
558 558
 msgid "Number of seums containing the hashtag"
559 559
 msgstr ""
560 560
 
561
-#: counter/views/home.py:285 counter/views/home.py:290
561
+#: counter/views/home.py:282 counter/views/home.py:287
562 562
 msgid "Number of received likes"
563 563
 msgstr ""
564 564
 
@@ -574,10 +574,10 @@ msgstr ""
574 574
 msgid "Use another email address, another user has already this login."
575 575
 msgstr ""
576 576
 
577
-#: seum/settings.py:111
577
+#: seum/settings.py:109
578 578
 msgid "English"
579 579
 msgstr ""
580 580
 
581
-#: seum/settings.py:112
581
+#: seum/settings.py:110
582 582
 msgid "French"
583 583
 msgstr ""

+ 98 - 146
locale/fr/LC_MESSAGES/django.po

@@ -125,6 +125,9 @@ msgstr ""
125 125
 "sera ton identité seumesque !"
126 126
 
127 127
 #: counter/templates/createUser.html:36 counter/templates/homeTemplate.html:76
128
+#: counter/views/home.py:200 counter/views/home.py:206
129
+#: counter/views/home.py:244 counter/views/home.py:250
130
+#: counter/views/home.py:282 counter/views/home.py:288
128 131
 msgid "Trigram"
129 132
 msgstr "Trigramme"
130 133
 
@@ -402,151 +405,100 @@ msgstr ""
402 405
 "Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton "
403 406
 "mot de passe."
404 407
 
405
-#~ msgid "name"
406
-#~ msgstr "nom"
407
-
408
-#~ msgid "email"
409
-#~ msgstr "email"
410
-
411
-#~ msgid "trigram"
412
-#~ msgstr "trigramme"
413
-
414
-#~ msgid "associated user"
415
-#~ msgstr "utilisateur associé"
416
-
417
-#~ msgid "email notifications"
418
-#~ msgstr "notifications par email"
419
-
420
-#~ msgid "sort by SeumScore"
421
-#~ msgstr "trier par SeumScore"
422
-
423
-#~ msgid "%(trigram)s (%(name)s)"
424
-#~ msgstr "%(trigram)s (%(name)s)"
425
-
426
-#~ msgid "counter"
427
-#~ msgstr "compteur"
428
-
429
-#~ msgid "datetime"
430
-#~ msgstr "date et heure"
431
-
432
-#~ msgid "reason"
433
-#~ msgstr "raison"
434
-
435
-#~ msgid "victim"
436
-#~ msgstr "victime"
437
-
438
-#~ msgid "seum giver"
439
-#~ msgstr "fouteur de seum"
440
-
441
-#~ msgid "%(counter)s: %(datetime)s (%(reason)s)"
442
-#~ msgstr "%(counter)s : %(datetime)s (%(reason)s)"
443
-
444
-#~ msgid "reset"
445
-#~ msgstr "remise à zéro"
446
-
447
-#~ msgid "resets"
448
-#~ msgstr "remises à zéro"
449
-
450
-#~ msgid "liker"
451
-#~ msgstr "likeur"
452
-
453
-#~ msgid "seum"
454
-#~ msgstr "seum"
455
-
456
-#~ msgid "like"
457
-#~ msgstr "like"
458
-
459
-#~ msgid "likes"
460
-#~ msgstr "likes"
461
-
462
-#~ msgid "%(liker)s likes %(reset)s"
463
-#~ msgstr "%(liker)s aime %(reset)s"
464
-
465
-#~ msgid "keyword"
466
-#~ msgstr "mot-clé"
467
-
468
-#~ msgid "keywords"
469
-#~ msgstr "mots-clés"
470
-
471
-#~ msgid "hashtag"
472
-#~ msgstr "hashtag"
473
-
474
-#~ msgid "hashtags"
475
-#~ msgstr "hashtags"
476
-
477
-#~ msgid "%(keyword)s for %(who)s"
478
-#~ msgstr "%(keyword)s pour %(who)s"
479
-
480
-#~ msgid ""
481
-#~ "You have lost your password and you've got the seum. You have to follow "
482
-#~ "this link (or copy-paste it in your browser) to reinitialise it:"
483
-#~ msgstr ""
484
-#~ "T'as perdu ton mot de passe et t'as le seum. Il te reste plus qu'à suivre "
485
-#~ "le lien pour le réinitialiser :"
486
-
487
-#~ msgid "Your login is {{ user.username }} in case you have forgotten it too."
488
-#~ msgstr ""
489
-#~ "Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais "
490
-#~ "oublié aussi."
491
-
492
-#~ msgid ""
493
-#~ "P.S.: If you don't want to receive these mails anymore, contact us at "
494
-#~ "denis.merigoux@gmail.com"
495
-#~ msgstr ""
496
-#~ "P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis."
497
-#~ "merigoux@gmail.com"
498
-
499
-#~ msgid "unknown"
500
-#~ msgstr "inconnu"
501
-
502
-#~ msgid "From %(who)s: %(reason)s"
503
-#~ msgstr "De %(who)s : %(reason)s"
504
-
505
-#~ msgid "%(counter)s: %(reason)s"
506
-#~ msgstr "%(counter)s : %(reason)s"
507
-
508
-#~ msgid "%(who)s to %(counter)s: %(reason)s"
509
-#~ msgstr "%(who)s pour %(counter)s : %(reason)s"
510
-
511
-#~ msgid "Seum"
512
-#~ msgstr "Seum"
513
-
514
-#~ msgid "24h ago"
515
-#~ msgstr "il y a 24h"
516
-
517
-#~ msgid "Now"
518
-#~ msgstr "Présent"
519
-
520
-#~ msgid "Number of seums"
521
-#~ msgstr "Nombre de seums"
522
-
523
-#~ msgid "Month"
524
-#~ msgstr "Mois"
525
-
526
-#~ msgid "Number of given likes"
527
-#~ msgstr "Nombre de likes distribués"
528
-
529
-#~ msgid "Hashtag"
530
-#~ msgstr "Hashtag"
531
-
532
-#~ msgid "Number of seums containing the hashtag"
533
-#~ msgstr "Nombre de seums contenant le hashtag"
534
-
535
-#~ msgid "Number of received likes"
536
-#~ msgstr "Nombre de likes reçus"
537
-
538
-#~ msgid "Passwords do not match."
539
-#~ msgstr "Les mots de passe sont différents."
540
-
541
-#~ msgid "A user with this email address already exists."
542
-#~ msgstr "Un utilisateur avec cette adresse email existe déjà."
543
-
544
-#~ msgid "Use another email address, another user has already this login."
545
-#~ msgstr ""
546
-#~ "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
408
+#: counter/templates/resetEmail.txt:2
409
+msgid ""
410
+"You have lost your password and you've got the seum. You have to follow this "
411
+"link (or copy-paste it in your browser) to reinitialise it:"
412
+msgstr ""
413
+"T'as perdu ton mot de passe et t'as le seum. Il te reste plus qu'à suivre le "
414
+"lien pour le réinitialiser :"
547 415
 
548
-#~ msgid "English"
549
-#~ msgstr "Anglais"
416
+#: counter/templates/resetEmail.txt:6
417
+msgid "Your login is {{ user.username }} in case you have forgotten it too."
418
+msgstr ""
419
+"Ton nom d'utilisateur c'est {{ user.username }} au cas où tu l'aurais oublié "
420
+"aussi."
550 421
 
551
-#~ msgid "French"
552
-#~ msgstr "Français"
422
+#: counter/templates/resetEmail.txt:11
423
+msgid ""
424
+"P.S.: If you don't want to receive these mails anymore, contact us at denis."
425
+"merigoux@gmail.com"
426
+msgstr ""
427
+"P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis."
428
+"merigoux@gmail.com"
429
+
430
+#: counter/views/counter.py:41
431
+msgid "unknown"
432
+msgstr "inconnu"
433
+
434
+#: counter/views/counter.py:81
435
+#, python-format
436
+msgid "From %(who)s: %(reason)s"
437
+msgstr "De %(who)s : %(reason)s"
438
+
439
+#: counter/views/home.py:158
440
+#, python-format
441
+msgid "%(counter)s: %(reason)s"
442
+msgstr "%(counter)s : %(reason)s"
443
+
444
+#: counter/views/home.py:160
445
+#, python-format
446
+msgid "%(who)s to %(counter)s: %(reason)s"
447
+msgstr "%(who)s pour %(counter)s : %(reason)s"
448
+
449
+#: counter/views/home.py:164
450
+msgid "Seum"
451
+msgstr "Seum"
452
+
453
+#: counter/views/home.py:181
454
+msgid "24h ago"
455
+msgstr "il y a 24h"
456
+
457
+#: counter/views/home.py:182
458
+msgid "Now"
459
+msgstr "Présent"
460
+
461
+#: counter/views/home.py:200 counter/views/home.py:205
462
+#: counter/views/home.py:225 counter/views/home.py:230
463
+msgid "Number of seums"
464
+msgstr "Nombre de seums"
465
+
466
+#: counter/views/home.py:225 counter/views/home.py:231
467
+msgid "Month"
468
+msgstr "Mois"
469
+
470
+#: counter/views/home.py:244 counter/views/home.py:249
471
+msgid "Number of given likes"
472
+msgstr "Nombre de likes distribués"
473
+
474
+#: counter/views/home.py:263 counter/views/home.py:269
475
+msgid "Hashtag"
476
+msgstr "Hashtag"
477
+
478
+#: counter/views/home.py:263 counter/views/home.py:268
479
+msgid "Number of seums containing the hashtag"
480
+msgstr "Nombre de seums contenant le hashtag"
481
+
482
+#: counter/views/home.py:282 counter/views/home.py:287
483
+msgid "Number of received likes"
484
+msgstr "Nombre de likes reçus"
485
+
486
+#: counter/views/user.py:22
487
+msgid "Passwords do not match."
488
+msgstr "Les mots de passe sont différents."
489
+
490
+#: counter/views/user.py:27
491
+msgid "A user with this email address already exists."
492
+msgstr "Un utilisateur avec cette adresse email existe déjà."
493
+
494
+#: counter/views/user.py:33
495
+msgid "Use another email address, another user has already this login."
496
+msgstr "Utilise une autre adresse email, un autre utilisateur a déjà ce login."
497
+
498
+#: seum/settings.py:109
499
+msgid "English"
500
+msgstr "Anglais"
501
+
502
+#: seum/settings.py:110
503
+msgid "French"
504
+msgstr "Français"