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 order table RTL alignment #2876

Merged
merged 24 commits into from
Sep 21, 2017

Conversation

kieha
Copy link
Contributor

@kieha kieha commented Sep 15, 2017

Resolves #2818. Also, adds translations for order table headers.

How to test

  • Change language to an RTL one
  • Visit the orders dashboard
  • Observe that the table and its elements are properly aligned

P.S. reaction reset for the translations on the order table headers to take effect.

@rymorgan
Copy link
Contributor

cart_completed

@rymorgan
Copy link
Contributor

cart_completed2

@kieha
Copy link
Contributor Author

kieha commented Sep 15, 2017

@rymorgan ready for another look.

@rymorgan
Copy link
Contributor

Great, took a look at the spacing, and that's fixed.

@kieha kieha requested a review from spencern September 15, 2017 20:56
@kieha
Copy link
Contributor Author

kieha commented Sep 18, 2017

@spencern this is ready for a review.

Copy link
Contributor

@spencern spencern left a comment

Choose a reason for hiding this comment

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

@kieha Not sure if I'm doing something wrong, but I'm seeing missing translations here:
image

@kieha
Copy link
Contributor Author

kieha commented Sep 19, 2017

@spencer you need to reaction reset for the translations to take effect. The order table header names were hard-coded before, so I added translations for them.

@@ -292,7 +292,18 @@
"orderSetToState": "{{orderNumber}} {{orderText}} set to {{status}}",
"skippedBulkOrdersAlert": "You've requested that {{selectedOrders}} {{orderText}} be set to the '{{status}}' status, but {{numberOfSkippedOrders}} of these orders {{skippedOrdersText}} not in the '{{skippedState}}' state and would skip all steps leading up to the '{{status}}' state. Are you sure you want to do this?",
"bulkOrdersRegressionAlert": "You're about to regress {{ordersToRegress}} {{orderText}} back to the '{{status}}' state. Are you sure you want to continue with this operation?",
"paymentCaptureSuccess": "Payments successfully captured"
"paymentCaptureSuccess": "Payments successfully captured",
"table": {
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to be putting these i18n definitions in the /server/i18n directory within the plugin and not in the project wide /private/data/i18n file. I'll fix this one, but let's make sure that from here on out, the i18n defs are in the plugins directory whenever they are used by a plugin

…thub.com:reactioncommerce/reaction into kieha-fix-order-table-translations-rtl-2817-2818
Copy link
Contributor

@spencern spencern left a comment

Choose a reason for hiding this comment

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

Looks good. I moved the translations to the in-plugin i18n directory.

@spencern
Copy link
Contributor

@kieha This is pretty much ready to merge, but the latest marketplace merge introduced a conflict. Can you resolve this when you get a chance?

@kieha
Copy link
Contributor Author

kieha commented Sep 20, 2017

@spencern conflicts fixed.

@spencern
Copy link
Contributor

I'm still seeing one more conflict here in the browser @kieha

@kieha
Copy link
Contributor Author

kieha commented Sep 21, 2017

@spencern fixed. Good to go.

@spencer
Copy link

spencer commented Sep 21, 2017 via email

@spencern spencern merged commit 5532580 into marketplace Sep 21, 2017
@spencern spencern deleted the kieha-fix-order-table-translations-rtl-2817-2818 branch September 27, 2017 01:32
@spencern spencern mentioned this pull request Oct 11, 2017
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.

4 participants