-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Fix order table RTL alignment #2876
Conversation
@rymorgan ready for another look. |
Great, took a look at the spacing, and that's fixed. |
@spencern this is ready for a review. |
There was a problem hiding this 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:
@spencer you need to |
private/data/i18n/en.json
Outdated
@@ -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": { |
There was a problem hiding this comment.
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
There was a problem hiding this 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.
@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? |
@spencern conflicts fixed. |
I'm still seeing one more conflict here in the browser @kieha |
@spencern fixed. Good to go. |
You're @-ing me not the Spencer you intended. (I've been ignoring it, but thought I should probably point it out)
|
Resolves #2818. Also, adds translations for order table headers.
How to test
P.S.
reaction reset
for the translations on the order table headers to take effect.