Merge pull request #3057 from reactioncommerce/ek-issue2817

fix translations on order admin
reactioncommerce · Oct 7, 2017 · 64a56dc · 64a56dc
2 parents 3b9a080 + 51ca34d
commit 64a56dc
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/imports/plugins/core/orders/client/components/orderFilter.js b/imports/plugins/core/orders/client/components/orderFilter.js
@@ -44,7 +44,7 @@ class OrderFilter extends Component {
       );
     }
     return (
-      <Components.Translation defaultValue="Date Range" i18nKey="order.filter.dateRange" />
+      <Components.Translation defaultValue="Date Range" i18nKey="admin.table.filter.dateRange" />
     );
   }
 
@@ -60,7 +60,7 @@ class OrderFilter extends Component {
     return (
       <Components.Translation
         defaultValue="Shipping Status"
-        i18nKey={`order.filter.${this.state.shippingLabel}`}
+        i18nKey={`admin.table.filter.${this.state.shippingLabel}`}
       />
     );
   }
@@ -102,7 +102,7 @@ class OrderFilter extends Component {
             <span className={`order-filter-name capitalize ${this.state.classNames.workflow}`}>
               <Components.Translation
                 defaultValue={this.state.workflowLabel}
-                i18nKey={`order.filter.${this.state.workflowLabel}`}
+                i18nKey={`admin.table.filter.${this.state.workflowLabel}`}
               />
             </span>
             <div className="order-filter-icons">
@@ -130,7 +130,7 @@ class OrderFilter extends Component {
                   <Components.MenuItem
                     key={index}
                     label={status.label}
-                    i18nKeyLabel={`order.filter.${status.value}`}
+                    i18nKeyLabel={`admin.table.filter.${status.value}`}
                     value={status.value}
                   />
                 ))}

diff --git a/imports/plugins/core/orders/client/components/orderSearch.js b/imports/plugins/core/orders/client/components/orderSearch.js
@@ -49,12 +49,12 @@ class OrderSearch extends Component {
           className="search-input"
           onChange={this.handleChange}
           value={this.state.value}
-          i18nKeyPlaceholder="admin.dashboard.searchLabel"
+          i18nKeyPlaceholder="admin.table.search.placeholder"
         />
         <i className="fa fa-search fa-fw"/>
         <Components.Button
           className="search-clear"
-          i18nKeyLabel="admin.dashboard.clearSearch"
+          i18nKeyLabel="admin.table.search.clearSearch"
           label="Clear"
           onClick={this.handleClear}
         />

diff --git a/imports/plugins/core/orders/client/components/orderTableColumn.js b/imports/plugins/core/orders/client/components/orderTableColumn.js
@@ -106,7 +106,7 @@ class OrderTableColumn extends Component {
         <Badge
           className="orders-badge"
           badgeSize="large"
-          i18nKeyLabel={`cartDrawer.${this.props.row.value}`}
+          i18nKeyLabel={`admin.table.data.status.${this.props.row.value}`}
           label={this.props.row.value}
           status="basic"
         />
@@ -117,7 +117,7 @@ class OrderTableColumn extends Component {
         <div className="status-info">
           <Badge
             badgeSize="large"
-            i18nKeyLabel={`cartDrawer.${this.props.row.value}`}
+            i18nKeyLabel={`admin.table.data.status.${this.props.row.value}`}
             label={this.props.row.value}
             status={this.props.fulfillmentBadgeStatus(this.props.row.original)}
           />

diff --git a/imports/plugins/core/orders/server/i18n/en.json b/imports/plugins/core/orders/server/i18n/en.json
@@ -61,6 +61,34 @@
             "total": "Total",
             "shipping": "Shipping",
             "status": "Status"
+          },
+          "filter": {
+            "status": "Status",
+            "dateRange": "Date range",
+            "shippingStatus": "Shipping status",
+            "new": "New",
+            "captured": "Captured",
+            "shipped": "Shipped",
+            "completed": "Completed",
+            "canceled": "Canceled",
+            "refunded": "Refunded"
+          },
+          "search": {
+            "clearSearch": "Clear",
+            "placeholder": "Search orders"
+          },
+          "data": {
+            "status": {
+              "new": "New ",
+              "coreOrderWorkflow/created": "Created ",
+              "coreOrderWorkflow/processing": "Processing ",
+              "coreOrderWorkflow/completed": "Completed ",
+              "coreOrderWorkflow/canceled": "Canceled ",
+              "coreOrderWorkflow/picked": "Picked ",
+              "coreOrderWorkflow/packed": "Packed ",
+              "coreOrderWorkflow/labeled": "Labeled ",
+              "coreOrderWorkflow/shipped": "Shipped "
+            }
           }
         }
       }