Project

General

Profile

Revision 53fda08d

ID53fda08db4ed0c0944a4e20da48f7af00881918a
Parent 9265bd60
Child 4317b204

Added by Francois POIROTTE over 14 years ago

Renommage des classes ServiceLowLevel & ServiceHighLevel en LowLevelService & HighLevelService, respectivement.
Mise à jour de tous les autres fichiers dans le svn impactés par ce changement.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1738 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/controllers/root.py
20 20
from vigiboard.model import DBSession
21 21
from vigiboard.model import Event, EventHistory, CorrEvent, \
22 22
                            Host, HostGroup, ServiceGroup, \
23
                            StateName, User, ServiceLowLevel
23
                            StateName, User, LowLevelService
24 24
from vigilo.models import SupItem                    
25 25
from repoze.what.predicates import Any, not_anonymous
26 26
from vigiboard.widgets.edit_event import edit_event_status_options
vigiboard/controllers/vigiboard_plugin/shn.py
10 10

  
11 11
from vigiboard.controllers.vigiboard_plugin import \
12 12
        VigiboardRequestPlugin
13
from vigiboard.model import DBSession, ServiceHighLevel, \
13
from vigiboard.model import DBSession, HighLevelService, \
14 14
                            CorrEvent, Event, \
15 15
                            ImpactedHLS, ImpactedPath
16 16
from vigilo.models.supitem import SupItem
......
42 42
            count = 0
43 43
        else:
44 44
            count = supitem.impacted_hls(
45
                ServiceHighLevel.idservice
45
                HighLevelService.idservice
46 46
            ).count()
47 47

  
48 48
        dico = {
......
75 75
            return []
76 76

  
77 77
        services = supitem.impacted_hls(
78
            ServiceHighLevel.servicename
78
            HighLevelService.servicename
79 79
        ).order_by(
80
            ServiceHighLevel.servicename.asc()
80
            HighLevelService.servicename.asc()
81 81
        ).all()
82 82

  
83 83
        return dict(services=[service.servicename for service in services])
vigiboard/controllers/vigiboardrequest.py
3 3
"""Gestion de la requête, des plugins et de l'affichage du Vigiboard"""
4 4

  
5 5
from vigiboard.model import Event, CorrEvent, EventHistory, \
6
                            Host, HostGroup, ServiceLowLevel, ServiceGroup, \
6
                            Host, HostGroup, LowLevelService, ServiceGroup, \
7 7
                            StateName
8 8
from vigilo.models import SupItem
9 9
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \
......
55 55
        self.generaterq = False
56 56
        
57 57
        lls_query = DBSession.query(
58
            ServiceLowLevel.idservice.label("idsupitem"),
59
            ServiceLowLevel.servicename.label("servicename"),
58
            LowLevelService.idservice.label("idsupitem"),
59
            LowLevelService.servicename.label("servicename"),
60 60
            Host.name.label("hostname"),
61 61
            SERVICE_GROUP_TABLE.c.idgroup.label("idservicegroup"),
62 62
            HOST_GROUP_TABLE.c.idgroup.label("idhostgroup"),
63 63
        ).join(
64
           (Host, Host.idhost == ServiceLowLevel.idhost),
64
           (Host, Host.idhost == LowLevelService.idhost),
65 65
        ).outerjoin(
66
            (HOST_GROUP_TABLE, HOST_GROUP_TABLE.c.idhost == ServiceLowLevel.idhost),
67
            (SERVICE_GROUP_TABLE, SERVICE_GROUP_TABLE.c.idservice == ServiceLowLevel.idservice),
66
            (HOST_GROUP_TABLE, HOST_GROUP_TABLE.c.idhost == LowLevelService.idhost),
67
            (SERVICE_GROUP_TABLE, SERVICE_GROUP_TABLE.c.idservice == LowLevelService.idservice),
68 68
        ).filter(
69 69
            or_(
70 70
                HOST_GROUP_TABLE.c.idgroup.in_(self.user_groups),
vigiboard/i18n/en_US/LC_MESSAGES/vigiboard.po
8 8
"Project-Id-Version: vigiboard 0.1\n"
9 9
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10 10
"POT-Creation-Date: 2009-07-06 11:19+0200\n"
11
"PO-Revision-Date: 2009-12-02 12:07+0100\n"
11
"PO-Revision-Date: 2010-01-08 18:02+0100\n"
12 12
"Last-Translator: Thomas ANDREJAK <thomas.andrejak@c-s.fr>\n"
13 13
"Language-Team: en_US <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigiboard/controllers/error.py:26
21
msgid "We're sorry but we weren't able to process this request."
22
msgstr ""
23

  
24
#: vigiboard/controllers/root.py:35
20
#: vigiboard/config/app_cfg.py:102
25 21
msgid "Never"
26 22
msgstr ""
27 23

  
28
#: vigiboard/controllers/root.py:36
24
#: vigiboard/config/app_cfg.py:103
29 25
msgid "30 seconds"
30 26
msgstr ""
31 27

  
32
#: vigiboard/controllers/root.py:37
28
#: vigiboard/config/app_cfg.py:104
33 29
msgid "1 minute"
34 30
msgstr ""
35 31

  
36
#: vigiboard/controllers/root.py:38
32
#: vigiboard/config/app_cfg.py:105
37 33
msgid "5 minutes"
38 34
msgstr ""
39 35

  
40
#: vigiboard/controllers/root.py:39
36
#: vigiboard/config/app_cfg.py:106
41 37
msgid "10 minutes"
42 38
msgstr ""
43 39

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
40
#: vigiboard/controllers/error.py:26
41
msgid "We're sorry but we weren't able to process this request."
42
msgstr ""
43

  
44
#: vigiboard/controllers/root.py:51 vigiboard/controllers/root.py:195
45
#: vigiboard/controllers/root.py:274 vigiboard/controllers/root.py:325
46
#: vigiboard/controllers/root.py:393
47 47
msgid "You need to be authenticated"
48 48
msgstr ""
49 49

  
50
#: vigiboard/controllers/root.py:247
50
#. TRANSLATORS: Format de date et heure.
51
#: vigiboard/controllers/root.py:144 vigiboard/controllers/root.py:154
52
#: vigiboard/controllers/vigiboardrequest.py:453
53
#, python-format
54
msgid "%Y-%m-%d %I:%M:%S %p"
55
msgstr ""
56

  
57
#: vigiboard/controllers/root.py:289
51 58
msgid "Error in DB"
52 59
msgstr ""
53 60

  
54
#: vigiboard/controllers/root.py:356
61
#: vigiboard/controllers/root.py:409
55 62
msgid "No event has been selected"
56 63
msgstr ""
57 64

  
58
#: vigiboard/controllers/root.py:370
65
#: vigiboard/controllers/root.py:423
59 66
msgid "No access to this event"
60 67
msgstr ""
61 68

  
62
#: vigiboard/controllers/root.py:388
69
#: vigiboard/controllers/root.py:441
63 70
#, python-format
64 71
msgid "Changed trouble ticket from '%s' to '%s'"
65 72
msgstr ""
66 73

  
67
#: vigiboard/controllers/root.py:402
74
#: vigiboard/controllers/root.py:455
68 75
#, python-format
69 76
msgid "Changed acknowledgement status from '%s' to '%s'"
70 77
msgstr ""
71 78

  
72
#: vigiboard/controllers/root.py:412
79
#: vigiboard/controllers/root.py:465
73 80
msgid "Updated successfully"
74 81
msgstr ""
75 82

  
......
86 93
msgid "We hope to see you soon!"
87 94
msgstr ""
88 95

  
89
#: vigiboard/controllers/vigiboardrequest.py:293
96
#: vigiboard/controllers/vigiboardrequest.py:298
90 97
msgid "Closed"
91 98
msgstr ""
92 99

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
100
#: vigiboard/controllers/vigiboardrequest.py:303
94 101
msgid "Acknowledged"
95 102
msgstr ""
96 103

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
104
#: vigiboard/controllers/vigiboardrequest.py:328
98 105
msgid "Date"
99 106
msgstr ""
100 107

  
101
#: vigiboard/controllers/vigiboardrequest.py:324
108
#: vigiboard/controllers/vigiboardrequest.py:329
102 109
msgid "Duration"
103 110
msgstr ""
104 111

  
105
#: vigiboard/controllers/vigiboardrequest.py:326
112
#: vigiboard/controllers/vigiboardrequest.py:331
106 113
msgid "Priority"
107 114
msgstr ""
108 115

  
109
#: vigiboard/controllers/vigiboardrequest.py:326
116
#: vigiboard/controllers/vigiboardrequest.py:331
110 117
msgid "ITIL Priority"
111 118
msgstr ""
112 119

  
113
#: vigiboard/controllers/vigiboardrequest.py:327
120
#: vigiboard/controllers/vigiboardrequest.py:332
114 121
msgid "Occurrence count"
115 122
msgstr ""
116 123

  
117
#: vigiboard/controllers/vigiboardrequest.py:328
118
#: vigiboard/widgets/edit_event.py:41
124
#: vigiboard/controllers/vigiboardrequest.py:333
125
#: vigiboard/widgets/search_form.py:27
119 126
msgid "Host"
120 127
msgstr ""
121 128

  
122
#: vigiboard/controllers/vigiboardrequest.py:329
129
#: vigiboard/controllers/vigiboardrequest.py:334
123 130
msgid "Service Type"
124 131
msgstr ""
125 132

  
126
#: vigiboard/controllers/vigiboardrequest.py:329
133
#: vigiboard/controllers/vigiboardrequest.py:334
127 134
msgid "Service Name"
128 135
msgstr ""
129 136

  
130
#: vigiboard/controllers/vigiboardrequest.py:331
131
#: vigiboard/widgets/edit_event.py:43
137
#: vigiboard/controllers/vigiboardrequest.py:336
138
#: vigiboard/widgets/search_form.py:29
132 139
msgid "Output"
133 140
msgstr ""
134 141

  
135
#: vigiboard/controllers/vigiboardrequest.py:334
142
#: vigiboard/controllers/vigiboardrequest.py:339
136 143
msgid "TT"
137 144
msgstr ""
138 145

  
139
#: vigiboard/controllers/vigiboardrequest.py:334
140
#: vigiboard/widgets/edit_event.py:26 vigiboard/widgets/edit_event.py:44
146
#: vigiboard/controllers/vigiboardrequest.py:339
147
#: vigiboard/widgets/edit_event.py:27 vigiboard/widgets/search_form.py:30
141 148
msgid "Trouble Ticket"
142 149
msgstr ""
143 150

  
144
#: vigiboard/controllers/vigiboardrequest.py:445
145
msgid "Edit Event"
146
msgstr ""
147

  
148
#: vigiboard/controllers/vigiboardrequest.py:451
149
msgid "Search Event"
150
msgstr ""
151

  
152
#: vigiboard/controllers/vigiboardrequest.py:455
153
msgid "History"
154
msgstr ""
155

  
156 151
#: vigiboard/controllers/vigiboard_plugin/__init__.py:42
157 152
msgid "Error"
158 153
msgstr ""
159 154

  
160
#: vigiboard/controllers/vigiboard_plugin/shn.py:23
155
#: vigiboard/controllers/vigiboard_plugin/shn.py:28
161 156
msgid "Impacted HLS"
162 157
msgstr ""
163 158

  
164
#: vigiboard/controllers/vigiboard_plugin/shn.py:24
159
#: vigiboard/controllers/vigiboard_plugin/shn.py:29
165 160
msgid "Impacted High-Level Services"
166 161
msgstr ""
167 162

  
168
#: vigiboard/controllers/vigiboard_plugin/shn.py:51
169
msgid "High-Level Services"
170
msgstr ""
171

  
172
#: vigiboard/widgets/edit_event.py:9
163
#: vigiboard/widgets/edit_event.py:12
173 164
msgid "No change"
174 165
msgstr ""
175 166

  
176
#: vigiboard/widgets/edit_event.py:10
167
#: vigiboard/widgets/edit_event.py:13
177 168
msgid "Change to None"
178 169
msgstr ""
179 170

  
180
#: vigiboard/widgets/edit_event.py:11
171
#: vigiboard/widgets/edit_event.py:14
181 172
msgid "Change to Acknowledged"
182 173
msgstr ""
183 174

  
184
#: vigiboard/widgets/edit_event.py:12
175
#: vigiboard/widgets/edit_event.py:15
185 176
msgid "Change to Closed"
186 177
msgstr ""
187 178

  
188
#: vigiboard/widgets/edit_event.py:29
179
#: vigiboard/widgets/edit_event.py:28
180
msgid "Status"
181
msgstr ""
182

  
183
#: vigiboard/widgets/edit_event.py:31
189 184
msgid "Apply"
190 185
msgstr ""
191 186

  
192
#: vigiboard/widgets/edit_event.py:42
187
#: vigiboard/widgets/search_form.py:25
188
msgid "Host group"
189
msgstr ""
190

  
191
#: vigiboard/widgets/search_form.py:26
192
msgid "Service group"
193
msgstr ""
194

  
195
#: vigiboard/widgets/search_form.py:28
193 196
msgid "Service"
194 197
msgstr ""
195 198

  
196
#: vigiboard/widgets/edit_event.py:48
199
#: vigiboard/widgets/search_form.py:39
200
msgid "From:"
201
msgstr ""
202

  
203
#: vigiboard/widgets/search_form.py:40 vigiboard/widgets/search_form.py:48
204
msgid "Choose"
205
msgstr ""
206

  
207
#: vigiboard/widgets/search_form.py:47
208
msgid "To:"
209
msgstr ""
210

  
211
#: vigiboard/widgets/search_form.py:53
197 212
msgid "Search"
198 213
msgstr ""
199 214

  
vigiboard/i18n/fr_FR/LC_MESSAGES/vigiboard.po
8 8
"Project-Id-Version: vigiboard 0.1\n"
9 9
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10 10
"POT-Creation-Date: 2009-07-06 11:19+0200\n"
11
"PO-Revision-Date: 2009-12-02 12:07+0100\n"
11
"PO-Revision-Date: 2010-01-08 18:02+0100\n"
12 12
"Last-Translator: Thomas ANDREJAK <thomas.andrejak@c-s.fr>\n"
13 13
"Language-Team: fr_FR <LL@li.org>\n"
14 14
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigiboard/controllers/error.py:26
21
msgid "We're sorry but we weren't able to process this request."
22
msgstr "Désolé mais nous n'avons pas pu traiter votre requête."
23

  
24
#: vigiboard/controllers/root.py:35
20
#: vigiboard/config/app_cfg.py:102
25 21
msgid "Never"
26 22
msgstr "Jamais"
27 23

  
28
#: vigiboard/controllers/root.py:36
24
#: vigiboard/config/app_cfg.py:103
29 25
msgid "30 seconds"
30 26
msgstr "30 secondes"
31 27

  
32
#: vigiboard/controllers/root.py:37
28
#: vigiboard/config/app_cfg.py:104
33 29
msgid "1 minute"
34 30
msgstr "1 minute"
35 31

  
36
#: vigiboard/controllers/root.py:38
32
#: vigiboard/config/app_cfg.py:105
37 33
msgid "5 minutes"
38 34
msgstr "5 minutes"
39 35

  
40
#: vigiboard/controllers/root.py:39
36
#: vigiboard/config/app_cfg.py:106
41 37
msgid "10 minutes"
42 38
msgstr "10 minutes"
43 39

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
40
#: vigiboard/controllers/error.py:26
41
msgid "We're sorry but we weren't able to process this request."
42
msgstr "Désolé mais nous n'avons pas pu traiter votre requête."
43

  
44
#: vigiboard/controllers/root.py:51 vigiboard/controllers/root.py:195
45
#: vigiboard/controllers/root.py:274 vigiboard/controllers/root.py:325
46
#: vigiboard/controllers/root.py:393
47 47
msgid "You need to be authenticated"
48 48
msgstr "Vous devez vous authentifier"
49 49

  
50
#: vigiboard/controllers/root.py:247
50
#. TRANSLATORS: Format de date et heure.
51
#: vigiboard/controllers/root.py:144 vigiboard/controllers/root.py:154
52
#: vigiboard/controllers/vigiboardrequest.py:453
53
#, python-format
54
msgid "%Y-%m-%d %I:%M:%S %p"
55
msgstr ""
56

  
57
#: vigiboard/controllers/root.py:289
51 58
msgid "Error in DB"
52 59
msgstr "Erreur dans la base de données"
53 60

  
54
#: vigiboard/controllers/root.py:356
61
#: vigiboard/controllers/root.py:409
55 62
msgid "No event has been selected"
56 63
msgstr "Aucun événement sélectionné"
57 64

  
58
#: vigiboard/controllers/root.py:370
65
#: vigiboard/controllers/root.py:423
59 66
msgid "No access to this event"
60 67
msgstr "Accès à cet événement refusé"
61 68

  
62
#: vigiboard/controllers/root.py:388
69
#: vigiboard/controllers/root.py:441
63 70
#, python-format
64 71
msgid "Changed trouble ticket from '%s' to '%s'"
65 72
msgstr "A changé le ticket d'incidence de '%s' en '%s'"
66 73

  
67
#: vigiboard/controllers/root.py:402
74
#: vigiboard/controllers/root.py:455
68 75
#, python-format
69 76
msgid "Changed acknowledgement status from '%s' to '%s'"
70 77
msgstr "A changé l'état d'acquittement de '%s' en '%s'"
71 78

  
72
#: vigiboard/controllers/root.py:412
79
#: vigiboard/controllers/root.py:465
73 80
msgid "Updated successfully"
74 81
msgstr "Mise à jour réussie"
75 82

  
......
86 93
msgid "We hope to see you soon!"
87 94
msgstr "Nous espérons vous revoir bientôt!"
88 95

  
89
#: vigiboard/controllers/vigiboardrequest.py:293
96
#: vigiboard/controllers/vigiboardrequest.py:298
90 97
msgid "Closed"
91 98
msgstr "Fermé"
92 99

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
100
#: vigiboard/controllers/vigiboardrequest.py:303
94 101
msgid "Acknowledged"
95 102
msgstr "Pris en compte"
96 103

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
104
#: vigiboard/controllers/vigiboardrequest.py:328
98 105
msgid "Date"
99 106
msgstr "Date"
100 107

  
101
#: vigiboard/controllers/vigiboardrequest.py:324
108
#: vigiboard/controllers/vigiboardrequest.py:329
102 109
msgid "Duration"
103 110
msgstr "Durée"
104 111

  
105
#: vigiboard/controllers/vigiboardrequest.py:326
112
#: vigiboard/controllers/vigiboardrequest.py:331
106 113
msgid "Priority"
107 114
msgstr "Priorité"
108 115

  
109
#: vigiboard/controllers/vigiboardrequest.py:326
116
#: vigiboard/controllers/vigiboardrequest.py:331
110 117
msgid "ITIL Priority"
111 118
msgstr "Priorité ITIL"
112 119

  
113
#: vigiboard/controllers/vigiboardrequest.py:327
120
#: vigiboard/controllers/vigiboardrequest.py:332
114 121
msgid "Occurrence count"
115 122
msgstr "Nombre d'occurrences"
116 123

  
117
#: vigiboard/controllers/vigiboardrequest.py:328
118
#: vigiboard/widgets/edit_event.py:41
124
#: vigiboard/controllers/vigiboardrequest.py:333
125
#: vigiboard/widgets/search_form.py:27
119 126
msgid "Host"
120 127
msgstr "Hôte"
121 128

  
122
#: vigiboard/controllers/vigiboardrequest.py:329
129
#: vigiboard/controllers/vigiboardrequest.py:334
123 130
msgid "Service Type"
124 131
msgstr "Type de service"
125 132

  
126
#: vigiboard/controllers/vigiboardrequest.py:329
133
#: vigiboard/controllers/vigiboardrequest.py:334
127 134
msgid "Service Name"
128 135
msgstr "Nom du service"
129 136

  
130
#: vigiboard/controllers/vigiboardrequest.py:331
131
#: vigiboard/widgets/edit_event.py:43
137
#: vigiboard/controllers/vigiboardrequest.py:336
138
#: vigiboard/widgets/search_form.py:29
132 139
msgid "Output"
133 140
msgstr "Sortie d'erreur"
134 141

  
135
#: vigiboard/controllers/vigiboardrequest.py:334
142
#: vigiboard/controllers/vigiboardrequest.py:339
136 143
msgid "TT"
137 144
msgstr "TT"
138 145

  
139
#: vigiboard/controllers/vigiboardrequest.py:334
140
#: vigiboard/widgets/edit_event.py:26 vigiboard/widgets/edit_event.py:44
146
#: vigiboard/controllers/vigiboardrequest.py:339
147
#: vigiboard/widgets/edit_event.py:27 vigiboard/widgets/search_form.py:30
141 148
msgid "Trouble Ticket"
142 149
msgstr "Ticket d'incidence"
143 150

  
144
#: vigiboard/controllers/vigiboardrequest.py:445
145
msgid "Edit Event"
146
msgstr "Edition d'événements"
147

  
148
#: vigiboard/controllers/vigiboardrequest.py:451
149
msgid "Search Event"
150
msgstr "Recherche d'événements"
151

  
152
#: vigiboard/controllers/vigiboardrequest.py:455
153
msgid "History"
154
msgstr "Historique"
155

  
156 151
#: vigiboard/controllers/vigiboard_plugin/__init__.py:42
157 152
msgid "Error"
158 153
msgstr "Erreur"
159 154

  
160
#: vigiboard/controllers/vigiboard_plugin/shn.py:23
155
#: vigiboard/controllers/vigiboard_plugin/shn.py:28
161 156
msgid "Impacted HLS"
162 157
msgstr "SHN impactés"
163 158

  
164
#: vigiboard/controllers/vigiboard_plugin/shn.py:24
159
#: vigiboard/controllers/vigiboard_plugin/shn.py:29
165 160
msgid "Impacted High-Level Services"
166 161
msgstr "Services de Haut Niveau impactes"
167 162

  
168
#: vigiboard/controllers/vigiboard_plugin/shn.py:51
169
msgid "High-Level Services"
170
msgstr "Services de Haut Niveau"
171

  
172
#: vigiboard/widgets/edit_event.py:9
163
#: vigiboard/widgets/edit_event.py:12
173 164
msgid "No change"
174 165
msgstr "Pas de changement"
175 166

  
176
#: vigiboard/widgets/edit_event.py:10
167
#: vigiboard/widgets/edit_event.py:13
177 168
msgid "Change to None"
178 169
msgstr "Changer en Non pris en compte"
179 170

  
180
#: vigiboard/widgets/edit_event.py:11
171
#: vigiboard/widgets/edit_event.py:14
181 172
msgid "Change to Acknowledged"
182 173
msgstr "Changer en Pris en compte"
183 174

  
184
#: vigiboard/widgets/edit_event.py:12
175
#: vigiboard/widgets/edit_event.py:15
185 176
msgid "Change to Closed"
186 177
msgstr "Changer en Fermé"
187 178

  
188
#: vigiboard/widgets/edit_event.py:29
179
#: vigiboard/widgets/edit_event.py:28
180
msgid "Status"
181
msgstr "Statut"
182

  
183
#: vigiboard/widgets/edit_event.py:31
189 184
msgid "Apply"
190 185
msgstr "Appliquer"
191 186

  
192
#: vigiboard/widgets/edit_event.py:42
187
#: vigiboard/widgets/search_form.py:25
188
msgid "Host group"
189
msgstr ""
190

  
191
#: vigiboard/widgets/search_form.py:26
192
#, fuzzy
193
msgid "Service group"
194
msgstr "Type de service"
195

  
196
#: vigiboard/widgets/search_form.py:28
193 197
msgid "Service"
194 198
msgstr "Service"
195 199

  
196
#: vigiboard/widgets/edit_event.py:48
200
#: vigiboard/widgets/search_form.py:39
201
msgid "From:"
202
msgstr ""
203

  
204
#: vigiboard/widgets/search_form.py:40 vigiboard/widgets/search_form.py:48
205
msgid "Choose"
206
msgstr ""
207

  
208
#: vigiboard/widgets/search_form.py:47
209
msgid "To:"
210
msgstr ""
211

  
212
#: vigiboard/widgets/search_form.py:53
197 213
msgid "Search"
198 214
msgstr "Rechercher"
199 215

  
vigiboard/i18n/vigiboard.pot
1 1
# Translations template for vigiboard.
2
# Copyright (C) 2009 ORGANIZATION
2
# Copyright (C) 2010 ORGANIZATION
3 3
# This file is distributed under the same license as the vigiboard project.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
5 5
#
6 6
#, fuzzy
7 7
msgid ""
8 8
msgstr ""
9 9
"Project-Id-Version: vigiboard 0.1\n"
10 10
"Report-Msgid-Bugs-To: contact@projet-vigilo.org\n"
11
"POT-Creation-Date: 2009-12-02 12:06+0100\n"
11
"POT-Creation-Date: 2010-01-08 18:02+0100\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"
......
17 17
"Content-Transfer-Encoding: 8bit\n"
18 18
"Generated-By: Babel 0.9.4\n"
19 19

  
20
#: vigiboard/controllers/error.py:26
21
msgid "We're sorry but we weren't able to process this request."
22
msgstr ""
23

  
24
#: vigiboard/controllers/root.py:35
20
#: vigiboard/config/app_cfg.py:102
25 21
msgid "Never"
26 22
msgstr ""
27 23

  
28
#: vigiboard/controllers/root.py:36
24
#: vigiboard/config/app_cfg.py:103
29 25
msgid "30 seconds"
30 26
msgstr ""
31 27

  
32
#: vigiboard/controllers/root.py:37
28
#: vigiboard/config/app_cfg.py:104
33 29
msgid "1 minute"
34 30
msgstr ""
35 31

  
36
#: vigiboard/controllers/root.py:38
32
#: vigiboard/config/app_cfg.py:105
37 33
msgid "5 minutes"
38 34
msgstr ""
39 35

  
40
#: vigiboard/controllers/root.py:39
36
#: vigiboard/config/app_cfg.py:106
41 37
msgid "10 minutes"
42 38
msgstr ""
43 39

  
44
#: vigiboard/controllers/root.py:56 vigiboard/controllers/root.py:157
45
#: vigiboard/controllers/root.py:232 vigiboard/controllers/root.py:279
46
#: vigiboard/controllers/root.py:340
40
#: vigiboard/controllers/error.py:26
41
msgid "We're sorry but we weren't able to process this request."
42
msgstr ""
43

  
44
#: vigiboard/controllers/root.py:51 vigiboard/controllers/root.py:195
45
#: vigiboard/controllers/root.py:274 vigiboard/controllers/root.py:325
46
#: vigiboard/controllers/root.py:393
47 47
msgid "You need to be authenticated"
48 48
msgstr ""
49 49

  
50
#: vigiboard/controllers/root.py:247
50
#. TRANSLATORS: Format de date et heure.
51
#: vigiboard/controllers/root.py:144 vigiboard/controllers/root.py:154
52
#: vigiboard/controllers/vigiboardrequest.py:453
53
#, python-format
54
msgid "%Y-%m-%d %I:%M:%S %p"
55
msgstr ""
56

  
57
#: vigiboard/controllers/root.py:289
51 58
msgid "Error in DB"
52 59
msgstr ""
53 60

  
54
#: vigiboard/controllers/root.py:356
61
#: vigiboard/controllers/root.py:409
55 62
msgid "No event has been selected"
56 63
msgstr ""
57 64

  
58
#: vigiboard/controllers/root.py:370
65
#: vigiboard/controllers/root.py:423
59 66
msgid "No access to this event"
60 67
msgstr ""
61 68

  
62
#: vigiboard/controllers/root.py:388
69
#: vigiboard/controllers/root.py:441
63 70
#, python-format
64 71
msgid "Changed trouble ticket from '%s' to '%s'"
65 72
msgstr ""
66 73

  
67
#: vigiboard/controllers/root.py:402
74
#: vigiboard/controllers/root.py:455
68 75
#, python-format
69 76
msgid "Changed acknowledgement status from '%s' to '%s'"
70 77
msgstr ""
71 78

  
72
#: vigiboard/controllers/root.py:412
79
#: vigiboard/controllers/root.py:465
73 80
msgid "Updated successfully"
74 81
msgstr ""
75 82

  
......
86 93
msgid "We hope to see you soon!"
87 94
msgstr ""
88 95

  
89
#: vigiboard/controllers/vigiboardrequest.py:293
96
#: vigiboard/controllers/vigiboardrequest.py:298
90 97
msgid "Closed"
91 98
msgstr ""
92 99

  
93
#: vigiboard/controllers/vigiboardrequest.py:298
100
#: vigiboard/controllers/vigiboardrequest.py:303
94 101
msgid "Acknowledged"
95 102
msgstr ""
96 103

  
97
#: vigiboard/controllers/vigiboardrequest.py:323
104
#: vigiboard/controllers/vigiboardrequest.py:328
98 105
msgid "Date"
99 106
msgstr ""
100 107

  
101
#: vigiboard/controllers/vigiboardrequest.py:324
108
#: vigiboard/controllers/vigiboardrequest.py:329
102 109
msgid "Duration"
103 110
msgstr ""
104 111

  
105
#: vigiboard/controllers/vigiboardrequest.py:326
112
#: vigiboard/controllers/vigiboardrequest.py:331
106 113
msgid "Priority"
107 114
msgstr ""
108 115

  
109
#: vigiboard/controllers/vigiboardrequest.py:326
116
#: vigiboard/controllers/vigiboardrequest.py:331
110 117
msgid "ITIL Priority"
111 118
msgstr ""
112 119

  
113
#: vigiboard/controllers/vigiboardrequest.py:327
120
#: vigiboard/controllers/vigiboardrequest.py:332
114 121
msgid "Occurrence count"
115 122
msgstr ""
116 123

  
117
#: vigiboard/controllers/vigiboardrequest.py:328 vigiboard/widgets/edit_event.py:41
124
#: vigiboard/controllers/vigiboardrequest.py:333
125
#: vigiboard/widgets/search_form.py:27
118 126
msgid "Host"
119 127
msgstr ""
120 128

  
121
#: vigiboard/controllers/vigiboardrequest.py:329
129
#: vigiboard/controllers/vigiboardrequest.py:334
122 130
msgid "Service Type"
123 131
msgstr ""
124 132

  
125
#: vigiboard/controllers/vigiboardrequest.py:329
133
#: vigiboard/controllers/vigiboardrequest.py:334
126 134
msgid "Service Name"
127 135
msgstr ""
128 136

  
129
#: vigiboard/controllers/vigiboardrequest.py:331 vigiboard/widgets/edit_event.py:43
137
#: vigiboard/controllers/vigiboardrequest.py:336
138
#: vigiboard/widgets/search_form.py:29
130 139
msgid "Output"
131 140
msgstr ""
132 141

  
133
#: vigiboard/controllers/vigiboardrequest.py:334
142
#: vigiboard/controllers/vigiboardrequest.py:339
134 143
msgid "TT"
135 144
msgstr ""
136 145

  
137
#: vigiboard/controllers/vigiboardrequest.py:334 vigiboard/widgets/edit_event.py:26
138
#: vigiboard/widgets/edit_event.py:44
146
#: vigiboard/controllers/vigiboardrequest.py:339 vigiboard/widgets/edit_event.py:27
147
#: vigiboard/widgets/search_form.py:30
139 148
msgid "Trouble Ticket"
140 149
msgstr ""
141 150

  
142
#: vigiboard/controllers/vigiboardrequest.py:445
143
msgid "Edit Event"
144
msgstr ""
145

  
146
#: vigiboard/controllers/vigiboardrequest.py:451
147
msgid "Search Event"
148
msgstr ""
149

  
150
#: vigiboard/controllers/vigiboardrequest.py:455
151
msgid "History"
152
msgstr ""
153

  
154 151
#: vigiboard/controllers/vigiboard_plugin/__init__.py:42
155 152
msgid "Error"
156 153
msgstr ""
157 154

  
158
#: vigiboard/controllers/vigiboard_plugin/shn.py:23
155
#: vigiboard/controllers/vigiboard_plugin/shn.py:28
159 156
msgid "Impacted HLS"
160 157
msgstr ""
161 158

  
162
#: vigiboard/controllers/vigiboard_plugin/shn.py:24
159
#: vigiboard/controllers/vigiboard_plugin/shn.py:29
163 160
msgid "Impacted High-Level Services"
164 161
msgstr ""
165 162

  
166
#: vigiboard/controllers/vigiboard_plugin/shn.py:51
167
msgid "High-Level Services"
168
msgstr ""
169

  
170
#: vigiboard/widgets/edit_event.py:9
163
#: vigiboard/widgets/edit_event.py:12
171 164
msgid "No change"
172 165
msgstr ""
173 166

  
174
#: vigiboard/widgets/edit_event.py:10
167
#: vigiboard/widgets/edit_event.py:13
175 168
msgid "Change to None"
176 169
msgstr ""
177 170

  
178
#: vigiboard/widgets/edit_event.py:11
171
#: vigiboard/widgets/edit_event.py:14
179 172
msgid "Change to Acknowledged"
180 173
msgstr ""
181 174

  
182
#: vigiboard/widgets/edit_event.py:12
175
#: vigiboard/widgets/edit_event.py:15
183 176
msgid "Change to Closed"
184 177
msgstr ""
185 178

  
186
#: vigiboard/widgets/edit_event.py:29
179
#: vigiboard/widgets/edit_event.py:28
180
msgid "Status"
181
msgstr ""
182

  
183
#: vigiboard/widgets/edit_event.py:31
187 184
msgid "Apply"
188 185
msgstr ""
189 186

  
190
#: vigiboard/widgets/edit_event.py:42
187
#: vigiboard/widgets/search_form.py:25
188
msgid "Host group"
189
msgstr ""
190

  
191
#: vigiboard/widgets/search_form.py:26
192
msgid "Service group"
193
msgstr ""
194

  
195
#: vigiboard/widgets/search_form.py:28
191 196
msgid "Service"
192 197
msgstr ""
193 198

  
194
#: vigiboard/widgets/edit_event.py:48
199
#: vigiboard/widgets/search_form.py:39
200
msgid "From:"
201
msgstr ""
202

  
203
#: vigiboard/widgets/search_form.py:40 vigiboard/widgets/search_form.py:48
204
msgid "Choose"
205
msgstr ""
206

  
207
#: vigiboard/widgets/search_form.py:47
208
msgid "To:"
209
msgstr ""
210

  
211
#: vigiboard/widgets/search_form.py:53
195 212
msgid "Search"
196 213
msgstr ""
197 214

  
vigiboard/model/__init__.py
11 11
from vigilo.models import Event, EventHistory, CorrEvent
12 12
from vigilo.models import Version, StateName, ApplicationLog
13 13
from vigilo.models import Host, HostGroup
14
from vigilo.models import ServiceLowLevel, ServiceHighLevel, ServiceGroup
14
from vigilo.models import LowLevelService, HighLevelService, ServiceGroup
15 15
from vigilo.models import ImpactedHLS, ImpactedPath
16 16

  
vigiboard/tests/functional/test_event_table.py
12 12
from vigiboard.model import DBSession, \
13 13
    Event, EventHistory, CorrEvent, \
14 14
    Permission, User, StateName, \
15
    Host, HostGroup, ServiceLowLevel, ServiceGroup
15
    Host, HostGroup, LowLevelService, ServiceGroup
16 16
from vigiboard.tests import TestController
17 17
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
18 18
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin
vigiboard/tests/functional/test_history_form.py
10 10
from vigiboard.tests import TestController
11 11
from vigiboard.model import DBSession, ServiceGroup, HostGroup, \
12 12
                            Host, Permission, StateName, \
13
                            ServiceLowLevel, Event, CorrEvent
13
                            LowLevelService, Event, CorrEvent
14 14

  
15 15
def insert_deps(return_service):
16 16
    """Insère les dépendances nécessaires aux tests."""
......
48 48
    )
49 49
    DBSession.add(servicegroup)
50 50

  
51
    service = ServiceLowLevel(
51
    service = LowLevelService(
52 52
        host=host,
53 53
        command=u'',
54 54
        weight=42,
vigiboard/tests/functional/test_history_tables.py
12 12
from vigiboard.model import DBSession, \
13 13
    Event, EventHistory, CorrEvent, \
14 14
    Permission, User, StateName, \
15
    Host, HostGroup, ServiceLowLevel, ServiceGroup
15
    Host, HostGroup, LowLevelService, ServiceGroup
16 16
from vigiboard.tests import TestController
17 17
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
18 18
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin
......
54 54
    DBSession.flush()
55 55

  
56 56
    # On crée un services de bas niveau, et on l'ajoute au groupe de services.
57
    managerservice = ServiceLowLevel(
57
    managerservice = LowLevelService(
58 58
        host = managerhost,
59 59
        servicename = u'managerservice',
60 60
        command = u'halt',
vigiboard/tests/functional/test_host_vigiboardrequest.py
12 12
from vigiboard.model import DBSession, \
13 13
    Event, EventHistory, CorrEvent, \
14 14
    Permission, User, StateName, \
15
    Host, HostGroup, ServiceLowLevel, ServiceGroup
15
    Host, HostGroup, LowLevelService, ServiceGroup
16 16
from vigiboard.tests import TestController
17 17
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
18 18
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin
vigiboard/tests/functional/test_search_form_hostgroup.py
8 8

  
9 9
from vigiboard.tests import TestController
10 10
from vigiboard.model import DBSession, HostGroup, Host, Permission, \
11
                            ServiceLowLevel, Event, CorrEvent, StateName
11
                            LowLevelService, Event, CorrEvent, StateName
12 12

  
13 13
def insert_deps():
14 14
    """Insère les dépendances nécessaires aux tests."""
vigiboard/tests/functional/test_search_form_service.py
9 9
from vigiboard.tests import TestController
10 10
from vigiboard.model import DBSession, ServiceGroup, HostGroup, \
11 11
                            Host, Permission, StateName, \
12
                            ServiceLowLevel, Event, CorrEvent
12
                            LowLevelService, Event, CorrEvent
13 13

  
14 14
def insert_deps():
15 15
    """Insère les dépendances nécessaires aux tests."""
......
47 47
    )
48 48
    DBSession.add(servicegroup)
49 49

  
50
    service = ServiceLowLevel(
50
    service = LowLevelService(
51 51
        host=host,
52 52
        command=u'',
53 53
        weight=42,
vigiboard/tests/functional/test_search_form_servicegroup.py
8 8

  
9 9
from vigiboard.tests import TestController
10 10
from vigiboard.model import DBSession, ServiceGroup, Host, Permission, \
11
                            ServiceLowLevel, Event, CorrEvent, StateName
11
                            LowLevelService, Event, CorrEvent, StateName
12 12

  
13 13
def insert_deps():
14 14
    """Insère les dépendances nécessaires aux tests."""
......
38 38
    )
39 39
    DBSession.add(servicegroup)
40 40

  
41
    service = ServiceLowLevel(
41
    service = LowLevelService(
42 42
        host=host,
43 43
        command=u'',
44 44
        weight=42,
vigiboard/tests/functional/test_vigiboardrequest.py
12 12
from vigiboard.model import DBSession, \
13 13
    Event, EventHistory, CorrEvent, \
14 14
    Permission, User, StateName, \
15
    Host, HostGroup, ServiceLowLevel, ServiceGroup
15
    Host, HostGroup, LowLevelService, ServiceGroup
16 16
from vigiboard.tests import TestController
17 17
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
18 18
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin
......
77 77
            'weight': 42,
78 78
        }
79 79

  
80
        service1 = ServiceLowLevel(
80
        service1 = LowLevelService(
81 81
            host=managerhost,
82 82
            servicename=u'managerservice',
83 83
            **service_template
84 84
        )
85 85

  
86
        service2 = ServiceLowLevel(
86
        service2 = LowLevelService(
87 87
            host=editorhost,
88 88
            servicename=u'managerservice',
89 89
            **service_template
90 90
        )
91 91

  
92
        service3 = ServiceLowLevel(
92
        service3 = LowLevelService(
93 93
            host=managerhost,
94 94
            servicename=u'editorservice',
95 95
            **service_template
96 96
        )
97 97

  
98
        service4 = ServiceLowLevel(
98
        service4 = LowLevelService(
99 99
            host=editorhost,
100 100
            servicename=u'editorservice',
101 101
            **service_template

Also available in: Unified diff