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.

Sign up for GitHub

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

Consistent language in cart or orders #3169

Merged
merged 3 commits into from
Nov 9, 2017
Merged

Consistent language in cart or orders #3169

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f3da73
replace all instances of "Quantity Total" with "Items in order" for t…
codejockie Oct 25, 2017
a968b52
Merge branch 'master' into kennedy-consistent-language-in-cart-or-ord…
codejockie Nov 8, 2017
f959388
Remove unused prop to satisfy eslint
spencern Nov 9, 2017
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
3 changes: 1 addition & 2 deletions imports/plugins/core/checkout/client/components/shopOrderSummary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { Components, registerComponent } from "@reactioncommerce/reaction-compon
* @return {Node} React node containing the summary information for each shop
*/
const ShopOrderSummary = ({ shopSummary, isProfilePage }) => {
const shopSummaryName = isProfilePage ? "Items in order" : "Quantity Total";
return (
<div className="order-details-info-box-content">
<div className="order-summary-line">
Expand All @@ -21,7 +20,7 @@ const ShopOrderSummary = ({ shopSummary, isProfilePage }) => {
</div>
<div className="order-summary-line">
<div className="order-summary-title">
<Components.Translation defaultValue={shopSummaryName} i18nKey={shopSummaryName || "cartCompleted.quantityTotal"}/>
<Components.Translation defaultValue="Items in order" i18nKey={"cartCompleted.orderItems"}/>
</div>
<div className="order-summary-value">{shopSummary.quantityTotal}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion imports/plugins/core/checkout/server/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"discountTotal": "Discount Total",
"orderTotal": "Order Total",
"fulfilledBy": "Fulfilled by",
"quantityTotal": "Quantity Total",
"orderItems": "Items in order",
"orderSubtotal": "Subtotal",
"orderShipping": "Shipping",
"orderTax": "Tax",
Expand Down
2 changes: 1 addition & 1 deletion imports/plugins/core/orders/client/components/invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class Invoice extends Component {
return (
<div>
<div className="order-summary-form-group">
<strong>Quantity Total</strong>
<strong><Components.Translation defaultValue="Items in order" i18nKey="cartSubTotals.orderItems" /></strong>
<div className="invoice-details">
{invoice.totalItems}
</div>
Expand Down
1 change: 1 addition & 0 deletions private/data/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@
"discount": "Discount",
"head": "Your cart",
"items": "Items in cart",
"orderItems": "Items in order",
"subtotal": "Sub total",
"shipping": "Shipping",
"tax": "Tax",
Expand Down