Skip to content

Commit 8f324bd

Browse files
authored
fix: settings cleanup [DHIS2-19366] (#1430)
1 parent 8a39710 commit 8f324bd

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

i18n/en.pot

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ msgstr ""
55
"Content-Type: text/plain; charset=utf-8\n"
66
"Content-Transfer-Encoding: 8bit\n"
77
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
8-
"POT-Creation-Date: 2025-03-19T09:22:40.114Z\n"
9-
"PO-Revision-Date: 2025-03-19T09:22:40.115Z\n"
8+
"POT-Creation-Date: 2025-04-02T12:55:54.216Z\n"
9+
"PO-Revision-Date: 2025-04-02T12:55:54.216Z\n"
1010

1111
msgid "Failed to load: {{error}}"
1212
msgstr "Failed to load: {{error}}"
@@ -92,24 +92,18 @@ msgstr "Metadata Versioning"
9292
msgid "This client ID is already taken"
9393
msgstr "This client ID is already taken"
9494

95-
msgid "Name"
96-
msgstr "Name"
95+
msgid "Client ID"
96+
msgstr "Client ID"
9797

9898
msgid "Required"
9999
msgstr "Required"
100100

101-
msgid "Client ID"
102-
msgstr "Client ID"
103-
104101
msgid "Client Secret"
105102
msgstr "Client Secret"
106103

107104
msgid "Grant Types"
108105
msgstr "Grant Types"
109106

110-
msgid "Password"
111-
msgstr "Password"
112-
113107
msgid "Refresh token"
114108
msgstr "Refresh token"
115109

@@ -167,6 +161,12 @@ msgstr "OAuth2 client deleted"
167161
msgid "Failed to delete OAuth2 client"
168162
msgstr "Failed to delete OAuth2 client"
169163

164+
msgid "Name"
165+
msgstr "Name"
166+
167+
msgid "Password"
168+
msgstr "Password"
169+
170170
msgid "Settings updated"
171171
msgstr "Settings updated"
172172

@@ -282,6 +282,13 @@ msgstr "Unlimited"
282282
msgid "Maximum number of SQL view records"
283283
msgstr "Maximum number of SQL view records"
284284

285+
msgid ""
286+
"Maximum number of tracked entity records to fetch from database (enter 0 "
287+
"for unlimited)"
288+
msgstr ""
289+
"Maximum number of tracked entity records to fetch from database (enter 0 "
290+
"for unlimited)"
291+
285292
msgid "Infrastructural indicators"
286293
msgstr "Infrastructural indicators"
287294

@@ -678,9 +685,6 @@ msgstr "Login page template"
678685
msgid "Enable Global Shell"
679686
msgstr "Enable Global Shell"
680687

681-
msgid "Global Shell App"
682-
msgstr "Global Shell App"
683-
684688
msgid "Custom login page logo"
685689
msgstr "Custom login page logo"
686690

src/settingsCategories.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ export const categories = {
2727
{
2828
setting: 'keySqlViewMaxLimit',
2929
},
30+
{
31+
setting: 'KeyTrackedEntityMaxLimit',
32+
},
3033
{
3134
setting: 'infrastructuralIndicators',
3235
},
@@ -53,6 +56,7 @@ export const categories = {
5356
},
5457
{
5558
setting: 'multiOrganisationUnitForms',
59+
maximumApiVersion: 41,
5660
},
5761
{
5862
setting: 'keyAcceptanceRequiredForApproval',

src/settingsKeyMapping.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ const settingsKeyMapping = {
5454
1000000: formatNumber(1000000),
5555
},
5656
},
57+
KeyTrackedEntityMaxLimit: {
58+
label: i18n.t(
59+
'Maximum number of tracked entity records to fetch from database (enter 0 for unlimited)'
60+
),
61+
validators: ['number'],
62+
},
5763
infrastructuralIndicators: {
5864
label: i18n.t('Infrastructural indicators'),
5965
configuration: true,
@@ -381,7 +387,7 @@ const settingsKeyMapping = {
381387
multiLine: true,
382388
},
383389
keyStyle: {
384-
label: i18n.t('Style'),
390+
label: i18n.t('Style (android)'),
385391
type: 'dropdown',
386392
includeEmpty: false,
387393
userSettingsOverride: true,

0 commit comments

Comments
 (0)