Skip to content

Commit

Permalink
Merge branch 'develop' into feature/inputStyles
Browse files Browse the repository at this point in the history
  • Loading branch information
Chrisdo82 authored May 8, 2024
2 parents 9800849 + cd278b4 commit 1243b0c
Show file tree
Hide file tree
Showing 8 changed files with 85 additions and 96 deletions.
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,9 @@
"ts-node": "10.9.2",
"ts-prune": "0.10.3",
"typescript": "5.4.5"
}
},
"engines": {
"pnpm": "^8"
},
"packageManager": "pnpm@^8"
}
2 changes: 1 addition & 1 deletion packages/components/src/components/nav/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export class KolNav implements NavAPI {
_disabled={!collapsible}
_icons={'codicon codicon-' + (expanded ? 'remove' : 'add')}
_hideLabel
_label={`Untermenü zu ${link._label} ${expanded ? 'schließen' : 'öffnen'}`}
_label={`${expanded ? translate('kol-nav-label-close', { placeholders: { label: link._label } }) : translate('kol-nav-label-open', { placeholders: { label: link._label } })}`}
_on={{ onClick: () => this.handleToggleExpansionClick(link._children) }}
></KolButtonWcTag>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ export default {
'error-list-message': 'Bitte korrigieren Sie folgende Fehler:',
version: 'Versionsnummer',
'table-visible-range': 'Einträge {{start}} bis {{end}} von {{total}}',
'nav-label-open': 'Untermenü zu {{label}} öffnen',
'nav-label-close': 'Untermenü zu {{label}} schließen',
};
2 changes: 2 additions & 0 deletions packages/components/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@ export default {
'error-list-message': 'Please correct the following errors',
version: 'Version number',
'table-visible-range': 'Entries {{start}} to {{end}} of {{total}}',
'nav-label-open': 'Submenu for {{label}} open',
'nav-label-close': 'Submenu for {{label}} close',
};
4 changes: 2 additions & 2 deletions packages/samples/react/src/react.main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { setTagNameTransformer } from '@public-ui/react';

import { bootstrap } from '@public-ui/components';
import { defineCustomElements } from '@public-ui/components/dist/loader';
import { BMF, BStW, DEFAULT, ECL_EC, ECL_EU, ITZBund } from '@public-ui/themes';
import { BMF, DEFAULT, ECL_EC, ECL_EU, ITZBund } from '@public-ui/themes';

import { App } from './App';

Expand All @@ -29,7 +29,7 @@ const getThemes = async () => {
}

/* List of regular sample app themes */
return [BMF, BStW, DEFAULT, ECL_EC, ECL_EU, ITZBund] as Theme[];
return [BMF, DEFAULT, ECL_EC, ECL_EU, ITZBund] as Theme[];
};

void (async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/samples/react/src/shares/theme.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { SelectOption } from '@public-ui/components';

export const THEMES = ['bmf', 'default', 'ecl-ec', 'ecl-eu', 'itzbund'] as const;
export const THEMES = ['bmf', 'default', 'ecl-ec', 'ecl-eu', 'itzbund', 'unstyled'] as const;
export type Theme = (typeof THEMES)[number];
export type ThemeAndUnstyled = Theme | 'unstyled';

Expand Down
Loading

0 comments on commit 1243b0c

Please sign in to comment.