Skip to content

fix: add true no flag option [DHIS2-18263] #1448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomzemp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: add true no flag option [DHIS2-18263] #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48c41f
fix: add true no flag option [DHIS2-18263]
tomzemp Oct 24, 2025
3bbb565
fix: feature toggle to v41+
tomzemp Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 5 additions & 58 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2025-09-24T08:44:28.347Z\n"
"PO-Revision-Date: 2025-09-24T08:44:28.348Z\n"
"POT-Creation-Date: 2025-10-24T11:16:50.846Z\n"
"PO-Revision-Date: 2025-10-24T11:16:50.846Z\n"

msgid "Failed to load: {{error}}"
msgstr "Failed to load: {{error}}"

msgid "No flag"
msgstr "No flag"

msgid "DHIS2"
msgstr "DHIS2"

msgid "Search settings"
msgstr "Search settings"

Expand Down Expand Up @@ -908,59 +911,3 @@ msgstr "Enable Gist Overview"

msgid "Clean idle jobs after (in milliseconds)"
msgstr "Clean idle jobs after (in milliseconds)"

msgctxt "Application title"
msgid "__MANIFEST_APP_TITLE"
msgstr "System Settings"

msgctxt "Application description"
msgid "__MANIFEST_APP_DESCRIPTION"
msgstr ""

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_General"
msgstr "General"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Analytics"
msgstr "Analytics"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Server"
msgstr "Server"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Appearance"
msgstr "Appearance"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Email"
msgstr "Email"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Access"
msgstr "Access"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Calendar"
msgstr "Calendar"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Data import settings"
msgstr "Data import settings"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Synchronization"
msgstr "Synchronization"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Scheduled job settings"
msgstr "Scheduled job settings"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_Notification settings"
msgstr "Notification settings"

msgctxt "Title for shortcut used by command palette"
msgid "__MANIFEST_SHORTCUT_OAuth2 clients"
msgstr "OAuth2 clients"
10 changes: 9 additions & 1 deletion src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ const AppWrapper = () => {
} = data

const appsModulePrefix = apiVersion >= 42 ? '' : 'app:'
const newLoginAppAvailable = apiVersion >= 41
const startModules = (data.apps.modules || []).map((module) => ({
id:
module.defaultAction.substr(0, 3) === '../'
Expand All @@ -147,11 +148,18 @@ const AppWrapper = () => {
id: flag.key,
displayName: flag.name,
}))

flags.unshift({
id: 'dhis2',
displayName: i18n.t('No flag'),
displayName: i18n.t('DHIS2'),
})

if (newLoginAppAvailable) {
flags.unshift({
id: 'none',
displayName: i18n.t('No flag'),
})
}
const styles = (data.styles || []).map((style) => ({
id: style.path,
displayName: style.name,
Expand Down
Loading