Browse Source

fixing translations

pull/627/head
Dan Ditomaso 1 year ago
parent
commit
f7541769dc
  1. 6
      src/components/BatteryStatus.tsx
  2. 4
      src/components/CommandPalette/index.tsx
  3. 4
      src/components/Dialog/DeviceNameDialog.tsx
  4. 4
      src/components/Dialog/LocationResponseDialog.tsx
  5. 8
      src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx
  6. 4
      src/components/Dialog/TracerouteResponseDialog.tsx
  7. 4
      src/components/PageComponents/Connect/BLE.tsx
  8. 4
      src/components/PageComponents/Connect/Serial.tsx
  9. 4
      src/components/PageComponents/Map/NodeDetail.tsx
  10. 4
      src/components/Sidebar.tsx
  11. 5
      src/components/UI/Avatar.tsx
  12. 3
      src/i18n/locales/en.json
  13. 2
      src/pages/Dashboard/index.tsx
  14. 6
      src/pages/Messages.tsx
  15. 4
      src/pages/Nodes.tsx

6
src/components/BatteryStatus.tsx

@ -81,9 +81,9 @@ const BatteryStatus: React.FC<BatteryStatusProps> = ({ deviceMetrics }) => {
const iconClassName = currentState.className; const iconClassName = currentState.className;
const statusText = currentState.text(batteryLevel); const statusText = currentState.text(batteryLevel);
const voltageTitle = `${voltage?.toPrecision(3) ?? t("common_unknown")} ${ const voltageTitle = `${
t("common_unit_volts") voltage?.toPrecision(3) ?? t("common_unknown_short")
}`; } ${t("common_unit_volts")}`;
return ( return (
<div <div

4
src/components/CommandPalette/index.tsx

@ -120,11 +120,11 @@ export const CommandPalette = () => {
icon: ArrowLeftRightIcon, icon: ArrowLeftRightIcon,
subItems: getDevices().map((device) => ({ subItems: getDevices().map((device) => ({
label: getNode(device.hardware.myNodeNum)?.user?.longName ?? label: getNode(device.hardware.myNodeNum)?.user?.longName ??
t("common_unknown"), // Or a more specific key for node name t("common_unknown_short"), // Or a more specific key for node name
icon: ( icon: (
<Avatar <Avatar
text={getNode(device.hardware.myNodeNum)?.user?.shortName ?? text={getNode(device.hardware.myNodeNum)?.user?.shortName ??
t("common_unknown")} // Or a more specific key t("common_unknown_short")} // Or a more specific key
/> />
), ),
action() { action() {

4
src/components/Dialog/DeviceNameDialog.tsx

@ -38,8 +38,8 @@ export const DeviceNameDialog = ({
const myNode = getNode(hardware.myNodeNum); const myNode = getNode(hardware.myNodeNum);
const defaultValues = { const defaultValues = {
longName: myNode?.user?.longName ?? "Unknown", longName: myNode?.user?.longName ?? t("common_unknown_long"),
shortName: myNode?.user?.shortName ?? "??", shortName: myNode?.user?.shortName ?? t("common_unknown_short"),
}; };
const { getValues, setValue, reset, control, handleSubmit } = useForm<User>({ const { getValues, setValue, reset, control, handleSubmit } = useForm<User>({

4
src/components/Dialog/LocationResponseDialog.tsx

@ -27,11 +27,11 @@ export const LocationResponseDialog = ({
const from = getNode(location?.from ?? 0); const from = getNode(location?.from ?? 0);
const longName = from?.user?.longName ?? const longName = from?.user?.longName ??
(from ? `!${numberToHexUnpadded(from?.num)}` : t("common_unknown")); (from ? `!${numberToHexUnpadded(from?.num)}` : t("common_unknown_short"));
const shortName = from?.user?.shortName ?? const shortName = from?.user?.shortName ??
(from (from
? `${numberToHexUnpadded(from?.num).substring(0, 4)}` ? `${numberToHexUnpadded(from?.num).substring(0, 4)}`
: t("common_unknown")); : t("common_unknown_short"));
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>

8
src/components/Dialog/NodeDetailsDialog/NodeDetailsDialog.tsx

@ -172,8 +172,8 @@ export const NodeDetailsDialog = ({
<DialogHeader> <DialogHeader>
<DialogTitle> <DialogTitle>
{t("dialog_nodeDetails_titlePrefix")} {t("dialog_nodeDetails_titlePrefix")}
{node.user?.longName ?? t("common_unknown")} ( {node.user?.longName ?? t("common_unknown_short")} (
{node.user?.shortName ?? t("common_unknown")}) {node.user?.shortName ?? t("common_unknown_short")})
</DialogTitle> </DialogTitle>
</DialogHeader> </DialogHeader>
<DialogFooter> <DialogFooter>
@ -275,7 +275,7 @@ export const NodeDetailsDialog = ({
<p> <p>
{t("dialog_nodeDetails_label_hardware")} {t("dialog_nodeDetails_label_hardware")}
{(Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0] ?? {(Protobuf.Mesh.HardwareModel[node.user?.hwModel ?? 0] ??
t("common_unknown")) t("common_unknown_short"))
.replace(/_/g, " ")} .replace(/_/g, " ")}
</p> </p>
</div> </div>
@ -322,7 +322,7 @@ export const NodeDetailsDialog = ({
)} )}
</> </>
) )
: <p>{t("common_unknown")}</p>} : <p>{t("common_unknown_short")}</p>}
<Button <Button
onClick={handleRequestPosition} onClick={handleRequestPosition}
name="requestPosition" name="requestPosition"

4
src/components/Dialog/TracerouteResponseDialog.tsx

@ -32,11 +32,11 @@ export const TracerouteResponseDialog = ({
const snrBack = (traceroute?.data.snrBack ?? []).map((snr) => snr / 4); const snrBack = (traceroute?.data.snrBack ?? []).map((snr) => snr / 4);
const from = getNode(traceroute?.from ?? 0); const from = getNode(traceroute?.from ?? 0);
const longName = from?.user?.longName ?? const longName = from?.user?.longName ??
(from ? `!${numberToHexUnpadded(from?.num)}` : t("common_unknown")); (from ? `!${numberToHexUnpadded(from?.num)}` : t("common_unknown_short"));
const shortName = from?.user?.shortName ?? const shortName = from?.user?.shortName ??
(from (from
? `${numberToHexUnpadded(from?.num).substring(0, 4)}` ? `${numberToHexUnpadded(from?.num).substring(0, 4)}`
: t("common_unknown")); : t("common_unknown_short"));
const to = getNode(traceroute?.to ?? 0); const to = getNode(traceroute?.to ?? 0);
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>

4
src/components/PageComponents/Connect/BLE.tsx

@ -62,7 +62,7 @@ export const BLE = (
))} ))}
{bleDevices.length === 0 && ( {bleDevices.length === 0 && (
<Mono className="m-auto select-none"> <Mono className="m-auto select-none">
{t("bluetoothConnection.noDevicesPaired")} {t("bluetoothConnection_noDevicesPaired")}
</Mono> </Mono>
)} )}
</div> </div>
@ -86,7 +86,7 @@ export const BLE = (
}); });
}} }}
> >
<span>New device</span> <span>{t("bluetoothConnection_newDeviceButton")}</span>
</Button> </Button>
</fieldset> </fieldset>
); );

4
src/components/PageComponents/Connect/Serial.tsx

@ -56,8 +56,8 @@ export const Serial = (
<div className="flex h-48 flex-col gap-2 overflow-y-auto"> <div className="flex h-48 flex-col gap-2 overflow-y-auto">
{serialPorts.map((port, index) => { {serialPorts.map((port, index) => {
const { usbProductId, usbVendorId } = port.getInfo(); const { usbProductId, usbVendorId } = port.getInfo();
const vendor = usbVendorId ?? t("common_unknown"); const vendor = usbVendorId ?? t("common_unknown_short");
const product = usbProductId ?? t("common_unknown"); const product = usbProductId ?? t("common_unknown_short");
return ( return (
<Button <Button
key={`${vendor}-${product}-${index}`} key={`${vendor}-${product}-${index}`}

4
src/components/PageComponents/Map/NodeDetail.tsx

@ -38,8 +38,8 @@ export const NodeDetail = ({ node }: NodeDetailProps) => {
const { setChatType, setActiveChat } = useMessageStore(); const { setChatType, setActiveChat } = useMessageStore();
const { t } = useTranslation(); const { t } = useTranslation();
const { setActivePage } = useDevice(); const { setActivePage } = useDevice();
const name = node.user?.longName ?? t("common_unknown"); const name = node.user?.longName ?? t("common_unknown_short");
const shortName = node.user?.shortName ?? t("common_unknown"); const shortName = node.user?.shortName ?? t("common_unknown_short");
const hwModel = node.user?.hwModel ?? 0; const hwModel = node.user?.hwModel ?? 0;
const rawHardwareType = Protobuf.Mesh.HardwareModel[hwModel] as const rawHardwareType = Protobuf.Mesh.HardwareModel[hwModel] as
| keyof typeof Protobuf.Mesh.HardwareModel | keyof typeof Protobuf.Mesh.HardwareModel

4
src/components/Sidebar.tsx

@ -238,7 +238,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
<Subtle> <Subtle>
{t("sidebar_deviceInfo.volts", { {t("sidebar_deviceInfo.volts", {
voltage: myNode.deviceMetrics?.voltage?.toPrecision(3) ?? voltage: myNode.deviceMetrics?.voltage?.toPrecision(3) ??
t("common_unknown"), t("common_unknown_short"),
})} })}
</Subtle> </Subtle>
</div> </div>
@ -250,7 +250,7 @@ export const Sidebar = ({ children }: SidebarProps) => {
<Subtle> <Subtle>
{t("sidebar_deviceInfo.firmwareVersion", { {t("sidebar_deviceInfo.firmwareVersion", {
version: myMetadata?.firmwareVersion ?? version: myMetadata?.firmwareVersion ??
t("common_unknown"), t("common_unknown_short"),
})} })}
</Subtle> </Subtle>
</div> </div>

5
src/components/UI/Avatar.tsx

@ -7,6 +7,7 @@ import {
TooltipProvider, TooltipProvider,
TooltipTrigger, TooltipTrigger,
} from "@components/UI/Tooltip.tsx"; } from "@components/UI/Tooltip.tsx";
import { useTranslation } from "react-i18next";
type RGBColor = { type RGBColor = {
r: number; r: number;
@ -73,6 +74,8 @@ export const Avatar = ({
showFavorite = false, showFavorite = false,
className, className,
}: AvatarProps) => { }: AvatarProps) => {
const { t } = useTranslation();
const sizes = { const sizes = {
sm: "size-10 text-xs font-light", sm: "size-10 text-xs font-light",
lg: "size-16 text-lg", lg: "size-16 text-lg",
@ -82,7 +85,7 @@ export const Avatar = ({
const bgColor = getColorFromText(safeText); const bgColor = getColorFromText(safeText);
const isLight = ColorUtils.isLight(bgColor); const isLight = ColorUtils.isLight(bgColor);
const textColor = isLight ? "#000000" : "#FFFFFF"; const textColor = isLight ? "#000000" : "#FFFFFF";
const initials = safeText?.slice(0, 4) ?? "UNK"; const initials = safeText?.slice(0, 4) ?? t("common_unknown_short");
return ( return (
<div <div

3
src/i18n/locales/en.json

@ -13,7 +13,8 @@
"common_button_save": "Save", "common_button_save": "Save",
"common_label_primary": "Primary", "common_label_primary": "Primary",
"common_loading": "Loading...", "common_loading": "Loading...",
"common_unknown": "UNK", "common_unknown_short": "UNK",
"common_unknown_long": "Unknown",
"common_unset": "UNSET", "common_unset": "UNSET",
"common_unit_volts": "Volts", "common_unit_volts": "Volts",

2
src/pages/Dashboard/index.tsx

@ -55,7 +55,7 @@ export const Dashboard = () => {
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<p className="truncate text-sm font-medium text-accent"> <p className="truncate text-sm font-medium text-accent">
{device.getNode(device.hardware.myNodeNum)?.user {device.getNode(device.hardware.myNodeNum)?.user
?.longName ?? "UNK"} ?.longName ?? t("common_unknown_short")}
</p> </p>
<div className="inline-flex w-24 justify-center gap-2 rounded-full bg-slate-100 py-1 text-xs font-semibold text-slate-900 transition-colors hover:bg-slate-700 hover:text-slate-50"> <div className="inline-flex w-24 justify-center gap-2 rounded-full bg-slate-100 py-1 text-xs font-semibold text-slate-900 transition-colors hover:bg-slate-700 hover:text-slate-50">
{device.connection?.connType === "ble" && ( {device.connection?.connType === "ble" && (

6
src/pages/Messages.tsx

@ -237,7 +237,7 @@ export const MessagesPage = () => {
<SidebarButton <SidebarButton
key={node.num} key={node.num}
preventCollapse preventCollapse
label={node.user?.longName ?? t("common_unknown")} label={node.user?.longName ?? t("common_unknown_short")}
count={node.unreadCount > 0 ? node.unreadCount : undefined} count={node.unreadCount > 0 ? node.unreadCount : undefined}
active={activeChat === node.num && active={activeChat === node.num &&
chatType === MessageType.Direct} chatType === MessageType.Direct}
@ -248,7 +248,7 @@ export const MessagesPage = () => {
}} }}
> >
<Avatar <Avatar
text={node.user?.shortName ?? t("common_unknown")} text={node.user?.shortName ?? t("common_unknown_short")}
className={cn(hasNodeError(node.num) && "text-red-500")} className={cn(hasNodeError(node.num) && "text-red-500")}
showError={hasNodeError(node.num)} showError={hasNodeError(node.num)}
showFavorite={node.isFavorite} showFavorite={node.isFavorite}
@ -274,7 +274,7 @@ export const MessagesPage = () => {
const pageTitleChatName = useMemo(() => { const pageTitleChatName = useMemo(() => {
if (isBroadcast && currentChannel) return getChannelName(currentChannel); if (isBroadcast && currentChannel) return getChannelName(currentChannel);
if (isDirect && otherNode) { if (isDirect && otherNode) {
return otherNode.user?.longName ?? t("common_unknown"); return otherNode.user?.longName ?? t("common_unknown_short");
} }
return t("messages_title_default"); return t("messages_title_default");
}, [isBroadcast, currentChannel, isDirect, otherNode, t]); }, [isBroadcast, currentChannel, isDirect, otherNode, t]);

4
src/pages/Nodes.tsx

@ -169,7 +169,7 @@ const NodesPage = (): JSX.Element => {
rows={filteredNodes.map((node) => [ rows={filteredNodes.map((node) => [
<div key={node.num}> <div key={node.num}>
<Avatar <Avatar
text={node.user?.shortName ?? t("common_unknown")} text={node.user?.shortName ?? t("common_unknown_short")}
showFavorite={node.isFavorite} showFavorite={node.isFavorite}
showError={hasNodeError(node.num)} showError={hasNodeError(node.num)}
/> />
@ -227,7 +227,7 @@ const NodesPage = (): JSX.Element => {
{base16 {base16
.stringify(node.user?.macaddr ?? []) .stringify(node.user?.macaddr ?? [])
.match(/.{1,2}/g) .match(/.{1,2}/g)
?.join(":") ?? t("common_unknown")} ?.join(":") ?? t("common_unknown_short")}
</Mono>, </Mono>,
])} ])}
/> />

Loading…
Cancel
Save