From 3fe8dfe201d0ec66aee7477a62abc76a260e953a Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 29 Nov 2018 23:10:52 +0100 Subject: [PATCH] Colonnes dynamique pour classer les objets --- printer/locale/fr/LC_MESSAGES/django.mo | Bin 4116 -> 4058 bytes printer/locale/fr/LC_MESSAGES/django.po | 174 ++++++++++--------- printer/templates/printer/aff_digicodes.html | 3 + printer/templates/printer/aff_jobs.html | 6 +- 4 files changed, 99 insertions(+), 84 deletions(-) diff --git a/printer/locale/fr/LC_MESSAGES/django.mo b/printer/locale/fr/LC_MESSAGES/django.mo index ef3963646a5079b0a0aa1dea059140ec500f9fee..5bdcf7930702ed322975f0d50b09299148761fc5 100644 GIT binary patch delta 1479 zcmZA0OGs346vy#njX92*Ia!*IW~}L9n%On;k!e#DNrupaaMw$a5TUeH$?SwSQmBZV zqBftk3~d5xhY!YqP{;nZTfT1|8vj1cmD4gjlYSd-bF)WMoAK7 zL}H0q7gmR;C|5Jhcx2byQH+p}V;0`RY@9+ayHB+OA9?-)bI4y}KEB13_zh_%Wf{x< zevs=Hqxw#u8m{!`br>dZLoPc=wF*0NHFl%Ezl^y!gvW6N)!r9(9=Ys0Rh0hi7dQH0 z9@Ehei!cups2K)Snn5!%Xgh%FxWn_)sDbsMzB}*vATB2#LbX4JTy}#>?cY{T|Mq~J zMtp*5=%@P|HPSE-+c6(YunQA7fE#cEwdB*N4rj3t-=miN2Wr3}MxlX}P%TanQ(BsU z8|{4qmg6z3#|yX=@8G!%v%9FXP{cH42^L{FYM}K z)xb?2(6&89jeG{V>@}4d`iPp@S9byReT4l|$AzdfQ0fM#8MdQV<^&$W9#ngeQCm5a z%lgxnJ?DW&Hs>!sV*&ZRtJZYtqp0u8Q7c!8I?XkxneRnS;E+E*>G^Vb7;f?L9*-dqt%Iee!(4^9Tn+{iR~u zXy#Q&pVo@nvkuhZ>c?F;ftv9gaugOj2dh){U#akX2dWdDC2fOBoY+q2z_W!ZtKp`Y zXd^UI9V{KX^@Pe=qL$EdB?%Snod&CcYPJEP6RrVkGAdgL?RBLR%5I{S&?NqqGX4Lx z+zCPlsLJ2$akcboh@GBu92WPl8Fg?~^p9attVIc>n%G2W)z%RzIwP#SZByc9v($`L zw1-=XCL%U6nOTv&?^NHJ?%v++v*{0+ouP2h6c6f}Ya7!Iksu>0+1GcmcV;p@m@^*w E1FWfQ@c;k- delta 1537 zcmYk*OGs2v9LMp$Ii`-5X=bIR<0G{)Ys|?sd+1C^C6$JSD>G*>V^UCz1YwBCXcavq zXi?P8Kq;nZ8ww%Ost5EU=m9~vi=d6x_cxuO!~NgSoHO^H=l{Mdy6%g8%<+sHB}l9x zY8RPxVylN6<$j78P4>X~5WUnNV=7KNpJ6)n7pPZ1AeVjOwhX_y`Y+6&zJOU~G4n1q zTTVkhs^e})n6X7_b|Q{ z@Pjt^E`5bD%dCbL3MrF&b7&T!( z#t3WSmRKQbYr0Um5XQB54g+`_lkqj4N-}$k%8d}qlr6Xt_oF6y0`+_!G6y^DJcC+j zEQ9?o=f_1F^uiSC2p&0SQ60WV#Yb?En8X5{b@i{P{(d8u z#j?o=&B%vp2)KF(HDD)d3TJBvE9F;ucm;tqU?T5%TJNopkW2NHQB|1YJkvQ6K= zI@O9ah)M~um1rO|fh~kq(nRPCm1s&T4X)xNY6$IGkWkSPF(0cWwEeY&@~DE)VpXb$ zbbbFD6IHX_xQEax{*^+0)Dv3qDq<6%()^c1u4sGpxvFRfNf~P-Rud{kgtmN_DwJws zJ)vVO)67)#Jt`6Xs!(*c8xp_FcA`GR&4jkP_}ZnE;=JY&-|$dm(1P9lJ&|ZM61Lz# wI1-Pi9P*_3>wNw|gFg`WdTWw$4|fk*Q-A+(bY>!Ap}yX}o`G;Ym~q4N2YFq2;{X5v diff --git a/printer/locale/fr/LC_MESSAGES/django.po b/printer/locale/fr/LC_MESSAGES/django.po index 0b912564..15bd5884 100644 --- a/printer/locale/fr/LC_MESSAGES/django.po +++ b/printer/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: 2018-11-17 15:15+0100\n" +"POT-Creation-Date: 2018-11-29 23:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,267 +18,269 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: printer/acl.py:19 +#: acl.py:19 msgid "You don't have the right to view Printer application." msgstr "Vous n'avez pas le droit de voir l'application d'impression" -#: printer/forms.py:34 +#: forms.py:34 msgid "Print As" msgstr "Imprimer en tant que" -#: printer/models.py:83 +#: models.py:91 #, fuzzy msgid "This is not your digicode !" msgstr "Ceci n'est pas votre tache" -#: printer/models.py:89 +#: models.py:97 msgid "You can't generate a digicode" msgstr "Vous ne pouvez pas créer un digicode" -#: printer/models.py:103 +#: models.py:111 msgid "This is not your print operation task" msgstr "Ceci n'est pas votre tache" -#: printer/models.py:140 +#: models.py:148 msgid "Pending" msgstr "En attente" -#: printer/models.py:141 +#: models.py:149 msgid "Printable" msgstr "Imprimable" -#: printer/models.py:142 +#: models.py:150 msgid "Running" msgstr "En cours..." -#: printer/models.py:143 +#: models.py:151 msgid "Cancelled" msgstr "Annulée" -#: printer/models.py:144 +#: models.py:152 msgid "Finished" msgstr "Terminée" -#: printer/models.py:156 +#: models.py:164 msgid "File" msgstr "Fichier" -#: printer/models.py:161 printer/templates/printer/aff_jobs.html:35 +#: models.py:169 msgid "File Name" msgstr "Nom du fichier" -#: printer/models.py:168 printer/templates/printer/aff_jobs.html:38 +#: models.py:176 templates/printer/aff_jobs.html:38 msgid "Status" msgstr "Status" -#: printer/models.py:177 +#: models.py:185 msgid "Print as" msgstr "Imprimer en tant que" -#: printer/models.py:182 printer/templates/printer/aff_jobs.html:40 +#: models.py:190 templates/printer/aff_jobs.html:44 msgid "Price" msgstr "Prix" -#: printer/models.py:190 +#: models.py:198 msgid "Format" msgstr "Format" -#: printer/models.py:196 printer/settings.py:25 +#: models.py:204 settings.py:25 msgid "Color" msgstr "Couleur" -#: printer/models.py:202 +#: models.py:210 msgid "Disposition" msgstr "Disposition" -#: printer/models.py:206 +#: models.py:214 msgid "Count" msgstr "Nombre" -#: printer/models.py:212 +#: models.py:220 msgid "Stapling" msgstr "Agrafage" -#: printer/models.py:218 +#: models.py:226 msgid "Perforation" msgstr "Perforation" -#: printer/models.py:259 +#: models.py:267 msgid "This is not your print job" msgstr "Ceci n'est pas votre tache" -#: printer/models.py:267 +#: models.py:275 msgid "This is not your print operation job" msgstr "Ceci n'est pas votre tâche" -#: printer/settings.py:20 +#: settings.py:20 msgid "A4" msgstr "A4" -#: printer/settings.py:21 +#: settings.py:21 msgid "A3" msgstr "A3" -#: printer/settings.py:24 +#: settings.py:24 msgid "Greyscale" msgstr "Noir et blanc" -#: printer/settings.py:28 +#: settings.py:28 msgid "Two sided" msgstr "Recto-verso" -#: printer/settings.py:29 +#: settings.py:29 msgid "One sided" msgstr "Recto" -#: printer/settings.py:30 +#: settings.py:30 msgid "Booklet" msgstr "Livret" -#: printer/settings.py:33 printer/settings.py:40 +#: settings.py:33 settings.py:40 msgid "None" msgstr "Aucun" -#: printer/settings.py:34 +#: settings.py:34 msgid "One top left" msgstr "En haut à gauche" -#: printer/settings.py:35 +#: settings.py:35 msgid "One top right" msgstr "En haut à droite" -#: printer/settings.py:36 +#: settings.py:36 msgid "Two left sided" msgstr "Deux à gauche" -#: printer/settings.py:37 +#: settings.py:37 msgid "Two right sided" msgstr "Deux à droite" -#: printer/settings.py:41 +#: settings.py:41 msgid "Two left sided holes" msgstr "Deux trous à gauche" -#: printer/settings.py:42 +#: settings.py:42 msgid "Two right sided holes" msgstr "Deux trous à droite" -#: printer/settings.py:43 +#: settings.py:43 msgid "Two top holes" msgstr "Deux trous en haut" -#: printer/settings.py:44 +#: settings.py:44 msgid "Two bottom holes" msgstr "Deux trous en bas" -#: printer/settings.py:45 +#: settings.py:45 msgid "Four left sided holes" msgstr "Quatre trous à gauche" -#: printer/settings.py:46 +#: settings.py:46 msgid "Four right sided holes" msgstr "Quatre trous à droite" -#: printer/templates/printer/aff_digicodes.html:36 +#: templates/printer/aff_digicodes.html:36 templates/printer/aff_jobs.html:36 msgid "User" msgstr "L'utilisateur" -#: printer/templates/printer/aff_digicodes.html:37 -msgid "Code" -msgstr "Digicode" +#: templates/printer/aff_digicodes.html:37 +#, fuzzy +#| msgid "Create Digicode" +msgid "Digicode" +msgstr "Créer un digicode" -#: printer/templates/printer/aff_digicodes.html:38 +#: templates/printer/aff_digicodes.html:38 msgid "Created on" msgstr "Créé le" -#: printer/templates/printer/aff_jobs.html:36 -msgid "By user" -msgstr "Par" +#: templates/printer/aff_jobs.html:35 +#, fuzzy +#| msgid "Filename : " +msgid "Filename" +msgstr "Nom du fichier" -#: printer/templates/printer/aff_jobs.html:37 +#: templates/printer/aff_jobs.html:37 msgid "Start at" msgstr "Début" -#: printer/templates/printer/aff_jobs.html:39 +#: templates/printer/aff_jobs.html:43 msgid "Number" msgstr "Exemplaires" -#: printer/templates/printer/aff_jobs.html:41 +#: templates/printer/aff_jobs.html:45 msgid "Print again" msgstr "Imprimer à nouveau" -#: printer/templates/printer/aff_jobs.html:48 +#: templates/printer/aff_jobs.html:52 msgid "for" msgstr "pour" -#: printer/templates/printer/create_code.html:15 +#: templates/printer/create_code.html:15 msgid "Create digicode for" msgstr "Créer un digicode pour" -#: printer/templates/printer/index_digicodes.html:28 -#: printer/templates/printer/index_jobs.html:28 +#: templates/printer/index_digicodes.html:28 +#: templates/printer/index_jobs.html:28 msgid "Printer" msgstr "Imprimer" -#: printer/templates/printer/index_digicodes.html:31 +#: templates/printer/index_digicodes.html:31 #, fuzzy #| msgid "List of jobs" msgid "List of codes" -msgstr "Liste des taches" +msgstr "Liste des codes" -#: printer/templates/printer/index_jobs.html:31 -#: printer/templates/printer/sidebar.html:34 +#: templates/printer/index_jobs.html:31 templates/printer/sidebar.html:40 msgid "List of jobs" msgstr "Liste des taches" -#: printer/templates/printer/newjob.html:13 +#: templates/printer/newjob.html:13 msgid "Printing Menu" msgstr "Menu d'impression" -#: printer/templates/printer/newjob.html:23 -#: printer/templates/printer/newjob.html:43 +#: templates/printer/newjob.html:23 templates/printer/newjob.html:43 msgid "Delete file" msgstr "Supprimer le fichier" -#: printer/templates/printer/newjob.html:33 +#: templates/printer/newjob.html:33 msgid "Add a file" msgstr "Fichier supplémentaire" -#: printer/templates/printer/print.html:13 +#: templates/printer/print.html:13 msgid "Confirm printing" msgstr "Confirmer le lancement de l'impression" -#: printer/templates/printer/print.html:20 +#: templates/printer/print.html:20 msgid "Filename : " msgstr "Nom du fichier" -#: printer/templates/printer/print.html:21 +#: templates/printer/print.html:21 msgid "Price for one copy : " msgstr "Prix d'une copie : " -#: printer/templates/printer/print.html:22 +#: templates/printer/print.html:22 msgid "Number of pages : " msgstr "Nombre de pages : " -#: printer/templates/printer/printer_disabled.html:10 +#: templates/printer/printer_disabled.html:10 msgid "Sorry, the printer currently experiences fatal issues..." msgstr "Désolé, l'imprimante est actuellement hors-service..." -#: printer/templates/printer/sidebar.html:30 +#: templates/printer/sidebar.html:30 msgid "Print document" msgstr "Imprimer un document" -#: printer/templates/printer/sidebar.html:38 -#, fuzzy -#| msgid "List of jobs" -msgid "List of digicodes" -msgstr "Liste des taches" - -#: printer/templates/printer/sidebar.html:43 +#: templates/printer/sidebar.html:35 msgid "Create Digicode" msgstr "Créer un digicode" -#: printer/validators.py:48 +#: templates/printer/sidebar.html:44 +#, fuzzy +#| msgid "List of jobs" +msgid "List of digicodes" +msgstr "Liste des digicodes" + +#: validators.py:48 #, python-format msgid "" "MIME type '%(type)s' is not valid. Please, use one of these types: " @@ -287,7 +289,7 @@ msgstr "" "Le type '%(type)s' n'est pas autorisé. Merci d'utiliser un type" "%(allowed_types)s." -#: printer/validators.py:51 +#: validators.py:51 #, python-format msgid "" "The current file size is %(size)s. The maximum file size is %(max_size)s." @@ -295,18 +297,24 @@ msgstr "" "Le fichier a une taille de %(size)s. La taille maximum autorisée est " "%(max_size)s." -#: printer/views.py:104 +#: views.py:104 msgid "Next" msgstr "Suivant" -#: printer/views.py:136 printer/views.py:162 +#: views.py:136 views.py:162 msgid "Print" msgstr "Imprimer" -#: printer/views.py:191 +#: views.py:191 msgid "You are not allowed to print" msgstr "Vous n'êtes pas autorisé à imprimer" -#: printer/views.py:263 +#: views.py:272 msgid "Create Code" msgstr "Créer un digicode" + +#~ msgid "Code" +#~ msgstr "Digicode" + +#~ msgid "By user" +#~ msgstr "Par" diff --git a/printer/templates/printer/aff_digicodes.html b/printer/templates/printer/aff_digicodes.html index b7ecb5cd..dff4a8d7 100644 --- a/printer/templates/printer/aff_digicodes.html +++ b/printer/templates/printer/aff_digicodes.html @@ -33,6 +33,9 @@ with this program; if not, write to the Free Software Foundation, Inc., + {% trans "User" as tr_user %} + {% trans "Digicode" as tr_code %} + {% trans "Created on" as tr_created_on %} diff --git a/printer/templates/printer/aff_jobs.html b/printer/templates/printer/aff_jobs.html index 41a3b587..2c298bc3 100644 --- a/printer/templates/printer/aff_jobs.html +++ b/printer/templates/printer/aff_jobs.html @@ -32,10 +32,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% include "buttons/sort.html" with prefix='code' col='user' text=tr_user %} {% include "buttons/sort.html" with prefix='code' col='code' text=tr_code %} {% include "buttons/sort.html" with prefix='code' col='created' text=tr_created_on %}
+ {% trans "Filename" as tr_filename %} + {% trans "User" as tr_byuser %} + {% trans "Start at" as tr_startat %} + {% trans "Status" as tr_status %} - +
{% include "buttons/sort.html" with prefix='job' col='filename' text=tr_filename %} {% include "buttons/sort.html" with prefix='job' col='user' text=tr_byuser %} {% include "buttons/sort.html" with prefix='job' col='starttime' text=tr_startat %}{% include "buttons/sort.html" with prefix='status' col='status' text=tr_status %}{% include "buttons/sort.html" with prefix='job' col='status' text=tr_status %} {% trans "Number" %} {% trans "Price" %} {% trans "Print again" %}