-
{i18n.t("No of Rows:")}
+
+
+
{hint &&
{hint}}
diff --git a/src/components/TableFilter/FilterChips.tsx b/src/components/TableFilter/FilterChips.tsx
index 273829c19..176c53b44 100644
--- a/src/components/TableFilter/FilterChips.tsx
+++ b/src/components/TableFilter/FilterChips.tsx
@@ -6,8 +6,8 @@ import Typography from "@material-ui/core/Typography";
import ClearIcon from "@material-ui/icons/Clear";
import { createStyles, makeStyles, useTheme } from "@material-ui/styles";
import React from "react";
+import { FormattedMessage } from "react-intl";
-import i18n from "../../i18n";
import Filter, { FilterContentSubmitData, IFilter } from "../Filter";
import Hr from "../Hr";
import Link from "../Link";
@@ -163,9 +163,19 @@ export const FilterChips: React.FC
= ({
))}
{selected && (
- {i18n.t("Selected {{ number }} items", {
- number: selected
- })}
+
)}
diff --git a/src/components/Timeline/Timeline.tsx b/src/components/Timeline/Timeline.tsx
index 61e5fd72c..2989dae10 100644
--- a/src/components/Timeline/Timeline.tsx
+++ b/src/components/Timeline/Timeline.tsx
@@ -11,8 +11,7 @@ import {
import TextField from "@material-ui/core/TextField";
import PersonIcon from "@material-ui/icons/Person";
import React from "react";
-
-import i18n from "../../i18n";
+import { FormattedMessage, useIntl } from "react-intl";
const styles = (theme: Theme) =>
createStyles({
@@ -70,37 +69,44 @@ export const Timeline = withStyles(styles, { name: "Timeline" })(
);
export const TimelineAddNote = withStyles(styles, { name: "TimelineAddNote" })(
- ({ classes, message, onChange, onSubmit }: TimelineAddNoteProps) => (
-
-
-
-
-
-
- {i18n.t("Send", {
- context: "add order note"
- })}
-
- )
- }}
- variant="standard"
- />
-
-
- )
+ ({ classes, message, onChange, onSubmit }: TimelineAddNoteProps) => {
+ const intl = useIntl();
+
+ return (
+
+
+
+
+
+
+
+
+ )
+ }}
+ variant="standard"
+ />
+
+
+ );
+ }
);
Timeline.displayName = "Timeline";
export default Timeline;
diff --git a/src/components/VisibilityCard/VisibilityCard.tsx b/src/components/VisibilityCard/VisibilityCard.tsx
index 6cb01c853..610e07e49 100644
--- a/src/components/VisibilityCard/VisibilityCard.tsx
+++ b/src/components/VisibilityCard/VisibilityCard.tsx
@@ -8,12 +8,12 @@ import {
} from "@material-ui/core/styles";
import TextField from "@material-ui/core/TextField";
import React from "react";
+import { useIntl } from "react-intl";
import CardTitle from "@saleor/components/CardTitle";
import ControlledSwitch from "@saleor/components/ControlledSwitch";
import { FormSpacer } from "@saleor/components/FormSpacer";
import useDateLocalize from "@saleor/hooks/useDateLocalize";
-import i18n from "../../i18n";
import { DateContext } from "../Date/DateContext";
const styles = (theme: Theme) =>
@@ -54,11 +54,17 @@ export const VisibilityCard = withStyles(styles, {
disabled,
onChange
}: VisibilityCardProps) => {
+ const intl = useIntl();
const localizeDate = useDateLocalize();
const dateNow = React.useContext(DateContext);
return (
-
+
dateNow
- ? i18n.t("will be visible from {{ date }}", {
- date: localizeDate(publicationDate)
- })
+ ? intl.formatMessage(
+ {
+ defaultMessage: "will be visible from {date}"
+ },
+ {
+ date: localizeDate(publicationDate)
+ }
+ )
: null
: null
}
@@ -94,7 +114,10 @@ export const VisibilityCard = withStyles(styles, {
= ({ weight }) =>
- i18n.t("{{ value }} {{ unit }}", {
- context: "weight",
- ...weight
- });
+const Weight: React.StatelessComponent = ({ weight }) => (
+
+);
+
Weight.displayName = "Weight";
export default Weight;
diff --git a/src/components/WeightRange/WeightRange.tsx b/src/components/WeightRange/WeightRange.tsx
index c7a789527..eae54b19c 100644
--- a/src/components/WeightRange/WeightRange.tsx
+++ b/src/components/WeightRange/WeightRange.tsx
@@ -1,6 +1,6 @@
import React from "react";
+import { FormattedMessage } from "react-intl";
-import i18n from "../../i18n";
import { Weight } from "../Weight";
export interface WeightRangeProps {
@@ -8,28 +8,32 @@ export interface WeightRangeProps {
to?: Weight;
}
-const WeightRange: React.StatelessComponent = ({
- from,
- to
-}) =>
- from && to
- ? i18n.t("{{ fromValue }} {{ fromUnit }} - {{ toValue }} {{ toUnit }}", {
- context: "weight",
+const WeightRange: React.FC = ({ from, to }) =>
+ from && to ? (
+
+ ) : from && !to ? (
+
+ ) : !from && to ? (
+
+ ) : (
+ -
+ );
WeightRange.displayName = "WeightRange";
export default WeightRange;
diff --git a/src/intl.ts b/src/intl.ts
index 0c0a4ddec..38883a5fd 100644
--- a/src/intl.ts
+++ b/src/intl.ts
@@ -66,6 +66,10 @@ export const buttonMessages = defineMessages({
defaultMessage: "Confirm",
description: "button"
},
+ delete: {
+ defaultMessage: "Delete",
+ description: "button"
+ },
edit: {
defaultMessage: "Edit",
description: "button"