Skip to content

Commit 6b1837b

Browse files
author
govindasharma974
committed
Added new line to to mftf files, added words to csv and fixed compilation issue
1 parent 1dab430 commit 6b1837b

File tree

8 files changed

+785
-782
lines changed

8 files changed

+785
-782
lines changed

‎app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,10 @@ public function load()
183183
if ($creditmemoId) {
184184
try {
185185
$creditmemo = $this->creditmemoRepository->get($creditmemoId);
186-
} catch (\Exception $e) {
186+
} catch (\Exception $e) {
187187
$this->messageManager->addErrorMessage(__('This creditmemo no longer exists.'));
188188
return false;
189+
}
189190
} elseif ($orderId) {
190191
$data = $this->getCreditmemo();
191192
$order = $this->orderFactory->create()->load($orderId);

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminGoToCreditmemoViewActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
<amOnPage url="{{AdminCreditmemoViewPage.url}}/{{identifier}}" stepKey="amOnCreditmemoViewPage"/>
2020
<waitForPageLoad stepKey="waitForPageLoad"/>
2121
</actionGroup>
22-
</actionGroups>
22+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminOpenCreditmemoViewPageWithWrongCreditmemoIdTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
<see selector="{{AdminMessagesSection.error}}" userInput='This creditmemo no longer exists.'
3737
stepKey="seeErrorMessage"/>
3838
</test>
39-
</tests>
39+
</tests>

‎app/code/Magento/Sales/i18n/en_US.csv

Lines changed: 647 additions & 646 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminGoToShipmentViewActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
<amOnPage url="{{AdminShipmentViewPage.url}}/{{identifier}}" stepKey="amOnShipmentViewPage"/>
2020
<waitForPageLoad stepKey="waitForPageLoad"/>
2121
</actionGroup>
22-
</actionGroups>
22+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/Page/AdminShipmentViewPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminShipmentViewPage" url="sales/shipment/view/shipment_id" area="admin" module="Shipping">
1212
</page>
13-
</pages>
13+
</pages>

‎app/code/Magento/Shipping/Test/Mftf/Test/AdminOpenShipmentViewPageWithWrongShipmentIdTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@
3636
<see selector="{{AdminMessagesSection.error}}" userInput='This shipment no longer exists.'
3737
stepKey="seeErrorMessage"/>
3838
</test>
39-
</tests>
39+
</tests>

‎app/code/Magento/Shipping/i18n/en_US.csv

Lines changed: 131 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,180 @@
1-
"New Shipment for Order #%1","New Shipment for Order #%1"
2-
"Submit Shipment","Submit Shipment"
3-
"You are trying to add a quantity for some products that doesn't match the quantity that was shipped.","You are trying to add a quantity for some products that doesn't match the quantity that was shipped."
4-
"Products should be added to package(s)","Products should be added to package(s)"
5-
"The value that you entered is not valid.","The value that you entered is not valid."
6-
"Add Tracking Number","Add Tracking Number"
7-
"Custom Value","Custom Value"
1+
New Shipment for Order #%1,New Shipment for Order #%1
2+
Submit Shipment,Submit Shipment
3+
You are trying to add a quantity for some products that doesn't match the quantity that was shipped.,You are trying to add a quantity for some products that doesn't match the quantity that was shipped.
4+
Products should be added to package(s),Products should be added to package(s)
5+
The value that you entered is not valid.,The value that you entered is not valid.
6+
Add Tracking Number,Add Tracking Number
7+
Custom Value,Custom Value
88
Add,Add
9-
"Send Tracking Information","Send Tracking Information"
10-
"Are you sure you want to send a Shipment email to customer?","Are you sure you want to send a Shipment email to customer?"
9+
Send Tracking Information,Send Tracking Information
10+
Are you sure you want to send a Shipment email to customer?,Are you sure you want to send a Shipment email to customer?
1111
Print,Print
12-
"the shipment email was sent","the shipment email was sent"
13-
"the shipment email is not sent","the shipment email is not sent"
14-
"Shipment #%1 | %3 (%2)","Shipment #%1 | %3 (%2)"
15-
"Create Shipping Label...","Create Shipping Label..."
16-
"Print Shipping Label","Print Shipping Label"
17-
"Show Packages","Show Packages"
18-
"About Your Shipment","About Your Shipment"
19-
"Order # %1","Order # %1"
20-
"Back to My Orders","Back to My Orders"
21-
"View Another Order","View Another Order"
22-
"Please enter a comment.","Please enter a comment."
23-
"Cannot add new comment.","Cannot add new comment."
24-
"Please specify a carrier.","Please specify a carrier."
25-
"Please enter a tracking number.","Please enter a tracking number."
12+
the shipment email was sent,the shipment email was sent
13+
the shipment email is not sent,the shipment email is not sent
14+
Shipment #%1 | %3 (%2),Shipment #%1 | %3 (%2)
15+
Create Shipping Label...,Create Shipping Label...
16+
Print Shipping Label,Print Shipping Label
17+
Show Packages,Show Packages
18+
About Your Shipment,About Your Shipment
19+
Order # %1,Order # %1
20+
Back to My Orders,Back to My Orders
21+
View Another Order,View Another Order
22+
Please enter a comment.,Please enter a comment.
23+
Cannot add new comment.,Cannot add new comment.
24+
Please specify a carrier.,Please specify a carrier.
25+
Please enter a tracking number.,Please enter a tracking number.
2626
Shipments,Shipments
27-
"We can't initialize shipment for adding tracking number.","We can't initialize shipment for adding tracking number."
28-
"Cannot add tracking number.","Cannot add tracking number."
29-
"You created the shipping label.","You created the shipping label."
30-
"An error occurred while creating shipping label.","An error occurred while creating shipping label."
31-
"You sent the shipment.","You sent the shipment."
32-
"Cannot send shipment information.","Cannot send shipment information."
33-
"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
34-
"New Shipment","New Shipment"
35-
"We don't recognize or support the file extension in this shipment: %1.","We don't recognize or support the file extension in this shipment: %1."
36-
"We can't initialize shipment for delete tracking number.","We can't initialize shipment for delete tracking number."
37-
"We can't delete tracking number.","We can't delete tracking number."
38-
"We can't load track with retrieving identifier right now.","We can't load track with retrieving identifier right now."
39-
"We can't save the shipment right now.","We can't save the shipment right now."
27+
We can't initialize shipment for adding tracking number.,We can't initialize shipment for adding tracking number.
28+
Cannot add tracking number.,Cannot add tracking number.
29+
You created the shipping label.,You created the shipping label.
30+
An error occurred while creating shipping label.,An error occurred while creating shipping label.
31+
You sent the shipment.,You sent the shipment.
32+
Cannot send shipment information.,Cannot send shipment information.
33+
There are no shipping labels related to selected orders.,There are no shipping labels related to selected orders.
34+
New Shipment,New Shipment
35+
We don't recognize or support the file extension in this shipment: %1.,We don't recognize or support the file extension in this shipment: %1.
36+
We can't initialize shipment for delete tracking number.,We can't initialize shipment for delete tracking number.
37+
We can't delete tracking number.,We can't delete tracking number.
38+
We can't load track with retrieving identifier right now.,We can't load track with retrieving identifier right now.
39+
We can't save the shipment right now.,We can't save the shipment right now.
4040
"""Shipment Document Validation Error(s):\n"" .","""Shipment Document Validation Error(s):\n"" ."
41-
"The shipment has been created.","The shipment has been created."
42-
"Cannot save shipment.","Cannot save shipment."
43-
"The order no longer exists.","The order no longer exists."
44-
"Cannot do shipment for the order separately from invoice.","Cannot do shipment for the order separately from invoice."
45-
"Cannot do shipment for the order.","Cannot do shipment for the order."
46-
"There are no shipping labels related to selected shipments.","There are no shipping labels related to selected shipments."
47-
"Page not found.","Page not found."
48-
"Tracking Information","Tracking Information"
41+
The shipment has been created.,The shipment has been created.
42+
Cannot save shipment.,Cannot save shipment.
43+
The order no longer exists.,The order no longer exists.
44+
Cannot do shipment for the order separately from invoice.,Cannot do shipment for the order separately from invoice.
45+
Cannot do shipment for the order.,Cannot do shipment for the order.
46+
There are no shipping labels related to selected shipments.,There are no shipping labels related to selected shipments.
47+
Page not found.,Page not found.
48+
Tracking Information,Tracking Information
4949
"Sorry, but we can't deliver to the destination country with this shipping module.","Sorry, but we can't deliver to the destination country with this shipping module."
50-
"The shipping module is not available.","The shipping module is not available."
51-
"This shipping method is not available. Please specify the zip code.","This shipping method is not available. Please specify the zip code."
52-
"No packages for request","No packages for request"
53-
"Security validation of XML document has been failed.","Security validation of XML document has been failed."
54-
"All Allowed Countries","All Allowed Countries"
55-
"Specific Countries","Specific Countries"
50+
The shipping module is not available.,The shipping module is not available.
51+
This shipping method is not available. Please specify the zip code.,This shipping method is not available. Please specify the zip code.
52+
No packages for request,No packages for request
53+
Security validation of XML document has been failed.,Security validation of XML document has been failed.
54+
All Allowed Countries,All Allowed Countries
55+
Specific Countries,Specific Countries
5656
Development,Development
5757
Live,Live
58-
"Divide to equal weight (one request)","Divide to equal weight (one request)"
59-
"Use origin weight (few requests)","Use origin weight (few requests)"
58+
Divide to equal weight (one request),Divide to equal weight (one request)
59+
Use origin weight (few requests),Use origin weight (few requests)
6060
Packages,Packages
6161
Package,Package
6262
Type,Type
6363
Length,Length
64-
"Signature Confirmation","Signature Confirmation"
65-
"Customs Value","Customs Value"
64+
Signature Confirmation,Signature Confirmation
65+
Customs Value,Customs Value
6666
Width,Width
6767
Contents,Contents
68-
"Total Weight","Total Weight"
68+
Total Weight,Total Weight
6969
Height,Height
7070
Size,Size
7171
Girth,Girth
72-
"Items in the Package","Items in the Package"
72+
Items in the Package,Items in the Package
7373
Product,Product
7474
Weight,Weight
75-
"Qty Ordered","Qty Ordered"
75+
Qty Ordered,Qty Ordered
7676
Qty,Qty
7777
"No detail for number ""%1""","No detail for number ""%1"""
78-
"Shipping labels is not available.","Shipping labels is not available."
79-
"Response info is not exist.","Response info is not exist."
80-
"Invalid carrier: %1","Invalid carrier: %1"
81-
"We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.","We don't have enough information to create shipping labels. Please make sure your store information and settings are complete."
82-
"Per Order","Per Order"
83-
"Per Package","Per Package"
78+
Shipping labels is not available.,Shipping labels is not available.
79+
Response info is not exist.,Response info is not exist.
80+
Invalid carrier: %1,Invalid carrier: %1
81+
We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.,We don't have enough information to create shipping labels. Please make sure your store information and settings are complete.
82+
Per Order,Per Order
83+
Per Package,Per Package
8484
Fixed,Fixed
8585
Percent,Percent
86-
"Tracking information is unavailable.","Tracking information is unavailable."
86+
Tracking information is unavailable.,Tracking information is unavailable.
8787
message,message
88-
"Email has not been sent","Email has not been sent"
89-
"Payment &amp; Shipping Method","Payment &amp; Shipping Method"
90-
"Payment Information","Payment Information"
91-
"The order was placed using %1.","The order was placed using %1."
92-
"Shipping Information","Shipping Information"
93-
"Total Shipping Charges","Total Shipping Charges"
94-
"Incl. Tax","Incl. Tax"
95-
"Items to Ship","Items to Ship"
96-
"Qty to Ship","Qty to Ship"
88+
Email has not been sent,Email has not been sent
89+
Payment &amp; Shipping Method,Payment &amp; Shipping Method
90+
Payment Information,Payment Information
91+
The order was placed using %1.,The order was placed using %1.
92+
Shipping Information,Shipping Information
93+
Total Shipping Charges,Total Shipping Charges
94+
Incl. Tax,Incl. Tax
95+
Items to Ship,Items to Ship
96+
Qty to Ship,Qty to Ship
9797
Ship,Ship
98-
"Shipment Total","Shipment Total"
99-
"Shipment Comments","Shipment Comments"
100-
"Comment Text","Comment Text"
101-
"Shipment Options","Shipment Options"
102-
"Create Shipping Label","Create Shipping Label"
103-
"Append Comments","Append Comments"
104-
"Email Copy of Shipment","Email Copy of Shipment"
105-
"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
106-
"Select All","Select All"
107-
"Product Name","Product Name"
98+
Shipment Total,Shipment Total
99+
Shipment Comments,Shipment Comments
100+
Comment Text,Comment Text
101+
Shipment Options,Shipment Options
102+
Create Shipping Label,Create Shipping Label
103+
Append Comments,Append Comments
104+
Email Copy of Shipment,Email Copy of Shipment
105+
Invalid value(s) for Qty to Ship,Invalid value(s) for Qty to Ship
106+
Select All,Select All
107+
Product Name,Product Name
108108
Delete,Delete
109-
"Create Packages","Create Packages"
109+
Create Packages,Create Packages
110110
Cancel,Cancel
111111
Save,Save
112-
"Add Package","Add Package"
113-
"Add Selected Product(s) to Package","Add Selected Product(s) to Package"
114-
"Add Products to Package","Add Products to Package"
115-
"USPS domestic shipments don't use package types.","USPS domestic shipments don't use package types."
112+
Add Package,Add Package
113+
Add Selected Product(s) to Package,Add Selected Product(s) to Package
114+
Add Products to Package,Add Products to Package
115+
USPS domestic shipments don't use package types.,USPS domestic shipments don't use package types.
116116
in,in
117117
cm,cm
118118
lb,lb
119119
kg,kg
120-
"Delete Package","Delete Package"
120+
Delete Package,Delete Package
121121
Explanation,Explanation
122122
Carrier,Carrier
123123
Title,Title
124124
Number,Number
125125
Action,Action
126-
"Are you sure?","Are you sure?"
127-
"Shipping &amp; Handling Information","Shipping &amp; Handling Information"
128-
"Track Order","Track Order"
129-
"No shipping information available","No shipping information available"
130-
"Shipping and Tracking Information","Shipping and Tracking Information"
131-
"Track this shipment","Track this shipment"
132-
"Items Shipped","Items Shipped"
133-
"Order Total","Order Total"
134-
"Shipment History","Shipment History"
135-
"Qty Shipped","Qty Shipped"
136-
"Print All Shipments","Print All Shipments"
137-
"Shipment #","Shipment #"
138-
"Print Shipment","Print Shipment"
139-
"Tracking Number(s):","Tracking Number(s):"
126+
Are you sure?,Are you sure?
127+
Shipping &amp; Handling Information,Shipping &amp; Handling Information
128+
Track Order,Track Order
129+
No shipping information available,No shipping information available
130+
Shipping and Tracking Information,Shipping and Tracking Information
131+
Track this shipment,Track this shipment
132+
Items Shipped,Items Shipped
133+
Order Total,Order Total
134+
Shipment History,Shipment History
135+
Qty Shipped,Qty Shipped
136+
Print All Shipments,Print All Shipments
137+
Shipment #,Shipment #
138+
Print Shipment,Print Shipment
139+
Tracking Number(s):,Tracking Number(s):
140140
SKU,SKU
141-
"Order tracking","Order tracking"
142-
"Tracking Number:","Tracking Number:"
141+
Order tracking,Order tracking
142+
Tracking Number:,Tracking Number:
143143
Carrier:,Carrier:
144144
Error:,Error:
145-
"Tracking information is currently not available. Please ","Tracking information is currently not available. Please "
146-
"contact us","contact us"
147-
" for more information or "," for more information or "
148-
"email us at ","email us at "
145+
Tracking information is currently not available. Please ,Tracking information is currently not available. Please
146+
contact us,contact us
147+
for more information or , for more information or
148+
email us at ,email us at
149149
Info:,Info:
150150
Track:,Track:
151-
". ':'",". ':'"
152-
"Delivered on:","Delivered on:"
151+
. ':',. ':'
152+
Delivered on:,Delivered on:
153153
N/A,N/A
154-
"There is no tracking available for this shipment.","There is no tracking available for this shipment."
155-
"There is no tracking available.","There is no tracking available."
156-
"Close Window","Close Window"
157-
"Track history","Track history"
154+
There is no tracking available for this shipment.,There is no tracking available for this shipment.
155+
There is no tracking available.,There is no tracking available.
156+
Close Window,Close Window
157+
Track history,Track history
158158
Location,Location
159159
Date,Date
160-
"Local Time","Local Time"
160+
Local Time,Local Time
161161
Description,Description
162-
"See our Shipping Policy","See our Shipping Policy"
163-
"Shipping Settings Section","Shipping Settings Section"
164-
"Shipping Policy Parameters Section","Shipping Policy Parameters Section"
165-
"Shipping Methods Section","Shipping Methods Section"
166-
"Shipping Settings","Shipping Settings"
162+
See our Shipping Policy,See our Shipping Policy
163+
Shipping Settings Section,Shipping Settings Section
164+
Shipping Policy Parameters Section,Shipping Policy Parameters Section
165+
Shipping Methods Section,Shipping Methods Section
166+
Shipping Settings,Shipping Settings
167167
Origin,Origin
168168
Country,Country
169169
Region/State,Region/State
170-
"ZIP/Postal Code","ZIP/Postal Code"
170+
ZIP/Postal Code,ZIP/Postal Code
171171
City,City
172-
"Street Address","Street Address"
173-
"Street Address Line 2","Street Address Line 2"
174-
"Shipping Policy Parameters","Shipping Policy Parameters"
175-
"Apply custom Shipping Policy","Apply custom Shipping Policy"
176-
"Shipping Policy","Shipping Policy"
177-
"Shipping Methods","Shipping Methods"
178-
"Track your order","Track your order"
179-
"Track All Shipments","Track All Shipments"
172+
Street Address,Street Address
173+
Street Address Line 2,Street Address Line 2
174+
Shipping Policy Parameters,Shipping Policy Parameters
175+
Apply custom Shipping Policy,Apply custom Shipping Policy
176+
Shipping Policy,Shipping Policy
177+
Shipping Methods,Shipping Methods
178+
Track your order,Track your order
179+
Track All Shipments,Track All Shipments
180+
This shipment no longer exists.,This shipment no longer exists.

0 commit comments

Comments
 (0)