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

Bugfix - default option translate #50

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- Auto-update schemas
- Payment method settings - display or hide payment methods

## [2.16.2] - 2021-01-17

### Fixed

- Reason default option translate;
- Condition default option translate;
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"vendor": "vtex",
"name": "return-app",
"version": "2.16.1",
"version": "2.16.2",
"title": "Return app",
"description": "Return app",
"dependencies": {
Expand Down
2 changes: 2 additions & 0 deletions messages/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"returns.November": "November",
"returns.December": "December",
"returns.viewOrder": "view order",
"returns.reasonDefaultOption": "Select Reason",
"returns.reasonAccidentalOrder": "Accidental order",
"returns.reasonBetterPrice": "Better price available",
"returns.reasonPerformance": "Performance or quality not adequate",
Expand All @@ -197,6 +198,7 @@
"returns.showLabel": "View Shipping Label",
"returns.condition.label": "Condition",
"returns.formErrorConditionMissing": "Condition is required",
"returns.conditionDefaultOption": "Select Condition",
"returns.newWithBox": "New With Box",
"returns.newWithoutBox": "New Without Box",
"returns.usedWithBox": "Used With Box",
Expand Down
2 changes: 2 additions & 0 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
"returns.November": "November",
"returns.December": "December",
"returns.viewOrder": "view order",
"returns.reasonDefaultOption": "Select Reason",
"returns.reasonAccidentalOrder": "Accidental order",
"returns.reasonBetterPrice": "Better price available",
"returns.reasonPerformance": "Performance or quality not adequate",
Expand All @@ -197,6 +198,7 @@
"returns.showLabel": "View Shipping Label",
"returns.condition.label": "Condition",
"returns.formErrorConditionMissing": "Condition is required",
"returns.conditionDefaultOption": "Select Condition",
"returns.newWithBox": "New With Box",
"returns.newWithoutBox": "New Without Box",
"returns.usedWithBox": "Used With Box",
Expand Down
2 changes: 2 additions & 0 deletions messages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
"returns.November": "Novembre",
"returns.December": "Dicembre",
"returns.viewOrder": "visualizza ordine",
"returns.reasonDefaultOption": "Seleziona Motivo",
"returns.reasonAccidentalOrder": "Ordine accidentale",
"returns.reasonBetterPrice": "Ho trovato un prezzo migliore",
"returns.reasonPerformance": "Prestazioni o qualità non adeguate",
Expand All @@ -190,6 +191,7 @@
"returns.labelError": "Errore nell'invio dell'etichetta",
"returns.condition.label": "Condizione",
"returns.formErrorConditionMissing": "È obbligatorio inserire una condizione",
"returns.conditionDefaultOption": "Seleziona Condizione",
"returns.newWithBox": "Nuovo con scatola",
"returns.newWithoutBox": "Nuovo senza scatola",
"returns.usedWithBox": "Usato con scatola",
Expand Down
1 change: 1 addition & 0 deletions messages/ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
"returns.productStatusDenied": "Refuzat",
"returns.viewOrder": "vezi comanda",
"returns.reasonOther": "Alt motiv",
"returns.reasonDefaultOption": "Selectați Motivul",
"returns.reasonAccidentalOrder": "Comandat din greseala",
"returns.reasonBetterPrice": "Preț mai bun in alta parte",
"returns.reasonPerformance": "Performanța sau calitatea nu sunt adecvate",
Expand Down
2 changes: 1 addition & 1 deletion node/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5539,7 +5539,7 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"

"stats-lite@github:vtex/node-stats-lite#dist":
stats-lite@vtex/node-stats-lite#dist:
version "2.2.0"
resolved "https://codeload.github.com/vtex/node-stats-lite/tar.gz/1b0d39cc41ef7aaecfd541191f877887a2044797"
dependencies:
Expand Down
6 changes: 4 additions & 2 deletions react/components/RequestForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const messages = defineMessages({
formBank: { id: 'returns.formBank' },
formAgree: { id: 'returns.formAgree' },
termsAndConditions: { id: 'returns.TermsConditions' },
reasonDefaultOption: { id: 'returns.reasonDefaultOption' },
reasonAccidentalOrder: { id: 'returns.reasonAccidentalOrder' },
reasonBetterPrice: { id: 'returns.reasonBetterPrice' },
reasonPerformance: { id: 'returns.reasonPerformance' },
Expand Down Expand Up @@ -96,6 +97,7 @@ const messages = defineMessages({
thReason: { id: 'returns.thReason' },
condition: { id: 'returns.condition.label' },
formErrorConditionMissing: { id: 'returns.formErrorConditionMissing' },
conditionDefaultOption: { id: 'returns.conditionDefaultOption' },
conditionNewWithBox: { id: 'returns.newWithBox' },
conditionNewWithoutBox: { id: 'returns.newWithoutBox' },
conditionUsedWithBox: { id: 'returns.usedWithBox' },
Expand Down Expand Up @@ -270,7 +272,7 @@ class RequestForm extends Component<Props> {
<div className={styles.reasonHolder}>
<Dropdown
label=""
placeholder="Select Reason"
placeholder={formatMessage({ id: messages.reasonDefaultOption.id })}
size="small"
options={returnOptions}
value={product.reasonCode}
Expand Down Expand Up @@ -339,7 +341,7 @@ class RequestForm extends Component<Props> {
<div className={styles.reasonHolder}>
<Dropdown
label=""
placeholder="Select Condition"
placeholder={formatMessage({ id: messages.conditionDefaultOption.id })}
size="small"
options={conditionOptions}
value={product.condition}
Expand Down