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

Consistent language in cart or orders #3169

Merged

Conversation

codejockie
Copy link
Contributor

Resolves #2798

How to Test

  1. Place an order
  2. On the order completed page, under the "Your cart" section, you should now see "Items in order" instead of the former "Quantity Total" as shown in the image below:

screen shot 2017-10-25 at 12 45 45

  1. Login as admin
  2. Approve the order
  3. On the Process Order Action View, you should now see "Items in order" instead of the former "Quantity Total" as shown below:

screen shot 2017-10-25 at 12 46 14

…he Order Completed Page and Process Order Action View
@machikoyasuda
Copy link
Contributor

Thank you for using sentence case <3

@brent-hoover
Copy link
Collaborator

@rymorgan These changes seem fine but does somebody need to verify that we got all of them?

@rymorgan
Copy link
Contributor

rymorgan commented Nov 7, 2017

@zenweasel What's the best way of doing that? Can't we search the code to find where we are using this language (Quantity Total)? I can comb through the app and try to find all the places but that seems like I'll probably miss something.

@aaronjudd
Copy link
Contributor

@rymorgan all labels are in i18n (en.json) files...

@rymorgan
Copy link
Contributor

rymorgan commented Nov 7, 2017

@codejockie did you double check the i18n (en.json) files for any more instances of 'Quantity total'? Please, do that and let me know all/any places that it's been changed so I can QA.

@codejockie
Copy link
Contributor Author

@rymorgan okay, will do that and get back to you.

@codejockie
Copy link
Contributor Author

codejockie commented Nov 7, 2017

@rymorgan I did a search for "Quantity Total" in this PR, and I came across none as I have replaced the instances where they once existed with the right words

@rymorgan
Copy link
Contributor

rymorgan commented Nov 7, 2017

@codejockie Great, sounds good. Should be good to go then.

brent-hoover
brent-hoover previously approved these changes Nov 8, 2017
@brent-hoover
Copy link
Collaborator

@codejockie You have a conflict you need to resolve, but otherwise good to go.

@codejockie
Copy link
Contributor Author

@zenweasel conflict resolved.

Copy link
Collaborator

@brent-hoover brent-hoover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to go.

@spencern spencern changed the base branch from master to release-1.5.7 November 9, 2017 00:44
@spencern
Copy link
Contributor

spencern commented Nov 9, 2017

After removing unused prop in f959388 this now passes eslint.

@spencern spencern merged commit 2e8641b into release-1.5.7 Nov 9, 2017
@spencern spencern deleted the kennedy-consistent-language-in-cart-or-orders-2798 branch November 9, 2017 00:48
@spencern spencern mentioned this pull request Nov 9, 2017
Akarshit pushed a commit that referenced this pull request Jan 7, 2018
…guage-in-cart-or-orders-2798

Consistent language in cart or orders
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants