Skip to content

Commit 774eb1f

Browse files
authored
Merge pull request #2360 from umbraco/v15/feature/emm-localization
Extension Manifest Map: localization
2 parents f608ded + 4be7285 commit 774eb1f

File tree

8 files changed

+17
-11
lines changed

8 files changed

+17
-11
lines changed

src/packages/core/extension-registry/models/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import type { ManifestGlobalContext } from './global-context.model.js';
2525
import type { ManifestHeaderApp, ManifestHeaderAppButtonKind } from './header-app.model.js';
2626
import type { ManifestHealthCheck } from './health-check.model.js';
2727
import type { ManifestIcons } from './icons.model.js';
28-
import type { ManifestLocalization } from './localization.model.js';
2928
import type { ManifestMenu } from './menu.model.js';
3029
import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
3130
import type { ManifestPreviewAppProvider } from './preview-app.model.js';
@@ -61,7 +60,6 @@ export type * from './global-context.model.js';
6160
export type * from './header-app.model.js';
6261
export type * from './health-check.model.js';
6362
export type * from './icons.model.js';
64-
export type * from './localization.model.js';
6563
export type * from './menu-item.model.js';
6664
export type * from './menu.model.js';
6765
export type * from './mfa-login-provider.model.js';
@@ -116,7 +114,6 @@ export type ManifestTypes =
116114
| ManifestHealthCheck
117115
| ManifestIcons
118116
| ManifestItemStore
119-
| ManifestLocalization
120117
| ManifestMenu
121118
| ManifestMenuItem
122119
| ManifestMenuItemTreeKind

src/packages/core/localization/components/ui-culture-input/ui-culture-input.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import type { ManifestLocalization } from '../../extensions/localization.extension.js';
12
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
23
import { css, html, customElement, query, state, property } from '@umbraco-cms/backoffice/external/lit';
34
import type { UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
45
import { UUIFormControlMixin } from '@umbraco-cms/backoffice/external/uui';
56
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
6-
import type { ManifestLocalization } from '@umbraco-cms/backoffice/extension-registry';
77
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
88

99
interface UmbCultureInputOption {

src/packages/core/extension-registry/models/localization.model.ts renamed to src/packages/core/localization/extensions/localization.extension.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface MetaLocalization {
1515
* The value is used to describe the language of the translations according to the extension system
1616
* and it will be set as the `lang` attribute on the `<html>` element.
1717
* @see https://en.wikipedia.org/wiki/Language_localisation#Language_tags_and_codes
18-
* @examples ["en-us", "en-gb", "da-dk"]
18+
* @example ["en-us", "en-gb", "da-dk"]
1919
*/
2020
culture: string;
2121

@@ -25,7 +25,7 @@ export interface MetaLocalization {
2525
* The value is used to describe the direction of the translations according to the extension system
2626
* and it will be set as the `dir` attribute on the `<html>` element. It defaults to `ltr`.
2727
* @see https://en.wikipedia.org/wiki/Right-to-left
28-
* @examples ["ltr"]
28+
* @example ["ltr"]
2929
* @default "ltr"
3030
*/
3131
direction?: 'ltr' | 'rtl';
@@ -42,3 +42,9 @@ export interface MetaLocalization {
4242
*/
4343
localizations?: UmbLocalizationDictionary;
4444
}
45+
46+
declare global {
47+
interface UmbExtensionManifestMap {
48+
UmbLocalizationExtension: ManifestLocalization;
49+
}
50+
}

src/packages/core/localization/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ import './localize-number.element.js';
44
import './localize-relative-time.element.js';
55

66
export * from './registry/localization.registry.js';
7+
export type * from './extensions/localization.extension.js';
78
export { UmbUiCultureInputElement } from './components/index.js';

src/packages/core/localization/localize.element.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { UmbLocalizeElement } from './localize.element.js';
22
import { aTimeout, elementUpdated, expect, fixture, html } from '@open-wc/testing';
3-
import { umbLocalizationRegistry } from '@umbraco-cms/backoffice/localization';
43
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
54
import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
5+
import { umbLocalizationRegistry } from './registry/localization.registry.js';
66

77
const english = {
88
type: 'localization',

src/packages/core/localization/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestLocalization } from '../extension-registry/models/localization.model.js';
1+
import type { ManifestLocalization } from './extensions/localization.extension.js';
22

33
export const manifests: Array<ManifestLocalization> = [
44
{

src/packages/core/localization/registry/localization.registry.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UmbLocalizationRegistry } from './localization.registry.js';
22
import { aTimeout, expect } from '@open-wc/testing';
3-
import type { ManifestLocalization } from '@umbraco-cms/backoffice/extension-registry';
43
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
4+
import type { ManifestLocalization } from '../extensions/localization.extension.js';
55

66
//#region Localizations
77
const english: ManifestLocalization = {

src/packages/core/localization/registry/localization.registry.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import type { ManifestLocalization } from '../extensions/localization.extension.js';
12
import {
23
type UmbLocalizationSetBase,
34
type UmbLocalizationDictionary,
45
type UmbLocalizationFlatDictionary,
56
UMB_DEFAULT_LOCALIZATION_CULTURE,
67
} from '@umbraco-cms/backoffice/localization-api';
78
import { umbLocalizationManager } from '@umbraco-cms/backoffice/localization-api';
8-
import type { ManifestLocalization, UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
9+
import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
910
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
1011
import { UmbStringState } from '@umbraco-cms/backoffice/observable-api';
1112
import { combineLatest } from '@umbraco-cms/backoffice/external/rxjs';
@@ -37,6 +38,7 @@ export class UmbLocalizationRegistry {
3738

3839
/**
3940
* Get the current registered translations.
41+
* @returns {Map<string, UmbLocalizationSetBase>} Returns the registered translations
4042
*/
4143
get localizations() {
4244
return umbLocalizationManager.localizations;
@@ -111,7 +113,7 @@ export class UmbLocalizationRegistry {
111113

112114
/**
113115
* Load a language from the extension registry.
114-
* @param locale The locale to load.
116+
* @param {string} locale The locale to load.
115117
*/
116118
loadLanguage(locale: string) {
117119
this.#currentLanguage.setValue(locale.toLowerCase());

0 commit comments

Comments
 (0)