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

Fix typos and messages system tense #4168

Merged
merged 6 commits into from
May 28, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Refactored API resolvers to staticmethods with root typing - #4155 by @NyanKiyoshi
- Users can how add multiple "Add to Cart" forms in a single page - #4165 by @NyanKiyoshi
- Disabled by default the storage of celery results - #4169 by @NyanKiyoshi
- Fix typos and messages system tense - #4168 by @benekex2

## 2.6.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const menuStructure: IMenuItem[] = [
url: collectionListUrl()
}
],
label: i18n.t("Catalogue", { context: "Menu label" }),
label: i18n.t("Catalog", { context: "Menu label" }),
permission: PermissionEnum.MANAGE_PRODUCTS
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const SaleInfo = withStyles(styles, {
onChange
}: SaleInfoProps & WithStyles<typeof styles>) => (
<Card>
<CardTitle title={i18n.t("General Informations")} />
<CardTitle title={i18n.t("General Information")} />
<CardContent className={classes.root}>
<TextField
disabled={disabled}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const VoucherInfo = withStyles(styles, {

return (
<Card>
<CardTitle title={i18n.t("General Informations")} />
<CardTitle title={i18n.t("General Information")} />
<CardContent>
<TextField
className={classes.nameInput}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const VoucherOptions = withStyles(styles, {
onChange
}: VoucherOptionsProps & WithStyles<typeof styles>) => (
<Card>
<CardTitle title={i18n.t("Detailed Informations")} />
<CardTitle title={i18n.t("Detailed Information")} />
<CardContent className={classes.root}>
<TextFieldWithChoice
disabled={disabled}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { Home_activities_edges_node } from "../../types/Home";
export const getActivityMessage = (activity: Home_activities_edges_node) => {
switch (activity.type) {
case OrderEventsEnum.ORDER_FULLY_PAID:
return i18n.t("Order #{{ orderId }} had been fully paid", {
return i18n.t("Order #{{ orderId }} was fully paid", {
orderId: activity.orderNumber
});
case OrderEventsEnum.PLACED:
return i18n.t("Order #{{ orderId }} had been placed", {
return i18n.t("Order #{{ orderId }} was placed", {
orderId: activity.orderNumber
});
case OrderEventsEnum.PLACED_FROM_DRAFT:
return i18n.t(
"Order #{{ orderId }} had been placed from draft by {{ user }}",
"Order #{{ orderId }} was placed from draft by {{ user }}",
{
orderId: activity.orderNumber,
user: activity.user.email
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const HomeOrdersCard = withStyles(styles, { name: "HomeOrdersCard" })(
</Typography>
<Typography className={classes.subtitle}>
{userName ? (
i18n.t("Here are some information we gathered about your store")
i18n.t("Here is some information we gathered about your store")
) : (
<Skeleton style={{ width: "10em" }} />
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,9 @@ const MenuDetailsPage: React.StatelessComponent<MenuDetailsPageProps> = ({
<Grid variant="inverted">
<div>
<Typography variant="headline">{i18n.t("Navigation")}</Typography>
<CardSpacer />
<Typography>
{i18n.t(
"Creating structure of navigation is done via dragging and dropping. Simply create a new menu item and then dragging it into it’s destined place. Take note that you can move items inside one another to create a tree structure"
"Creating the navigation structure is done by dragging and dropping. Simply create a new menu item and then drag it into its destined place. You can move items inside one another to create a tree structure and drag items up and down to create a hierarchy"
)}
</Typography>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const MenuProperties: React.StatelessComponent<MenuPropertiesProps> = ({
onChange
}) => (
<Card>
<CardTitle title={i18n.t("General Informations")} />
<CardTitle title={i18n.t("General Information")} />
<CardContent>
<TextField
disabled={disabled}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ import {
TimelineNote
} from "../../../components/Timeline";
import i18n from "../../../i18n";
import { OrderEventsEmailsEnum, OrderEventsEnum } from "../../../types/globalTypes";
import {
OrderEventsEmailsEnum,
OrderEventsEnum
} from "../../../types/globalTypes";
import { OrderDetails_order_events } from "../../types/OrderDetails";

export interface FormData {
Expand All @@ -27,50 +30,50 @@ export interface FormData {
const getEventMessage = (event: OrderDetails_order_events) => {
switch (event.type) {
case OrderEventsEnum.CANCELED:
return i18n.t("Order has been cancelled", {
return i18n.t("Order was cancelled", {
context: "order history message"
});
case OrderEventsEnum.DRAFT_ADDED_PRODUCTS:
return i18n.t("Products have been added to draft order", {
return i18n.t("Products were added to draft order", {
context: "order history message"
});
case OrderEventsEnum.DRAFT_CREATED:
return i18n.t("Draft order has been created", {
return i18n.t("Draft order was created", {
context: "order history message"
});
case OrderEventsEnum.DRAFT_REMOVED_PRODUCTS:
return i18n.t("Products have been removed from draft order", {
return i18n.t("Products were removed from draft order", {
context: "order history message"
});
case OrderEventsEnum.EMAIL_SENT:
switch (event.emailType) {
case OrderEventsEmailsEnum.DIGITAL_LINKS:
return i18n.t("Links to the order's digital goods have been sent", {
return i18n.t("Links to the order's digital goods were sent", {
context: "order history message"
});
case OrderEventsEmailsEnum.FULFILLMENT_CONFIRMATION:
return i18n.t("Fulfillment confirmation has been sent to customer", {
return i18n.t("Fulfillment confirmation was sent to customer", {
context: "order history message"
});
case OrderEventsEmailsEnum.ORDER_CONFIRMATION:
return i18n.t("Order confirmation has been sent to customer", {
return i18n.t("Order confirmation was sent to customer", {
context: "order history message"
});
case OrderEventsEmailsEnum.PAYMENT_CONFIRMATION:
return i18n.t("Payment confirmation has been sent to customer", {
return i18n.t("Payment confirmation was sent to customer", {
context: "order history message"
});
case OrderEventsEmailsEnum.SHIPPING_CONFIRMATION:
return i18n.t("Shipping details has been sent to customer", {
return i18n.t("Shipping details was sent to customer", {
context: "order history message"
});
case OrderEventsEmailsEnum.TRACKING_UPDATED:
return i18n.t("Shipping tracking number has been sent to customer", {
return i18n.t("Shipping tracking number was sent to customer", {
context: "order history message"
});
}
case OrderEventsEnum.FULFILLMENT_CANCELED:
return i18n.t("Fulfillment has been cancelled", {
return i18n.t("Fulfillment was cancelled", {
context: "order history message"
});
case OrderEventsEnum.FULFILLMENT_FULFILLED_ITEMS:
Expand All @@ -84,11 +87,11 @@ const getEventMessage = (event: OrderDetails_order_events) => {
quantity: event.quantity
});
case OrderEventsEnum.NOTE_ADDED:
return i18n.t("Note has been added to the order", {
return i18n.t("Note was added to the order", {
context: "order history message"
});
case OrderEventsEnum.ORDER_FULLY_PAID:
return i18n.t("Order has been fully paid", {
return i18n.t("Order was fully paid", {
context: "order history message"
});
case OrderEventsEnum.ORDER_MARKED_AS_PAID:
Expand All @@ -103,35 +106,35 @@ const getEventMessage = (event: OrderDetails_order_events) => {
quantity: event.quantity
});
case OrderEventsEnum.PAYMENT_CAPTURED:
return i18n.t("Payment has been captured", {
return i18n.t("Payment was captured", {
context: "order history message"
});
case OrderEventsEnum.PAYMENT_FAILED:
return i18n.t("Payment failed", {
context: "order history message"
});
case OrderEventsEnum.PAYMENT_REFUNDED:
return i18n.t("Payment has been refunded", {
return i18n.t("Payment was refunded", {
context: "order history message"
});
case OrderEventsEnum.PAYMENT_VOIDED:
return i18n.t("Payment has been voided", {
return i18n.t("Payment was voided", {
context: "order history message"
});
case OrderEventsEnum.PLACED:
return i18n.t("Order has been placed", {
return i18n.t("Order was placed", {
context: "order history message"
});
case OrderEventsEnum.PLACED_FROM_DRAFT:
return i18n.t("Order has been created from draft", {
return i18n.t("Order was created from draft", {
context: "order history message"
});
case OrderEventsEnum.TRACKING_UPDATED:
return i18n.t("Updated fulfillment group's tracking number", {
context: "order history message"
});
case OrderEventsEnum.UPDATED_ADDRESS:
return i18n.t("Order address has been updated", {
return i18n.t("Order address was updated", {
context: "order history message"
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const PageInfo = withStyles(styles, {
onChange
}: PageInfoProps & WithStyles<typeof styles>) => (
<Card className={classes.root}>
<CardTitle title={i18n.t("General Informations")} />
<CardTitle title={i18n.t("General Information")} />
<CardContent>
<TextField
disabled={disabled}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const ProductVariants = withStyles(styles, { name: "ProductVariants" })(
<CardContent>
<Typography>
{i18n.t(
"Use variants for products that come in a variety of version for example different sizes or colors"
"Use variants for products that come in a variety of versions for example different sizes or colors"
)}
</Typography>
</CardContent>
Expand Down