Skip to content

Commit c1e0c81

Browse files
authored
Merge pull request #148 from open-data/helpdesk-email
Helpdesk email configuration
2 parents 95cfdd1 + 6336a4e commit c1e0c81

File tree

3 files changed

+131
-138
lines changed

3 files changed

+131
-138
lines changed

changes/148.changes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Replaced hardcoded HelpDesk email address with configurable setting to improve flexibility and maintainability.

ckanext/recombinant/i18n/ckanext-recombinant.pot

Lines changed: 56 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: ckanext-recombinant 2.0.0.dev0\n"
1111
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
12-
"POT-Creation-Date: 2025-02-10 20:30+0000\n"
12+
"POT-Creation-Date: 2025-09-04 10:11-0400\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
3838
msgid "dataset type %s already exists for this organization"
3939
msgstr ""
4040

41-
#: ckanext/recombinant/logic.py:160 ckanext/recombinant/views.py:583
41+
#: ckanext/recombinant/logic.py:160 ckanext/recombinant/views.py:594
4242
msgid "Organization not found"
4343
msgstr ""
4444

@@ -54,170 +54,171 @@ msgstr ""
5454
msgid "Cannot assign foreign keys to a non-recombinant resource."
5555
msgstr ""
5656

57-
#: ckanext/recombinant/views.py:78 ckanext/recombinant/views.py:143
58-
#: ckanext/recombinant/views.py:679
57+
#: ckanext/recombinant/views.py:74 ckanext/recombinant/views.py:139
58+
#: ckanext/recombinant/views.py:690
5959
msgid "Form not submitted, please try again."
6060
msgstr ""
6161

62-
#: ckanext/recombinant/views.py:99
62+
#: ckanext/recombinant/views.py:95
6363
msgid "No errors found."
6464
msgstr ""
6565

66-
#: ckanext/recombinant/views.py:103
66+
#: ckanext/recombinant/views.py:99
6767
msgid "Your file was successfully uploaded into the central system."
6868
msgstr ""
6969

70-
#: ckanext/recombinant/views.py:135 ckanext/recombinant/views.py:696
71-
#: ckanext/recombinant/views.py:772
70+
#: ckanext/recombinant/views.py:131 ckanext/recombinant/views.py:707
71+
#: ckanext/recombinant/views.py:785
7272
msgid "User {0} not authorized to update resource {1}"
7373
msgstr ""
7474

75-
#: ckanext/recombinant/views.py:189
75+
#: ckanext/recombinant/views.py:185
7676
msgid "Wrong number of fields, expected {num}"
7777
msgstr ""
7878

79-
#: ckanext/recombinant/views.py:201
79+
#: ckanext/recombinant/views.py:197
8080
msgid "Invalid fields"
8181
msgstr ""
8282

83-
#: ckanext/recombinant/views.py:204
83+
#: ckanext/recombinant/views.py:200
8484
#, python-format
8585
msgid "No matching records found \"%s\""
8686
msgstr ""
8787

88-
#: ckanext/recombinant/views.py:207
88+
#: ckanext/recombinant/views.py:203
8989
msgid "Multiple matching records found"
9090
msgstr ""
9191

92-
#: ckanext/recombinant/views.py:245
92+
#: ckanext/recombinant/views.py:241
9393
msgid "{num} deleted."
9494
msgstr ""
9595

96-
#: ckanext/recombinant/views.py:291 ckanext/recombinant/views.py:302
96+
#: ckanext/recombinant/views.py:287 ckanext/recombinant/views.py:298
9797
msgid "Not found"
9898
msgstr ""
9999

100-
#: ckanext/recombinant/views.py:307
100+
#: ckanext/recombinant/views.py:303
101101
#, python-format
102102
msgid ""
103103
"Unable to download template.\n"
104104
"%s"
105105
msgstr ""
106106

107-
#: ckanext/recombinant/views.py:317 ckanext/recombinant/views.py:655
107+
#: ckanext/recombinant/views.py:313 ckanext/recombinant/views.py:666
108108
msgid "Resource not found"
109109
msgstr ""
110110

111-
#: ckanext/recombinant/views.py:332
111+
#: ckanext/recombinant/views.py:328
112112
#, python-format
113113
msgid "Unauthorized to read resource %s"
114114
msgstr ""
115115

116-
#: ckanext/recombinant/views.py:405 ckanext/recombinant/views.py:433
116+
#: ckanext/recombinant/views.py:416 ckanext/recombinant/views.py:444
117117
msgid "Recombinant dataset_type not found"
118118
msgstr ""
119119

120-
#: ckanext/recombinant/views.py:446 ckanext/recombinant/views.py:468
120+
#: ckanext/recombinant/views.py:457 ckanext/recombinant/views.py:479
121121
msgid "title"
122122
msgstr ""
123123

124-
#: ckanext/recombinant/views.py:447
124+
#: ckanext/recombinant/views.py:458
125125
msgid "notes"
126126
msgstr ""
127127

128-
#: ckanext/recombinant/views.py:489 ckanext/recombinant/views.py:491
128+
#: ckanext/recombinant/views.py:500 ckanext/recombinant/views.py:502
129129
msgid "Mandatory"
130130
msgstr ""
131131

132-
#: ckanext/recombinant/views.py:493
132+
#: ckanext/recombinant/views.py:504
133133
msgid "Conditional"
134134
msgstr ""
135135

136-
#: ckanext/recombinant/views.py:495
136+
#: ckanext/recombinant/views.py:506
137137
msgid "Optional"
138138
msgstr ""
139139

140-
#: ckanext/recombinant/views.py:548
140+
#: ckanext/recombinant/views.py:559
141141
msgid "No organizations found"
142142
msgstr ""
143143

144-
#: ckanext/recombinant/views.py:552 ckanext/recombinant/views.py:595
144+
#: ckanext/recombinant/views.py:563 ckanext/recombinant/views.py:606
145145
msgid "Recombinant resource_name not found"
146146
msgstr ""
147147

148-
#: ckanext/recombinant/views.py:606
148+
#: ckanext/recombinant/views.py:617
149149
#, python-format
150150
msgid "User %s not authorized to create packages"
151151
msgstr ""
152152

153-
#: ckanext/recombinant/views.py:634 ckanext/recombinant/views.py:703
153+
#: ckanext/recombinant/views.py:645 ckanext/recombinant/views.py:714
154154
msgid "Resources successfully refreshed."
155155
msgstr ""
156156

157-
#: ckanext/recombinant/views.py:686
157+
#: ckanext/recombinant/views.py:697
158158
msgid "Could not determine dataset to update."
159159
msgstr ""
160160

161-
#: ckanext/recombinant/views.py:705
161+
#: ckanext/recombinant/views.py:716
162162
msgid ""
163-
"Unable to regenerate the resources. Please contact <a href=\"mailto:open-"
164-
"ouvert@tbs-sct.gc.ca\">open-ouvert@tbs-sct.gc.ca</a> for assistance."
163+
"Unable to regenerate the resources. Please contact <a "
164+
"href=\"mailto:{support}\">{support}</a> for assistance."
165165
msgstr ""
166166

167-
#: ckanext/recombinant/views.py:756
167+
#: ckanext/recombinant/views.py:768
168168
msgid ""
169169
"The server encountered a problem processing the file uploaded. Please try "
170170
"copying your data into the latest version of the template and uploading "
171-
"again. If this problem continues, send your Excel file to open-ouvert@tbs-"
172-
"sct.gc.ca so we may investigate."
171+
"again. If this problem continues, send your Excel file to {support} so we may"
172+
" investigate."
173173
msgstr ""
174174

175-
#: ckanext/recombinant/views.py:763
175+
#: ckanext/recombinant/views.py:776
176176
msgid ""
177177
"Invalid file for this data type. Sheet must be labeled \"{0}\", but you "
178178
"supplied a sheet labeled \"{1}\""
179179
msgstr ""
180180

181-
#: ckanext/recombinant/views.py:776
181+
#: ckanext/recombinant/views.py:789
182182
msgid ""
183183
"Invalid sheet for this organization. Sheet must be labeled for {0}, but you "
184184
"supplied a sheet for {1}"
185185
msgstr ""
186186

187-
#: ckanext/recombinant/views.py:793
187+
#: ckanext/recombinant/views.py:806
188188
msgid ""
189189
"This template is out of date. Please try copying your data into the latest "
190190
"version of the template and uploading again. If this problem continues, send "
191-
"your Excel file to open-ouvert@tbs-sct.gc.ca so we may investigate."
191+
"your Excel file to {support} so we may investigate."
192192
msgstr ""
193193

194194
#: ckanext/recombinant/templates/snippets/stream.html:8
195195
#: ckanext/recombinant/templates/snippets/stream.html:12
196-
#: ckanext/recombinant/views.py:843
196+
#: ckanext/recombinant/views.py:857
197197
msgid "unknown"
198198
msgstr ""
199199

200-
#: ckanext/recombinant/views.py:852
200+
#: ckanext/recombinant/templates/recombinant/snippets/xls_base.html:18
201+
#: ckanext/recombinant/views.py:866
201202
msgid ":"
202203
msgstr ""
203204

204-
#: ckanext/recombinant/views.py:866
205+
#: ckanext/recombinant/views.py:880
205206
msgid "Invalid input syntax for type integer: {}"
206207
msgstr ""
207208

208-
#: ckanext/recombinant/views.py:869
209+
#: ckanext/recombinant/views.py:883
209210
msgid "Invalid input syntax for type integer"
210211
msgstr ""
211212

212-
#: ckanext/recombinant/views.py:871
213+
#: ckanext/recombinant/views.py:885
213214
msgid "Sheet {0} Row {1}:"
214215
msgstr ""
215216

216-
#: ckanext/recombinant/views.py:878
217+
#: ckanext/recombinant/views.py:892
217218
msgid "Error while importing data: {0}"
218219
msgstr ""
219220

220-
#: ckanext/recombinant/views.py:881
221+
#: ckanext/recombinant/views.py:895
221222
msgid "The template uploaded is empty"
222223
msgstr ""
223224

@@ -230,7 +231,7 @@ msgstr ""
230231
msgid "e.g."
231232
msgstr ""
232233

233-
#: ckanext/recombinant/templates/recombinant/snippets/data_dictionary.html:120
234+
#: ckanext/recombinant/templates/recombinant/snippets/data_dictionary.html:124
234235
#: ckanext/recombinant/write_excel.py:594
235236
msgid "ID"
236237
msgstr ""
@@ -255,6 +256,7 @@ msgstr ""
255256
msgid "Validation"
256257
msgstr ""
257258

259+
#: ckanext/recombinant/templates/recombinant/snippets/data_dictionary.html:125
258260
#: ckanext/recombinant/write_excel.py:614
259261
msgid "Format"
260262
msgstr ""
@@ -378,8 +380,7 @@ msgstr ""
378380
#: ckanext/recombinant/templates/recombinant/resource_edit.html:147
379381
msgid ""
380382
"We were unable to retrieve your proactive publication records from our "
381-
"database. Please contact <a href=\"open-ouvert@tbs-sct.gc.ca\">open-ouvert"
382-
"@tbs-sct.gc.ca</a>."
383+
"database. Please contact <a href=\"{support}\">{support}</a>."
383384
msgstr ""
384385

385386
#: ckanext/recombinant/templates/recombinant/resource_edit.html:150
@@ -491,9 +492,8 @@ msgstr ""
491492
#: ckanext/recombinant/templates/recombinant/snippets/api_access.html:234
492493
msgid ""
493494
"If you have modified these API Access instructions for another programming "
494-
"language please send them to <a href=\"mailto:open-ouvert@tbs-sct.gc.ca"
495-
"\">open-ouvert@tbs-sct.gc.ca</a> and we may be able to post them here as "
496-
"well."
495+
"language please send them to <a href=\"mailto:{support}\">{support}</a> and "
496+
"we may be able to post them here as well."
497497
msgstr ""
498498

499499
#: ckanext/recombinant/templates/recombinant/snippets/data_dictionary.html:3
@@ -536,10 +536,6 @@ msgstr ""
536536
msgid "Code"
537537
msgstr ""
538538

539-
#: ckanext/recombinant/templates/recombinant/snippets/data_dictionary.html:121
540-
msgid "Type"
541-
msgstr ""
542-
543539
#: ckanext/recombinant/templates/recombinant/snippets/delete.html:1
544540
msgid "Delete existing records"
545541
msgstr ""
@@ -574,9 +570,7 @@ msgid "Field(s) <em>{0}</em> do not exist in the database for this resource."
574570
msgstr ""
575571

576572
#: ckanext/recombinant/templates/recombinant/snippets/outdated_error.html:7
577-
msgid ""
578-
"Please contact <a href=\"mailto:open-ouvert@tbs-sct.gc.ca\">open-ouvert@tbs-"
579-
"sct.gc.ca</a> for assistance."
573+
msgid "Please contact <a href=\"mailto:{support}\">{support}</a> for assistance."
580574
msgstr ""
581575

582576
#: ckanext/recombinant/templates/recombinant/snippets/outdated_error.html:11
@@ -599,19 +593,19 @@ msgstr ""
599593
msgid "Upload"
600594
msgstr ""
601595

602-
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:24
596+
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:23
603597
msgid "You must provide a valid file"
604598
msgstr ""
605599

606-
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:40
600+
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:39
607601
msgid "Submit"
608602
msgstr ""
609603

610-
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:41
604+
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:40
611605
msgid "Check for Errors"
612606
msgstr ""
613607

614-
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:48
608+
#: ckanext/recombinant/templates/recombinant/snippets/xls_upload.html:47
615609
msgid ""
616610
"To ensure the validation rules within the template are maintained, please "
617611
"paste your data using the “Paste Values” function. This can be done by right-"

0 commit comments

Comments
 (0)