Michel2/pybricks-code
1
0
Fork 0
mirror of https://github.com/pybricks/pybricks-code.git synced 2026-09-12 09:36:27 +00:00
Code Issues Releases Activity

move useI18n to i18n.ts

Browse Source 
Since we are using the react-i18n babel loader plugin, useI18n can only
be used once per file. Also we have to remember to add the istanbul
ignore next comment each time we use it. By moving this to a common
file, it can be easily copied and pasted when a new submodule is
created and we don't have to remember the rules when calling it.
This commit is contained in:
David Lechner
2022-05-21 13:57:58 -05:00
parent e7366c8afd
commit a3e55c828a
46 changed files with 256 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toolbar/buttons/bluetooth/BluetoothButton.tsx
+2 -4
View File
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { useI18n } from '@shopify/react-i18n';
import React from 'react';
import { useDispatch } from 'react-redux';
import { toggleBluetooth } from '../../../ble/actions';
@@ -11,7 +10,7 @@ import { useSelector } from '../../../reducers';
import ActionButton, { ActionButtonProps } from '../../ActionButton';
import connectedIcon from './connected.svg';
import disconnectedIcon from './disconnected.svg';
import { I18nId } from './i18n';
import { I18nId, useI18n } from './i18n';
type BluetoothButtonProps = Pick<ActionButtonProps, 'id'>;
@@ -23,8 +22,7 @@ const BluetoothButton: React.VoidFunctionComponent<BluetoothButtonProps> = ({ id
bootloaderConnection === BootloaderConnectionState.Disconnected &&
bleConnection === BleConnectionState.Disconnected;
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useI18n();
const i18n = useI18n();
const dispatch = useDispatch();
return (
src/toolbar/buttons/bluetooth/i18n.ts
+8
View File
@@ -1,6 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { I18n, useI18n as useShopifyI18n } from '@shopify/react-i18n';
export function useI18n(): I18n {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useShopifyI18n();
return i18n;
}
export enum I18nId {
Label = 'label',
TooltipConnect = 'tooltip.connect',
src/toolbar/buttons/flash/FlashButton.tsx
+2 -4
View File
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { useI18n } from '@shopify/react-i18n';
import React from 'react';
import { useDispatch } from 'react-redux';
import { BleConnectionState } from '../../../ble/reducers';
@@ -14,7 +13,7 @@ import {
useSettingHubName,
} from '../../../settings/hooks';
import OpenFileButton, { OpenFileButtonProps } from '../../../toolbar/OpenFileButton';
import { I18nId } from './i18n';
import { I18nId, useI18n } from './i18n';
import icon from './icon.svg';
type FlashButtonProps = Pick<OpenFileButtonProps, 'id'>;
@@ -27,8 +26,7 @@ const FlashButton: React.VoidFunctionComponent<FlashButtonProps> = ({ id }) => {
const [isSettingFlashCurrentProgramEnabled] = useSettingFlashCurrentProgram();
const { hubName } = useSettingHubName();
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useI18n();
const i18n = useI18n();
const dispatch = useDispatch();
return (
src/toolbar/buttons/flash/i18n.ts
+8
View File
@@ -1,6 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { I18n, useI18n as useShopifyI18n } from '@shopify/react-i18n';
export function useI18n(): I18n {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useShopifyI18n();
return i18n;
}
export enum I18nId {
Label = 'label',
TooltipAction = 'tooltip.action',
src/toolbar/buttons/repl/ReplButton.tsx
+2 -4
View File
@@ -1,21 +1,19 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { useI18n } from '@shopify/react-i18n';
import React, { useCallback } from 'react';
import { useDispatch } from 'react-redux';
import { repl } from '../../../hub/actions';
import { HubRuntimeState } from '../../../hub/reducers';
import { useSelector } from '../../../reducers';
import ActionButton, { ActionButtonProps } from '../../ActionButton';
import { I18nId } from './i18n';
import { I18nId, useI18n } from './i18n';
import icon from './icon.svg';
type ReplButtonProps = Pick<ActionButtonProps, 'id'>;
const ReplButton: React.VoidFunctionComponent<ReplButtonProps> = ({ id }) => {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useI18n();
const i18n = useI18n();
const dispatch = useDispatch();
const enabled = useSelector((s) => s.hub.runtime === HubRuntimeState.Idle);
src/toolbar/buttons/repl/i18n.ts
+8
View File
@@ -1,6 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { I18n, useI18n as useShopifyI18n } from '@shopify/react-i18n';
export function useI18n(): I18n {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useShopifyI18n();
return i18n;
}
export enum I18nId {
Label = 'label',
Tooltip = 'tooltip',
src/toolbar/buttons/run/RunButton.tsx
+2 -4
View File
@@ -1,14 +1,13 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { useI18n } from '@shopify/react-i18n';
import React from 'react';
import { useDispatch } from 'react-redux';
import { downloadAndRun } from '../../../hub/actions';
import { HubRuntimeState } from '../../../hub/reducers';
import { useSelector } from '../../../reducers';
import ActionButton, { ActionButtonProps } from '../../ActionButton';
import { I18nId } from './i18n';
import { I18nId, useI18n } from './i18n';
import icon from './icon.svg';
type RunButtonProps = Pick<ActionButtonProps, 'id'>;
@@ -19,8 +18,7 @@ const RunButton: React.VoidFunctionComponent<RunButtonProps> = ({ id }) => {
const isEditorReady = useSelector((s) => s.editor.isReady);
const keyboardShortcut = 'F5';
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useI18n();
const i18n = useI18n();
const dispatch = useDispatch();
return (
src/toolbar/buttons/run/i18n.ts
+8
View File
@@ -1,6 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { I18n, useI18n as useShopifyI18n } from '@shopify/react-i18n';
export function useI18n(): I18n {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useShopifyI18n();
return i18n;
}
export enum I18nId {
Label = 'label',
TooltipAction = 'tooltip.action',
src/toolbar/buttons/stop/StopButton.tsx
+2 -4
View File
@@ -1,14 +1,13 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { useI18n } from '@shopify/react-i18n';
import React from 'react';
import { useDispatch } from 'react-redux';
import { stop } from '../../../hub/actions';
import { HubRuntimeState } from '../../../hub/reducers';
import { useSelector } from '../../../reducers';
import ActionButton, { ActionButtonProps } from '../../ActionButton';
import { I18nId } from './i18n';
import { I18nId, useI18n } from './i18n';
import icon from './icon.svg';
type StopButtonProps = Pick<ActionButtonProps, 'id'>;
@@ -17,8 +16,7 @@ const StopButton: React.VoidFunctionComponent<StopButtonProps> = ({ id }) => {
const runtime = useSelector((s) => s.hub.runtime);
const keyboardShortcut = 'F6';
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useI18n();
const i18n = useI18n();
const dispatch = useDispatch();
return (
src/toolbar/buttons/stop/i18n.ts
+8
View File
@@ -1,6 +1,14 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020-2022 The Pybricks Authors
import { I18n, useI18n as useShopifyI18n } from '@shopify/react-i18n';
export function useI18n(): I18n {
// istanbul ignore next: babel-loader rewrites this line
const [i18n] = useShopifyI18n();
return i18n;
}
export enum I18nId {
Label = 'label',
Tooltip = 'tooltip',