Skip to content
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.

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

nls: add additional localizations #11368

Merged
merged 3 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions packages/core/src/browser/connection-status-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { Event, Emitter } from '../common/event';
import { DefaultFrontendApplicationContribution } from './frontend-application';
import { StatusBar, StatusBarAlignment } from './status-bar/status-bar';
import { WebSocketConnectionProvider } from './messaging/ws-connection-provider';
import { Disposable, DisposableCollection } from '../common';
import { Disposable, DisposableCollection, nls } from '../common';

/**
* Service for listening on backend connection changes.
Expand Down Expand Up @@ -205,8 +205,8 @@ export class ApplicationConnectionStatusContribution extends DefaultFrontendAppl
protected handleOffline(): void {
this.statusBar.setElement(this.statusbarId, {
alignment: StatusBarAlignment.LEFT,
text: 'Offline',
tooltip: 'Cannot connect to backend.',
text: nls.localize('theia/core/offline', 'Offline'),
tooltip: nls.localize('theia/localize/offlineTooltip', 'Cannot connect to backend.'),
priority: 5000
});
this.toDisposeOnOnline.push(Disposable.create(() => this.statusBar.removeElement(this.statusbarId)));
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/browser/keybinding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { StatusBarAlignment, StatusBar } from './status-bar/status-bar';
import { ContextKeyService } from './context-key-service';
import { CorePreferences } from './core-preferences';
import * as common from '../common/keybinding';
import { nls } from '../common/nls';

export enum KeybindingScope {
DEFAULT,
Expand Down Expand Up @@ -559,7 +560,7 @@ export class KeybindingRegistry {
event.stopPropagation();

this.statusBar.setElement('keybinding-status', {
text: `(${this.acceleratorForSequence(this.keySequence, '+')}) was pressed, waiting for more keys`,
text: nls.localize('theia/core/keybindingStatus', '{0} was pressed, waiting for more keys', `(${this.acceleratorForSequence(this.keySequence, '+')})`),
alignment: StatusBarAlignment.LEFT,
priority: 2
});
Expand Down
8 changes: 5 additions & 3 deletions packages/core/src/browser/shell/application-shell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { CorePreferences } from '../core-preferences';
import { BreadcrumbsRendererFactory } from '../breadcrumbs/breadcrumbs-renderer';
import { Deferred } from '../../common/promise-util';
import { SaveResourceService } from '../save-resource-service';
import { nls } from '../../common/nls';

/** The class name added to ApplicationShell instances. */
const APPLICATION_SHELL_CLASS = 'theia-ApplicationShell';
Expand Down Expand Up @@ -1428,14 +1429,15 @@ export class ApplicationShell extends Widget {
if (this.bottomPanel.isEmpty) {
this.statusBar.removeElement(BOTTOM_PANEL_TOGGLE_ID);
} else {
const label = nls.localize('theia/core/common/collapseBottomPanel', 'Toggle Bottom Panel');
const element: StatusBarEntry = {
name: 'Toggle Bottom Panel',
name: label,
text: '$(codicon-window)',
alignment: StatusBarAlignment.RIGHT,
tooltip: 'Toggle Bottom Panel',
tooltip: label,
command: 'core.toggle.bottom.panel',
accessibilityInformation: {
label: 'Toggle Bottom Panel',
label: label,
role: 'button'
},
priority: -1000
Expand Down
9 changes: 5 additions & 4 deletions packages/core/src/browser/tree/search-box.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { SearchBoxDebounce, SearchBoxDebounceOptions } from '../tree/search-box-
import { BaseWidget, Message } from '../widgets/widget';
import { Emitter, Event } from '../../common/event';
import { KeyCode, Key } from '../keyboard/keys';
import { nls } from '../../common/nls';

/**
* Initializer properties for the search box widget.
Expand Down Expand Up @@ -253,7 +254,7 @@ export class SearchBox extends BaseWidget {
SearchBox.Styles.BUTTON,
...SearchBox.Styles.FILTER,
);
filter.title = 'Enable Filter on Type';
filter.title = nls.localizeByDefault('Enable Filter on Type');
buttons.appendChild(filter);
filter.onclick = this.fireFilterToggle.bind(this);
}
Expand All @@ -268,7 +269,7 @@ export class SearchBox extends BaseWidget {
SearchBox.Styles.BUTTON,
SearchBox.Styles.BUTTON_PREVIOUS
);
previous.title = 'Previous (Up)';
previous.title = nls.localize('theia/core/searchbox/previous', 'Previous (Up)');
buttons.appendChild(previous);
previous.onclick = () => this.firePrevious.bind(this)();

Expand All @@ -277,7 +278,7 @@ export class SearchBox extends BaseWidget {
SearchBox.Styles.BUTTON,
SearchBox.Styles.BUTTON_NEXT
);
next.title = 'Next (Down)';
next.title = nls.localize('theia/core/searchbox/next', 'Next (Down)');
buttons.appendChild(next);
next.onclick = () => this.fireNext.bind(this)();
}
Expand All @@ -288,7 +289,7 @@ export class SearchBox extends BaseWidget {
SearchBox.Styles.BUTTON,
SearchBox.Styles.BUTTON_CLOSE
);
close.title = 'Close (Escape)';
close.title = nls.localize('theia/core/searchbox/close', 'Close (Escape)');
buttons.appendChild(close);
close.onclick = () => this.hide.bind(this)();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import { injectable, inject } from '@theia/core/shared/inversify';
import URI from '@theia/core/lib/common/uri';
import { MaybeArray } from '@theia/core/lib/common';
import { MaybeArray, nls } from '@theia/core/lib/common';
import { LabelProvider } from '@theia/core/lib/browser';
import { FileStat } from '../../common/files';
import { DirNode } from '../file-tree';
Expand Down Expand Up @@ -53,7 +53,7 @@ export class DefaultFileDialogService implements FileDialogService {
async showOpenDialog(props: OpenFileDialogProps & { canSelectMany: true }, folder?: FileStat): Promise<MaybeArray<URI> | undefined>;
async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<URI | undefined>;
async showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> {
const title = props.title || 'Open';
const title = props.title || nls.localizeByDefault('Open');
const rootNode = await this.getRootNode(folder);
if (rootNode) {
const dialog = this.openFileDialogFactory(Object.assign(props, { title }));
Expand All @@ -70,7 +70,7 @@ export class DefaultFileDialogService implements FileDialogService {
}

async showSaveDialog(props: SaveFileDialogProps, folder?: FileStat): Promise<URI | undefined> {
const title = props.title || 'Save';
const title = props.title || nls.localizeByDefault('Save');
const rootNode = await this.getRootNode(folder);
if (rootNode) {
const dialog = this.saveFileDialogFactory(Object.assign(props, { title }));
Expand Down
22 changes: 13 additions & 9 deletions packages/filesystem/src/browser/file-dialog/file-dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { FileDialogWidget } from './file-dialog-widget';
import { FileDialogTreeFiltersRenderer, FileDialogTreeFilters, FileDialogTreeFiltersRendererFactory } from './file-dialog-tree-filters-renderer';
import URI from '@theia/core/lib/common/uri';
import { Panel } from '@theia/core/shared/@phosphor/widgets';
import * as DOMPurify from '@theia/core/shared/dompurify';

export const OpenFileDialogFactory = Symbol('OpenFileDialogFactory');
export interface OpenFileDialogFactory {
Expand Down Expand Up @@ -153,16 +154,19 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {

navigationPanel.appendChild(this.back = createIconButton(...codiconArray('chevron-left', true)));
this.back.classList.add(NAVIGATION_BACK_CLASS);
this.back.title = 'Navigate Back';
this.back.title = nls.localize('theia/filesystem/dialog/navigateBack', 'Navigate Back');

navigationPanel.appendChild(this.forward = createIconButton(...codiconArray('chevron-right', true)));
this.forward.classList.add(NAVIGATION_FORWARD_CLASS);
this.forward.title = 'Navigate Forward';
this.forward.title = nls.localize('theia/filesystem/dialog/navigateForward', 'Navigate Forward');

navigationPanel.appendChild(this.home = createIconButton(...codiconArray('home', true)));
this.home.classList.add(NAVIGATION_HOME_CLASS);
this.home.title = 'Go To Initial Location';
this.home.title = nls.localize('theia/filesystem/dialog/initialLocation', 'Go To Initial Location');

navigationPanel.appendChild(this.up = createIconButton(...codiconArray('arrow-up', true)));
this.up.classList.add(NAVIGATION_UP_CLASS);
this.up.title = 'Navigate Up One Directory';
this.up.title = nls.localize('theia/filesystem/dialog/navigateUp', 'Navigate Up One Directory');

const locationListRendererHost = document.createElement('div');
this.locationListRenderer = this.locationListFactory({ model: this.model, host: locationListRendererHost });
Expand Down Expand Up @@ -229,7 +233,7 @@ export abstract class FileDialog<T> extends AbstractDialog<T> {
this.contentNode.appendChild(filtersPanel);

const titlePanel = document.createElement('div');
titlePanel.innerHTML = 'Format:';
titlePanel.innerHTML = DOMPurify.sanitize(nls.localize('theia/filesystem/format', 'Format:'));
titlePanel.classList.add(FILTERS_LABEL_CLASS);
filtersPanel.appendChild(titlePanel);

Expand Down Expand Up @@ -308,12 +312,12 @@ export class OpenFileDialog extends FileDialog<MaybeArray<FileStatNode>> {
}

protected getAcceptButtonLabel(): string {
return this.props.openLabel ? this.props.openLabel : 'Open';
return this.props.openLabel ? this.props.openLabel : nls.localizeByDefault('Open');
}

protected override isValid(value: MaybeArray<FileStatNode>): string {
if (value && !this.props.canSelectMany && value instanceof Array) {
return 'You can select only one item';
return nls.localize('theia/filesystem/dialog/multipleItemMessage', 'You can select only one item');
}
return '';
}
Expand Down Expand Up @@ -358,7 +362,7 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
}

protected getAcceptButtonLabel(): string {
return this.props.saveLabel ? this.props.saveLabel : 'Save';
return this.props.saveLabel ? this.props.saveLabel : nls.localizeByDefault('Save');
}

protected override onUpdateRequest(msg: Message): void {
Expand Down Expand Up @@ -407,7 +411,7 @@ export class SaveFileDialog extends FileDialog<URI | undefined> {
this.contentNode.appendChild(fileNamePanel);

const titlePanel = document.createElement('div');
titlePanel.innerHTML = 'Name:';
titlePanel.innerHTML = DOMPurify.sanitize(nls.localize('theia/filesystem/dialog/name', 'Name:'));
titlePanel.classList.add(FILENAME_LABEL_CLASS);
fileNamePanel.appendChild(titlePanel);

Expand Down
3 changes: 2 additions & 1 deletion packages/git/src/browser/diff/git-diff-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ import { ScmService } from '@theia/scm/lib/browser/scm-service';
import { GitRepositoryProvider } from '../git-repository-provider';
import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
import { ScmPreferences } from '@theia/scm/lib/browser/scm-preferences';
import { nls } from '@theia/core';

/* eslint-disable @typescript-eslint/no-explicit-any */

export const GIT_DIFF = 'git-diff';
@injectable()
export class GitDiffWidget extends BaseWidget implements StatefulWidget {

protected readonly GIT_DIFF_TITLE = 'Diff';
protected readonly GIT_DIFF_TITLE = nls.localize('theia/git/diff', 'Diff');

@inject(GitRepositoryProvider) protected readonly repositoryProvider: GitRepositoryProvider;
@inject(DiffNavigatorProvider) protected readonly diffNavigatorProvider: DiffNavigatorProvider;
Expand Down
28 changes: 15 additions & 13 deletions packages/keymaps/src/browser/keybindings-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
import { KeymapsService } from './keymaps-service';
import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
import { isOSX } from '@theia/core';
import { nls } from '@theia/core/lib/common/nls';

/**
* Representation of a keybinding item for the view.
Expand Down Expand Up @@ -83,7 +84,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
protected readonly keymapsService: KeymapsService;

static readonly ID = 'keybindings.view.widget';
static readonly LABEL = 'Keyboard Shortcuts';
static readonly LABEL = nls.localizeByDefault('Keyboard Shortcuts');

/**
* The list of all available keybindings.
Expand Down Expand Up @@ -296,7 +297,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
className={`theia-input${(this.items.length > 0) ? '' : ' no-kb'}`}
type='text'
spellCheck={false}
placeholder='Search keybindings'
placeholder={nls.localizeByDefault('Type to search in keybindings')}
autoComplete='off'
onKeyUp={this.searchKeybindings}
/>
Expand Down Expand Up @@ -324,10 +325,10 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
<thead>
<tr>
<th className='th-action'></th>
<th className='th-label'>Command</th>
<th className='th-keybinding'>Keybinding</th>
<th className='th-context'>Context / When</th>
<th className='th-source'>Source</th>
<th className='th-label'>{nls.localizeByDefault('Command')}</th>
<th className='th-keybinding'>{nls.localizeByDefault('Keybinding')}</th>
<th className='th-context'>{nls.localizeByDefault('When')}</th>
<th className='th-source'>{nls.localizeByDefault('Source')}</th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -550,7 +551,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
const command = item.command.id;
const oldKeybinding = item.keybinding && item.keybinding.keybinding;
const dialog = new EditKeybindingDialog({
title: `Edit Keybinding for ${command}`,
title: nls.localize('theia/keymaps/editKeybindingTitle', 'Edit Keybinding for {0}', command),
initialValue: oldKeybinding,
validate: newKeybinding => this.validateKeybinding(command, oldKeybinding, newKeybinding),
}, this.keymapsService, item);
Expand All @@ -573,8 +574,8 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
*/
protected async confirmResetKeybinding(item: KeybindingItem): Promise<boolean> {
const dialog = new ConfirmDialog({
title: `Reset keybinding for '${this.getCommandLabel(item.command)}'`,
msg: 'Do you really want to reset this keybinding to its default value?'
title: nls.localize('theia/keymaps/resetKeybindingTitle', 'Reset keybinding for {0}', this.getCommandLabel(item.command)),
msg: nls.localize('theia/keymaps/resetKeybindingConfirmation', 'Do you really want to reset this keybinding to its default value?')
});
return !!await dialog.open();
}
Expand All @@ -600,7 +601,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
*/
protected validateKeybinding(command: string, oldKeybinding: string | undefined, keybinding: string): string {
if (!keybinding) {
return 'keybinding value is required';
return nls.localize('theia/keymaps/requiredKeybindingValidation', 'keybinding value is required');
}
try {
const binding = { command, keybinding };
Expand All @@ -609,7 +610,7 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
return ' '; // if old and new keybindings match, quietly reject update
}
if (this.keybindingRegistry.containsKeybindingInScope(binding)) {
return 'keybinding currently collides';
return nls.localize('theia/keymaps/keybindingCollidesValidation', 'keybinding currently collides');
}
return '';
} catch (error) {
Expand Down Expand Up @@ -746,10 +747,11 @@ class EditKeybindingDialog extends SingleTextInputDialog {
*/
protected appendResetButton(): HTMLButtonElement {
// Create the `Reset` button.
this.resetButton = this.createButton('Reset');
const resetButtonTitle = nls.localizeByDefault('Reset');
this.resetButton = this.createButton(resetButtonTitle);
// Add the `Reset` button to the dialog control panel, before the `Accept` button.
this.controlPanel.insertBefore(this.resetButton, this.acceptButton!);
this.resetButton.title = 'Reset Keybinding';
this.resetButton.title = nls.localizeByDefault('Reset Keybinding');
this.resetButton.classList.add('secondary');
return this.resetButton;
}
Expand Down
1 change: 1 addition & 0 deletions packages/keymaps/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
position: sticky;
top: 0;
background-color: var(--theia-editorWidget-background);
text-transform: capitalize;
}

.kb table .th-action {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-dev/src/browser/hosted-plugin-informer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { nls } from '@theia/core/lib/common/nls';
@injectable()
export class HostedPluginInformer implements FrontendApplicationContribution {

public static readonly DEVELOPMENT_HOST_TITLE = 'Development Host';
public static readonly DEVELOPMENT_HOST_TITLE = nls.localize('theia/plugin-dev/devHost', 'Development Host');

public static readonly DEVELOPMENT_HOST = 'development-host';

Expand Down
3 changes: 2 additions & 1 deletion packages/timeline/src/browser/timeline-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { TimelineEmptyWidget } from './timeline-empty-widget';
import { toArray } from '@theia/core/shared/@phosphor/algorithm';
import URI from '@theia/core/lib/common/uri';
import { URI as CodeURI } from '@theia/core/shared/vscode-uri';
import { nls } from '@theia/core/lib/common/nls';

@injectable()
export class TimelineWidget extends BaseWidget {
Expand All @@ -50,7 +51,7 @@ export class TimelineWidget extends BaseWidget {
constructor() {
super();
this.id = TimelineWidget.ID;
this.title.label = 'Timeline';
this.title.label = nls.localizeByDefault('Timeline');
this.title.caption = this.title.label;
this.addClass('theia-timeline');
}
Expand Down
3 changes: 2 additions & 1 deletion packages/vsx-registry/src/browser/vsx-extension-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ReactWidget, Message, Widget, codicon } from '@theia/core/lib/browser';
import { VSXExtension, VSXExtensionEditorComponent } from './vsx-extension';
import { VSXExtensionsModel } from './vsx-extensions-model';
import { Deferred } from '@theia/core/lib/common/promise-util';
import { nls } from '@theia/core/lib/common/nls';

@injectable()
export class VSXExtensionEditor extends ReactWidget {
Expand Down Expand Up @@ -66,7 +67,7 @@ export class VSXExtensionEditor extends ReactWidget {
}

protected updateTitle(): void {
const label = 'Extension: ' + (this.extension.displayName || this.extension.name);
const label = nls.localizeByDefault('Extension: {0}', (this.extension.displayName || this.extension.name));
this.title.label = label;
this.title.caption = label;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import * as React from '@theia/core/shared/react';
import { injectable, postConstruct, inject } from '@theia/core/shared/inversify';
import { ReactWidget, Message } from '@theia/core/lib/browser/widgets';
import { VSXExtensionsSearchModel } from './vsx-extensions-search-model';
import { nls } from '@theia/core/lib/common/nls';

@injectable()
export class VSXExtensionsSearchBar extends ReactWidget {
Expand All @@ -40,7 +41,7 @@ export class VSXExtensionsSearchBar extends ReactWidget {
defaultValue={this.model.query}
spellCheck={false}
className='theia-input'
placeholder='Search Extensions in Open VSX Registry'
placeholder={nls.localize('theia/vsx-registry/searchPlaceholder', 'Search Extensions in {0}', 'Open VSX Registry')}
onChange={this.updateQuery}>
</input>;
}
Expand Down
Loading