浏览代码

Add message on disabled user fields

Bastien Sevajol 9 年前
父节点
当前提交
c14b817010

+ 1 - 1
install/requirements.txt 查看文件

1
-Babel==1.3
1
+Babel==2.2
2
 Beaker==1.6.4
2
 Beaker==1.6.4
3
 CherryPy==3.6.0
3
 CherryPy==3.6.0
4
 FormEncode==1.3.0a1
4
 FormEncode==1.3.0a1

二进制
tracim/tracim/i18n/fr/LC_MESSAGES/tracim.mo 查看文件


+ 78 - 72
tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po 查看文件

1
-# French (France) translations for pod.
2
-# Copyright (C) 2014 ORGANIZATION
3
-# This file is distributed under the same license as the pod project.
4
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
1
+# French translations for tracim.
2
+# Copyright (C) 2016 ORGANIZATION
3
+# This file is distributed under the same license as the tracim project.
4
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
5
 #
5
 #
6
 msgid ""
6
 msgid ""
7
 msgstr ""
7
 msgstr ""
8
 "Project-Id-Version: pod 0.1\n"
8
 "Project-Id-Version: pod 0.1\n"
9
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
9
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10
-"POT-Creation-Date: 2015-09-08 17:43+0200\n"
10
+"POT-Creation-Date: 2016-02-18 14:37+0100\n"
11
 "PO-Revision-Date: 2015-09-08 15:27+0100\n"
11
 "PO-Revision-Date: 2015-09-08 15:27+0100\n"
12
 "Last-Translator: Damien Accorsi <damien.accorsi@free.fr>\n"
12
 "Last-Translator: Damien Accorsi <damien.accorsi@free.fr>\n"
13
+"Language: fr\n"
13
 "Language-Team: fr_FR <LL@li.org>\n"
14
 "Language-Team: fr_FR <LL@li.org>\n"
14
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
15
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
15
 "MIME-Version: 1.0\n"
16
 "MIME-Version: 1.0\n"
16
 "Content-Type: text/plain; charset=utf-8\n"
17
 "Content-Type: text/plain; charset=utf-8\n"
17
 "Content-Transfer-Encoding: 8bit\n"
18
 "Content-Transfer-Encoding: 8bit\n"
18
-"Generated-By: Babel 1.3\n"
19
+"Generated-By: Babel 2.2.0\n"
19
 
20
 
20
-#: tracim/config/app_cfg.py:137
21
+#: tracim/config/app_cfg.py:86
21
 msgid "Password reset request"
22
 msgid "Password reset request"
22
 msgstr "Réinitialisation du mot de passe"
23
 msgstr "Réinitialisation du mot de passe"
23
 
24
 
24
-#: tracim/config/app_cfg.py:138 tracim/config/app_cfg.py:167
25
+#: tracim/config/app_cfg.py:87 tracim/config/app_cfg.py:116
25
 #, python-format
26
 #, python-format
26
 msgid ""
27
 msgid ""
27
 "\n"
28
 "\n"
44
 " à l'originie de cette requête, merci d'ignorer et/ou supprimer cet "
45
 " à l'originie de cette requête, merci d'ignorer et/ou supprimer cet "
45
 "e-mail.\n"
46
 "e-mail.\n"
46
 
47
 
47
-#: tracim/config/app_cfg.py:154 tracim/templates/widgets/forms.mak:15
48
+#: tracim/config/app_cfg.py:103 tracim/templates/widgets/forms.mak:15
48
 #: tracim/templates/widgets/forms.mak:16 tracim/templates/widgets/forms.mak:39
49
 #: tracim/templates/widgets/forms.mak:16 tracim/templates/widgets/forms.mak:39
49
 #: tracim/templates/widgets/forms.mak:40
50
 #: tracim/templates/widgets/forms.mak:40
50
 msgid "New password"
51
 msgid "New password"
51
 msgstr "Nouveau mot de passe"
52
 msgstr "Nouveau mot de passe"
52
 
53
 
53
-#: tracim/config/app_cfg.py:155
54
+#: tracim/config/app_cfg.py:104
54
 msgid "Confirm new password"
55
 msgid "Confirm new password"
55
 msgstr "Confirmer le nouveau mot de passe"
56
 msgstr "Confirmer le nouveau mot de passe"
56
 
57
 
57
-#: tracim/config/app_cfg.py:156
58
+#: tracim/config/app_cfg.py:105
58
 msgid "Save new password"
59
 msgid "Save new password"
59
 msgstr "Enregistrer le nouveau mot de passe"
60
 msgstr "Enregistrer le nouveau mot de passe"
60
 
61
 
61
-#: tracim/config/app_cfg.py:157 tracim/templates/admin/user_getall.mak:48
62
+#: tracim/config/app_cfg.py:106 tracim/templates/admin/user_getall.mak:48
62
 msgid "Email address"
63
 msgid "Email address"
63
 msgstr "Adresse email"
64
 msgstr "Adresse email"
64
 
65
 
65
-#: tracim/config/app_cfg.py:158
66
+#: tracim/config/app_cfg.py:107
66
 msgid "Send Request"
67
 msgid "Send Request"
67
 msgstr "Valider"
68
 msgstr "Valider"
68
 
69
 
69
-#: tracim/config/app_cfg.py:161
70
+#: tracim/config/app_cfg.py:110
70
 msgid "Password reset request sent"
71
 msgid "Password reset request sent"
71
 msgstr "Requête de réinitialisation du mot de passe envoyée"
72
 msgstr "Requête de réinitialisation du mot de passe envoyée"
72
 
73
 
73
-#: tracim/config/app_cfg.py:162 tracim/config/app_cfg.py:164
74
+#: tracim/config/app_cfg.py:111 tracim/config/app_cfg.py:113
74
 msgid "Invalid password reset request"
75
 msgid "Invalid password reset request"
75
 msgstr "Requête de réinitialisation du mot de passe invalide"
76
 msgstr "Requête de réinitialisation du mot de passe invalide"
76
 
77
 
77
-#: tracim/config/app_cfg.py:163
78
+#: tracim/config/app_cfg.py:112
78
 msgid "Password reset request timed out"
79
 msgid "Password reset request timed out"
79
 msgstr "Echec de la requête de réinitialisation du mot de passe"
80
 msgstr "Echec de la requête de réinitialisation du mot de passe"
80
 
81
 
81
-#: tracim/config/app_cfg.py:165
82
+#: tracim/config/app_cfg.py:114
82
 msgid "Password changed successfully"
83
 msgid "Password changed successfully"
83
 msgstr "Mot de passe changé"
84
 msgstr "Mot de passe changé"
84
 
85
 
85
-#: tracim/controllers/__init__.py:272 tracim/controllers/content.py:313
86
+#: tracim/controllers/__init__.py:273 tracim/controllers/content.py:313
86
 #: tracim/controllers/content.py:426
87
 #: tracim/controllers/content.py:426
87
 msgid "{} updated"
88
 msgid "{} updated"
88
 msgstr "{} mis(e) à jour"
89
 msgstr "{} mis(e) à jour"
89
 
90
 
90
-#: tracim/controllers/__init__.py:277 tracim/controllers/content.py:431
91
+#: tracim/controllers/__init__.py:278 tracim/controllers/content.py:431
91
 msgid "{} not updated: the content did not change"
92
 msgid "{} not updated: the content did not change"
92
 msgstr "{} non mis à jour : le contenu n'a pas changé"
93
 msgstr "{} non mis à jour : le contenu n'a pas changé"
93
 
94
 
94
-#: tracim/controllers/__init__.py:282 tracim/controllers/content.py:318
95
+#: tracim/controllers/__init__.py:283 tracim/controllers/content.py:318
95
 #: tracim/controllers/content.py:436
96
 #: tracim/controllers/content.py:436
96
 msgid "{} not updated - error: {}"
97
 msgid "{} not updated - error: {}"
97
 msgstr "{} pas mis(e) à jour - erreur : {}"
98
 msgstr "{} pas mis(e) à jour - erreur : {}"
98
 
99
 
99
-#: tracim/controllers/__init__.py:296
100
+#: tracim/controllers/__init__.py:297
100
 msgid "{} status updated"
101
 msgid "{} status updated"
101
 msgstr "Statut de {} mis(e) à jour"
102
 msgstr "Statut de {} mis(e) à jour"
102
 
103
 
103
-#: tracim/controllers/__init__.py:300
104
+#: tracim/controllers/__init__.py:301
104
 msgid "{} status not updated: {}"
105
 msgid "{} status not updated: {}"
105
 msgstr "Statut de {} non mis(e) à jour : {}"
106
 msgstr "Statut de {} non mis(e) à jour : {}"
106
 
107
 
107
-#: tracim/controllers/__init__.py:332 tracim/controllers/content.py:839
108
+#: tracim/controllers/__init__.py:333 tracim/controllers/content.py:839
108
 msgid "{} archived. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
109
 msgid "{} archived. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
109
 msgstr "{} archivé(e). <a class=\"alert-link\" href=\"{}\">Annuler l'opération</a>"
110
 msgstr "{} archivé(e). <a class=\"alert-link\" href=\"{}\">Annuler l'opération</a>"
110
 
111
 
111
-#: tracim/controllers/__init__.py:341 tracim/controllers/content.py:848
112
+#: tracim/controllers/__init__.py:342 tracim/controllers/content.py:848
112
 msgid "{} not archived: {}"
113
 msgid "{} not archived: {}"
113
 msgstr "{} non archivé(e) : {}"
114
 msgstr "{} non archivé(e) : {}"
114
 
115
 
115
-#: tracim/controllers/__init__.py:354 tracim/controllers/content.py:862
116
+#: tracim/controllers/__init__.py:355 tracim/controllers/content.py:862
116
 msgid "{} unarchived."
117
 msgid "{} unarchived."
117
 msgstr "{} désarchivé(e)"
118
 msgstr "{} désarchivé(e)"
118
 
119
 
119
-#: tracim/controllers/__init__.py:362 tracim/controllers/content.py:870
120
+#: tracim/controllers/__init__.py:363 tracim/controllers/content.py:870
120
 msgid "{} not un-archived: {}"
121
 msgid "{} not un-archived: {}"
121
 msgstr "{} non désarchivé(e) : {}"
122
 msgstr "{} non désarchivé(e) : {}"
122
 
123
 
123
-#: tracim/controllers/__init__.py:380 tracim/controllers/content.py:90
124
+#: tracim/controllers/__init__.py:381 tracim/controllers/content.py:90
124
 #: tracim/controllers/content.py:887
125
 #: tracim/controllers/content.py:887
125
 msgid "{} deleted. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
126
 msgid "{} deleted. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
126
 msgstr ""
127
 msgstr ""
127
 "{} supprimé(e). <a class=\"alert-link\" href=\"{}\">Annuler "
128
 "{} supprimé(e). <a class=\"alert-link\" href=\"{}\">Annuler "
128
 "l'opération</a>"
129
 "l'opération</a>"
129
 
130
 
130
-#: tracim/controllers/__init__.py:389 tracim/controllers/content.py:101
131
+#: tracim/controllers/__init__.py:390 tracim/controllers/content.py:101
131
 #: tracim/controllers/content.py:896
132
 #: tracim/controllers/content.py:896
132
 msgid "{} not deleted: {}"
133
 msgid "{} not deleted: {}"
133
 msgstr "{} non supprimé(e) : {}"
134
 msgstr "{} non supprimé(e) : {}"
134
 
135
 
135
-#: tracim/controllers/__init__.py:404 tracim/controllers/content.py:118
136
+#: tracim/controllers/__init__.py:405 tracim/controllers/content.py:118
136
 #: tracim/controllers/content.py:911
137
 #: tracim/controllers/content.py:911
137
 msgid "{} undeleted."
138
 msgid "{} undeleted."
138
 msgstr "{} restauré(e)."
139
 msgstr "{} restauré(e)."
139
 
140
 
140
-#: tracim/controllers/__init__.py:414 tracim/controllers/content.py:130
141
+#: tracim/controllers/__init__.py:415 tracim/controllers/content.py:130
141
 #: tracim/controllers/content.py:921
142
 #: tracim/controllers/content.py:921
142
 msgid "{} not un-deleted: {}"
143
 msgid "{} not un-deleted: {}"
143
 msgstr "{} non restauré(e) : {}"
144
 msgstr "{} non restauré(e) : {}"
144
 
145
 
145
-#: tracim/controllers/__init__.py:428
146
+#: tracim/controllers/__init__.py:429
146
 msgid "{} marked as read."
147
 msgid "{} marked as read."
147
 msgstr "{} marqué \"lu\"."
148
 msgstr "{} marqué \"lu\"."
148
 
149
 
149
-#: tracim/controllers/__init__.py:436
150
+#: tracim/controllers/__init__.py:437
150
 msgid "{} not marked as read: {}"
151
 msgid "{} not marked as read: {}"
151
 msgstr "{} non marqué \"lu\" : {}"
152
 msgstr "{} non marqué \"lu\" : {}"
152
 
153
 
153
-#: tracim/controllers/__init__.py:450
154
+#: tracim/controllers/__init__.py:451
154
 msgid "{} marked unread."
155
 msgid "{} marked unread."
155
 msgstr "{} marqué \"non lu\"."
156
 msgstr "{} marqué \"non lu\"."
156
 
157
 
157
-#: tracim/controllers/__init__.py:458
158
+#: tracim/controllers/__init__.py:459
158
 msgid "{} not marked unread: {}"
159
 msgid "{} not marked unread: {}"
159
 msgstr "{} non marqué \"non lu\" : {}"
160
 msgstr "{} non marqué \"non lu\" : {}"
160
 
161
 
247
 msgid "Successfully logged out. We hope to see you soon!"
248
 msgid "Successfully logged out. We hope to see you soon!"
248
 msgstr "Déconnexion réussie. Nous espérons vous revoir bientôt !"
249
 msgstr "Déconnexion réussie. Nous espérons vous revoir bientôt !"
249
 
250
 
250
-#: tracim/controllers/user.py:54
251
+#: tracim/controllers/user.py:55
251
 msgid "Notification enabled for workspace {}"
252
 msgid "Notification enabled for workspace {}"
252
 msgstr "Notifications activées pour l'espace de travail {}"
253
 msgstr "Notifications activées pour l'espace de travail {}"
253
 
254
 
254
-#: tracim/controllers/user.py:67
255
+#: tracim/controllers/user.py:68
255
 msgid "Notification disabled for workspace {}"
256
 msgid "Notification disabled for workspace {}"
256
 msgstr "Notifications désactivées pour l'espace de travail {}"
257
 msgstr "Notifications désactivées pour l'espace de travail {}"
257
 
258
 
258
-#: tracim/controllers/user.py:107 tracim/controllers/admin/user.py:203
259
+#: tracim/controllers/user.py:114 tracim/controllers/admin/user.py:203
259
 msgid "Empty password is not allowed."
260
 msgid "Empty password is not allowed."
260
 msgstr "Le mot de passe ne doit pas être vide"
261
 msgstr "Le mot de passe ne doit pas être vide"
261
 
262
 
262
-#: tracim/controllers/user.py:111
263
+#: tracim/controllers/user.py:118
263
 msgid "The current password you typed is wrong"
264
 msgid "The current password you typed is wrong"
264
 msgstr "Le mot de passe saisi est erroné"
265
 msgstr "Le mot de passe saisi est erroné"
265
 
266
 
266
-#: tracim/controllers/user.py:115 tracim/controllers/admin/user.py:207
267
+#: tracim/controllers/user.py:122 tracim/controllers/admin/user.py:207
267
 msgid "New passwords do not match."
268
 msgid "New passwords do not match."
268
 msgstr "Les mots de passe ne concordent pas"
269
 msgstr "Les mots de passe ne concordent pas"
269
 
270
 
270
-#: tracim/controllers/user.py:121
271
+#: tracim/controllers/user.py:128
271
 msgid "Your password has been changed"
272
 msgid "Your password has been changed"
272
 msgstr "Votre mot de passe a été changé"
273
 msgstr "Votre mot de passe a été changé"
273
 
274
 
274
-#: tracim/controllers/user.py:179
275
+#: tracim/controllers/user.py:192
275
 msgid "profile updated."
276
 msgid "profile updated."
276
 msgstr "Profil mis à jour"
277
 msgstr "Profil mis à jour"
277
 
278
 
409
 msgid "The content did not changed"
410
 msgid "The content did not changed"
410
 msgstr "Le contenu est inchangé"
411
 msgstr "Le contenu est inchangé"
411
 
412
 
412
-#: tracim/lib/helpers.py:34
413
+#: tracim/lib/helpers.py:33
413
 msgid "{date} at {time}"
414
 msgid "{date} at {time}"
414
 msgstr "{date} à {time}"
415
 msgstr "{date} à {time}"
415
 
416
 
416
-#: tracim/lib/notifications.py:285
417
+#: tracim/lib/notifications.py:289
417
 msgid "<span id=\"content-intro-username\">{}</span> added a comment:"
418
 msgid "<span id=\"content-intro-username\">{}</span> added a comment:"
418
 msgstr "<span id=\"content-intro-username\">{}</span> a ajouté un commentaire :"
419
 msgstr "<span id=\"content-intro-username\">{}</span> a ajouté un commentaire :"
419
 
420
 
420
-#: tracim/lib/notifications.py:287 tracim/lib/notifications.py:296
421
+#: tracim/lib/notifications.py:291 tracim/lib/notifications.py:300
421
 msgid "Answer"
422
 msgid "Answer"
422
 msgstr "Répondre"
423
 msgstr "Répondre"
423
 
424
 
424
-#: tracim/lib/notifications.py:293 tracim/lib/notifications.py:317
425
-#: tracim/lib/notifications.py:350
425
+#: tracim/lib/notifications.py:297 tracim/lib/notifications.py:321
426
+#: tracim/lib/notifications.py:354
426
 msgid "View online"
427
 msgid "View online"
427
 msgstr "Voir en ligne"
428
 msgstr "Voir en ligne"
428
 
429
 
429
-#: tracim/lib/notifications.py:297
430
+#: tracim/lib/notifications.py:301
430
 msgid "<span id=\"content-intro-username\">{}</span> started a thread entitled:"
431
 msgid "<span id=\"content-intro-username\">{}</span> started a thread entitled:"
431
 msgstr ""
432
 msgstr ""
432
 "<span id=\"content-intro-username\">{}</span> a lancé une discussion "
433
 "<span id=\"content-intro-username\">{}</span> a lancé une discussion "
433
 "intitulée :"
434
 "intitulée :"
434
 
435
 
435
-#: tracim/lib/notifications.py:302
436
+#: tracim/lib/notifications.py:306
436
 msgid "<span id=\"content-intro-username\">{}</span> added a file entitled:"
437
 msgid "<span id=\"content-intro-username\">{}</span> added a file entitled:"
437
 msgstr ""
438
 msgstr ""
438
 "<span id=\"content-intro-username\">{}</span> a ajouté un fichier "
439
 "<span id=\"content-intro-username\">{}</span> a ajouté un fichier "
439
 "intitulé :"
440
 "intitulé :"
440
 
441
 
441
-#: tracim/lib/notifications.py:312
442
+#: tracim/lib/notifications.py:316
442
 msgid "<span id=\"content-intro-username\">{}</span> added a page entitled:"
443
 msgid "<span id=\"content-intro-username\">{}</span> added a page entitled:"
443
 msgstr ""
444
 msgstr ""
444
 "<span id=\"content-intro-username\">{}</span> a ajouté une page intitulée"
445
 "<span id=\"content-intro-username\">{}</span> a ajouté une page intitulée"
445
 " :"
446
 " :"
446
 
447
 
447
-#: tracim/lib/notifications.py:320
448
+#: tracim/lib/notifications.py:324
448
 msgid "<span id=\"content-intro-username\">{}</span> uploaded a new revision."
449
 msgid "<span id=\"content-intro-username\">{}</span> uploaded a new revision."
449
 msgstr ""
450
 msgstr ""
450
 "<span id=\"content-intro-username\">{}</span> a téléchargé une nouvelle "
451
 "<span id=\"content-intro-username\">{}</span> a téléchargé une nouvelle "
451
 "version."
452
 "version."
452
 
453
 
453
-#: tracim/lib/notifications.py:324
454
+#: tracim/lib/notifications.py:328
454
 msgid "<span id=\"content-intro-username\">{}</span> updated this page."
455
 msgid "<span id=\"content-intro-username\">{}</span> updated this page."
455
 msgstr "<span id=\"content-intro-username\">{}</span> a mis à jour cette page."
456
 msgstr "<span id=\"content-intro-username\">{}</span> a mis à jour cette page."
456
 
457
 
457
-#: tracim/lib/notifications.py:329 tracim/lib/notifications.py:339
458
+#: tracim/lib/notifications.py:333 tracim/lib/notifications.py:343
458
 msgid "<p id=\"content-body-intro\">Here is an overview of the changes:</p>"
459
 msgid "<p id=\"content-body-intro\">Here is an overview of the changes:</p>"
459
 msgstr "<p id=\"content-body-intro\">Voici un aperçu des modifications :</p>"
460
 msgstr "<p id=\"content-body-intro\">Voici un aperçu des modifications :</p>"
460
 
461
 
461
-#: tracim/lib/notifications.py:334
462
+#: tracim/lib/notifications.py:338
462
 msgid ""
463
 msgid ""
463
 "<span id=\"content-intro-username\">{}</span> updated the thread "
464
 "<span id=\"content-intro-username\">{}</span> updated the thread "
464
 "description."
465
 "description."
466
 "<span id=\"content-intro-username\">{}</span> a mis à jour la description"
467
 "<span id=\"content-intro-username\">{}</span> a mis à jour la description"
467
 " de la discussion."
468
 " de la discussion."
468
 
469
 
469
-#: tracim/lib/notifications.py:353
470
+#: tracim/lib/notifications.py:357
470
 msgid ""
471
 msgid ""
471
 "<span id=\"content-intro-username\">{}</span> updated the file "
472
 "<span id=\"content-intro-username\">{}</span> updated the file "
472
 "description."
473
 "description."
747
 msgid "Welcome to your home, {username}."
748
 msgid "Welcome to your home, {username}."
748
 msgstr "Bienvenue, {username}."
749
 msgstr "Bienvenue, {username}."
749
 
750
 
750
-#: tracim/templates/home.mak:50 tracim/templates/user_toolbars.mak:55
751
+#: tracim/templates/home.mak:50 tracim/templates/user_toolbars.mak:63
751
 msgid "Not Read"
752
 msgid "Not Read"
752
 msgstr "Non lus"
753
 msgstr "Non lus"
753
 
754
 
759
 msgid "Last activity: {datetime}"
760
 msgid "Last activity: {datetime}"
760
 msgstr "Dernière activité : {datetime}"
761
 msgstr "Dernière activité : {datetime}"
761
 
762
 
762
-#: tracim/templates/home.mak:88 tracim/templates/user_toolbars.mak:56
763
+#: tracim/templates/home.mak:88 tracim/templates/user_toolbars.mak:64
763
 msgid "Recent Activity"
764
 msgid "Recent Activity"
764
 msgstr "Activité récente"
765
 msgstr "Activité récente"
765
 
766
 
940
 msgid "Edit user"
941
 msgid "Edit user"
941
 msgstr "Modifier l'utilisateur"
942
 msgstr "Modifier l'utilisateur"
942
 
943
 
943
-#: tracim/templates/user_toolbars.mak:18 tracim/templates/user_toolbars.mak:43
944
+#: tracim/templates/user_toolbars.mak:20 tracim/templates/user_toolbars.mak:49
944
 #: tracim/templates/widgets/forms.mak:7 tracim/templates/widgets/forms.mak:35
945
 #: tracim/templates/widgets/forms.mak:7 tracim/templates/widgets/forms.mak:35
945
 msgid "Change password"
946
 msgid "Change password"
946
 msgstr "Changer le mot de passe"
947
 msgstr "Changer le mot de passe"
947
 
948
 
948
-#: tracim/templates/user_toolbars.mak:18 tracim/templates/user_toolbars.mak:43
949
+#: tracim/templates/user_toolbars.mak:20 tracim/templates/user_toolbars.mak:49
949
 #: tracim/templates/admin/user_getall.mak:51
950
 #: tracim/templates/admin/user_getall.mak:51
950
 msgid "Password"
951
 msgid "Password"
951
 msgstr "Mot de passe"
952
 msgstr "Mot de passe"
952
 
953
 
953
-#: tracim/templates/user_toolbars.mak:24
954
+#: tracim/templates/user_toolbars.mak:28
954
 msgid "Disable user"
955
 msgid "Disable user"
955
 msgstr "Désactiver l'utilisateur"
956
 msgstr "Désactiver l'utilisateur"
956
 
957
 
957
-#: tracim/templates/user_toolbars.mak:24
958
+#: tracim/templates/user_toolbars.mak:28
958
 msgid "Disable"
959
 msgid "Disable"
959
 msgstr "Désactiver"
960
 msgstr "Désactiver"
960
 
961
 
961
-#: tracim/templates/user_toolbars.mak:26
962
+#: tracim/templates/user_toolbars.mak:30
962
 msgid "Enable user"
963
 msgid "Enable user"
963
 msgstr "Activer l'utilisateur"
964
 msgstr "Activer l'utilisateur"
964
 
965
 
965
-#: tracim/templates/user_toolbars.mak:26
966
+#: tracim/templates/user_toolbars.mak:30
966
 msgid "Enable"
967
 msgid "Enable"
967
 msgstr "Activer"
968
 msgstr "Activer"
968
 
969
 
969
-#: tracim/templates/user_toolbars.mak:42
970
+#: tracim/templates/user_toolbars.mak:46
970
 msgid "Edit my profile"
971
 msgid "Edit my profile"
971
 msgstr "Mon profil"
972
 msgstr "Mon profil"
972
 
973
 
973
-#: tracim/templates/user_toolbars.mak:47
974
+#: tracim/templates/user_toolbars.mak:55
974
 msgid "Go to..."
975
 msgid "Go to..."
975
 msgstr "Voir..."
976
 msgstr "Voir..."
976
 
977
 
977
-#: tracim/templates/user_toolbars.mak:55
978
+#: tracim/templates/user_toolbars.mak:63
978
 msgid "Not read"
979
 msgid "Not read"
979
 msgstr "Non lus"
980
 msgstr "Non lus"
980
 
981
 
981
-#: tracim/templates/user_toolbars.mak:56
982
+#: tracim/templates/user_toolbars.mak:64
982
 msgid "Activity"
983
 msgid "Activity"
983
 msgstr "Activité"
984
 msgstr "Activité"
984
 
985
 
985
-#: tracim/templates/user_toolbars.mak:57
986
+#: tracim/templates/user_toolbars.mak:65
986
 msgid "My Workspaces"
987
 msgid "My Workspaces"
987
 msgstr "Mes espaces de travail"
988
 msgstr "Mes espaces de travail"
988
 
989
 
989
-#: tracim/templates/user_toolbars.mak:57
990
+#: tracim/templates/user_toolbars.mak:65
990
 msgid "Spaces"
991
 msgid "Spaces"
991
 msgstr "Espaces"
992
 msgstr "Espaces"
992
 
993
 
1006
 #: tracim/templates/user_workspace_forms.mak:14
1007
 #: tracim/templates/user_workspace_forms.mak:14
1007
 #: tracim/templates/user_workspace_forms.mak:15
1008
 #: tracim/templates/user_workspace_forms.mak:15
1008
 #: tracim/templates/user_workspace_forms.mak:100
1009
 #: tracim/templates/user_workspace_forms.mak:100
1009
-#: tracim/templates/user_workspace_forms.mak:101
1010
-#: tracim/templates/user_workspace_forms.mak:105
1010
+#: tracim/templates/user_workspace_forms.mak:104
1011
+#: tracim/templates/user_workspace_forms.mak:111
1011
 #: tracim/templates/admin/user_getall.mak:43
1012
 #: tracim/templates/admin/user_getall.mak:43
1012
 #: tracim/templates/admin/user_getall.mak:44
1013
 #: tracim/templates/admin/user_getall.mak:44
1013
 #: tracim/templates/admin/workspace_getall.mak:41
1014
 #: tracim/templates/admin/workspace_getall.mak:41
1044
 #: tracim/templates/user_workspace_forms.mak:39
1045
 #: tracim/templates/user_workspace_forms.mak:39
1045
 #: tracim/templates/user_workspace_forms.mak:58
1046
 #: tracim/templates/user_workspace_forms.mak:58
1046
 #: tracim/templates/user_workspace_forms.mak:81
1047
 #: tracim/templates/user_workspace_forms.mak:81
1047
-#: tracim/templates/user_workspace_forms.mak:110
1048
+#: tracim/templates/user_workspace_forms.mak:116
1048
 #: tracim/templates/admin/user_getall.mak:66
1049
 #: tracim/templates/admin/user_getall.mak:66
1049
 #: tracim/templates/admin/workspace_getall.mak:53
1050
 #: tracim/templates/admin/workspace_getall.mak:53
1050
 #: tracim/templates/admin/workspace_getone.mak:93
1051
 #: tracim/templates/admin/workspace_getone.mak:93
1109
 msgid "Edit User"
1110
 msgid "Edit User"
1110
 msgstr "Modifier l'utilisateur"
1111
 msgstr "Modifier l'utilisateur"
1111
 
1112
 
1112
-#: tracim/templates/user_workspace_forms.mak:104
1113
+#: tracim/templates/user_workspace_forms.mak:102
1114
+#: tracim/templates/user_workspace_forms.mak:109
1115
+msgid "This information is managed by an external application"
1116
+msgstr "Cette information est gérée par une application externe"
1117
+
1118
+#: tracim/templates/user_workspace_forms.mak:107
1113
 #: tracim/templates/admin/user_getall.mak:47
1119
 #: tracim/templates/admin/user_getall.mak:47
1114
 #: tracim/templates/admin/user_getall.mak:106
1120
 #: tracim/templates/admin/user_getall.mak:106
1115
 msgid "Email"
1121
 msgid "Email"

+ 6 - 1
tracim/tracim/public/assets/css/dashboard.css 查看文件

361
 
361
 
362
 .panel-heading > h3 { font-size: 1.5em;}
362
 .panel-heading > h3 { font-size: 1.5em;}
363
 
363
 
364
-hr.t-toolbar-btn-group-separator { border-color: #CCC; border-style: dotted; }
364
+hr.t-toolbar-btn-group-separator { border-color: #CCC; border-style: dotted; }
365
+
366
+span.info.readonly {
367
+    font-size: 0.8em;
368
+    opacity: 0.7;
369
+}

+ 6 - 0
tracim/tracim/templates/user_workspace_forms.mak 查看文件

98
         <div class="modal-body">
98
         <div class="modal-body">
99
             <div class="form-group">
99
             <div class="form-group">
100
                 <label for="name">${_('Name')}</label>
100
                 <label for="name">${_('Name')}</label>
101
+                % if h.is_user_externalized_field('name'):
102
+                    <span class="info readonly">${_('This information is managed by an external application')}</span>
103
+                % endif
101
                 <input name="name" type="text" class="form-control" id="name" placeholder="${_('Name')}" value="${user.name}" ${'readonly="readonly"' if h.is_user_externalized_field('name') else '' | n}>
104
                 <input name="name" type="text" class="form-control" id="name" placeholder="${_('Name')}" value="${user.name}" ${'readonly="readonly"' if h.is_user_externalized_field('name') else '' | n}>
102
             </div>
105
             </div>
103
             <div class="form-group">
106
             <div class="form-group">
104
                 <label for="email">${_('Email')}</label>
107
                 <label for="email">${_('Email')}</label>
108
+                % if h.is_user_externalized_field('email'):
109
+                    <span class="info readonly">${_('This information is managed by an external application')}</span>
110
+                % endif
105
                 <input name="email" type="text" class="form-control" id="email" placeholder="${_('Name')}" value="${user.email}" ${'readonly="readonly"' if h.is_user_externalized_field('email') else '' | n}>
111
                 <input name="email" type="text" class="form-control" id="email" placeholder="${_('Name')}" value="${user.email}" ${'readonly="readonly"' if h.is_user_externalized_field('email') else '' | n}>
106
             </div>
112
             </div>
107
         </div>
113
         </div>