Skip to content

Merge release/23.1 into trunk #16090

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 5, 2025
Merged

Merge release/23.1 into trunk #16090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
375c97a
Fix issue mapping shipments after updating for REST API response
itsmeichigo Sep 4, 2025
0e94e0f
Shipping Labels: Fix issue mapping shipments after updating for REST …
itsmeichigo Sep 5, 2025
fe7ae11
Update app translations – `Localizable.strings`
wpmobilebot Sep 5, 2025
2b8e758
Update metadata translations
wpmobilebot Sep 5, 2025
584ed21
Bump version number
wpmobilebot Sep 5, 2025
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
4 changes: 2 additions & 2 deletions Modules/Sources/Networking/Mapper/WooShippingUpdateShipmentMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ struct WooShippingUpdateShipmentMapper: Mapper {
///
func map(response: Data) throws -> WooShippingShipments {
let decoder = JSONDecoder()
if hasDataEnvelope(in: response) {
do {
return try decoder.decode(WooShippingUpdateShipmentResponseEnvelope.self, from: response).data.shipments
} else {
} catch {
return try decoder.decode(WooShippingUpdateShipmentResponse.self, from: response).shipments
}
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/Tests/NetworkingTests/Mapper/WooShippingUpdateShipmentMapperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class WooShippingUpdateShipmentMapperTests: XCTestCase {
}

func test_shipments_are_properly_parsed_when_response_has_no_data_envelope() throws {
guard let shipments = mapLoadShippingLabelConfig() else {
guard let shipments = mapLoadShippingLabelConfigWithoutDataEnvelope() else {
XCTFail()
return
}
Expand Down
38 changes: 9 additions & 29 deletions WooCommerce/Resources/ar.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2025-08-11 15:54:04+0000 */
/* Translation-Revision-Date: 2025-08-25 14:54:04+0000 */
/* Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: ar */
Expand Down Expand Up @@ -1757,8 +1757,7 @@ which should be translated separately and considered part of this sentence. */
"Create Coupon" = "إنشاء قسيمة";

/* Create Shipping Label form navigation title
Option to create new shipping label from the action sheet on Products section of Order Details screen
Text on the button that starts shipping label creation */
Option to create new shipping label from the action sheet on Products section of Order Details screen */
"Create Shipping Label" = "إنشاء ملصق الشحن";

/* Button displayed on the prologue screen of the simplified login flow to create a new store */
Expand Down Expand Up @@ -1927,9 +1926,6 @@ which should be translated separately and considered part of this sentence. */
/* Main message on the Print Customs Invoice screen of Shipping Label flow for multiple invoices */
"Customs forms must be printed and included on these international shipments" = "تجب طباعة الاستمارات الجمركية وتضمينها في عمليات الشحن الدولية هذه";

/* Details text in the shipping label creation info screen */
"Cut the post office line by printing shipping labels at home with your mobile device at discounted rates!" = "توقف عن الذهاب إلى مكتب البريد عن طريق طباعة ملصقات الشحن في المنزل باستخدام جهازك المحمول بأسعار مخفضة!";

/* Country option for a site address. */
"Cyprus" = "قبرص";

Expand Down Expand Up @@ -3578,8 +3574,7 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Instructions for hazardous package shipping. The %1$@ is a tappable linkthat will direct the user to a website */
"Learn how to securely package, label, and ship HAZMAT through USPS® at %1$@." = "تعرّف على كيفية تعبئة الموارد الخطيرة وتغليفها ووضع الملصقات عليها وشحنها من خلال USPS® في %1$@.";

/* Button title in the shipping label creation info screen
Button to open the legal page for AI-generated contents on the product sharing message generation screen
/* Button to open the legal page for AI-generated contents on the product sharing message generation screen
Label for the banner Learn more button
Tappable text at the bottom of store onboarding payments setup screen that opens a webview.
Title for the link to open the legal URL for AI-generated content in the product detail screen
Expand All @@ -3601,9 +3596,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* A button to view more about hardware card readers to handle transactions above the contactless limit, shown on the About Tap to Pay screen */
"Learn more about card readers" = "معرفة المزيد حول قراء البطاقات";

/* Title of button in order details > info link for creating a shipping label on the mobile device. */
"Learn more about creating labels with your mobile device" = "معرفة المزيد حول إنشاء ملصقات باستخدام جهازك المحمول";

/* Link on the error modal when a user without admin role tries to install Jetpack
Link that points the user to learn more about roles. Clicking will open a web page.Presented when the user has tries to switch to a store with incorrect permissions. */
"Learn more about roles and permissions" = "معرفة المزيد حول الرُتب والصلاحيات";
Expand Down Expand Up @@ -5691,9 +5683,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title of the CTA view for installing WCShip extension */
"Save time and money" = "توفير الوقت والمال";

/* Message text in the shipping label creation info screen */
"Save time and money by fulfilling with WooCommerce Shipping" = "ادخر الوقت والمال عن طريق الالتزام بالشحن عبر WooCommerce";

/* Title of the in-progress UI while saving a Product as draft remotely */
"Saving your product..." = "جارٍ حفظ منتجك...";

Expand Down Expand Up @@ -6497,9 +6486,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* The accessibility hint for the quantity button when selecting an item to refund */
"Tap to modify the item refund quantity" = "اضغط لتعديل كمية استرداد العنصر";

/* VoiceOver accessibility hint for the row that shows information about creating a shipping label */
"Tap to show information about creating a shipping label" = "اضغط لعرض معلومات حول إنشاء ملصق الشحن";

/* VoiceOver accessibility hint for the row that shows instructions on how to print a shipping label on the mobile device */
"Tap to show instructions on how to print a shipping label on the mobile device" = "اضغط لعرض الإرشادات حول كيفية طباعة تسمية الشحن على جهازك المحمول";

Expand Down Expand Up @@ -7958,9 +7944,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title for the WooCommerce Setup screen in the login flow */
"WooCommerce Setup" = "إعداد WooCommerce";

/* Navigation bar title in the shipping label creation info screen */
"WooCommerce Shipping" = "الشحن عبر WooCommerce";

/* Instructions for hazardous package shipping. The %1$@ is a tappable linkthat will direct the user to a website */
"WooCommerce Shipping does not currently support HAZMAT shipments through %1$@." = "لا يدعم WooCommerce Shipping حاليًا عمليات شحن الموارد الخطيرة من خلال %1$@.";

Expand Down Expand Up @@ -10718,12 +10701,6 @@ which should be translated separately and considered part of this sentence. */
/* Singular item count for a shipment. Reads like: 1 item */
"orderDetailsShipmentDetailsView.itemCountSingular" = "⁦%1$d⁩ من العناصر";

/* Button to print the customs form for a purchased shipping label. */
"orderDetailsShipmentDetailsView.printCustomsForm" = "طباعة نموذج الجمارك";

/* Button to print a shipping label for a shipment. Placeholder is the shipment index. Reads like: Print Shipping Label (1/2) */
"orderDetailsShipmentDetailsView.printShippingLabel" = "طباعة ملصق الشحن (%1$@)";

/* Message for a refunded shipping label. */
"orderDetailsShipmentDetailsView.refundMessage" = "أرسلتَ طلب استرداد الأموال بنجاح. يمكنك شراء ملصق جديد.";

Expand Down Expand Up @@ -11267,9 +11244,6 @@ which should be translated separately and considered part of this sentence. */
/* A message shown on the coupon if's not valid after attempting to apply it */
"pointOfSale.couponRow.invalidCoupon" = "لم يتم تطبيق القسيمة";

/* The title of the menu button to view barcode scanner documentation, shown in a popover menu. */
"pointOfSale.floatingButtons.barcodeScanning.button.title" = "مسح الرمز الشريطي";

/* The title of the menu button to start a barcode scanner setup flow. */
"pointOfSale.floatingButtons.barcodeScanningSetup.button.title" = "إعداد الماسح الضوئي للرمز الشريطي";

Expand All @@ -11285,6 +11259,9 @@ which should be translated separately and considered part of this sentence. */
/* The title of the menu button to get support for Point of Sale, shown in a popover menu. */
"pointOfSale.floatingButtons.getSupport.button.title" = "الحصول على الدعم";

/* The title of the menu button to access Point of Sale historical orders, shown in a fullscreen view. */
"pointOfSale.floatingButtons.orders.button.title" = "الطلبات";

/* The title of the menu button to view product restrictions info, shown in a popover menu. We only show simple and variable products in POS, this shows a modal to help explain that limitation. */
"pointOfSale.floatingButtons.productRestrictionsInfo.button.title" = "أين منتجاتي؟";

Expand All @@ -11297,6 +11274,9 @@ which should be translated separately and considered part of this sentence. */
/* The title of the floating button to indicate that reader is in the process of disconnecting. */
"pointOfSale.floatingButtons.readerDisconnecting.title" = "فصل الربط";

/* The title of the menu button to access Point of Sale settings. */
"pointOfSale.floatingButtons.settings.button.title" = "الإعدادات";

/* The title of the menu button to read Point of Sale documentation, shown in a popover menu. */
"pointOfSale.floatingButtons.viewDocumentation.button.title" = "الوثائق";

Expand Down
38 changes: 9 additions & 29 deletions WooCommerce/Resources/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2025-08-19 16:02:36+0000 */
/* Translation-Revision-Date: 2025-08-26 11:54:04+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/2.4.0-alpha */
/* Language: de */
Expand Down Expand Up @@ -1757,8 +1757,7 @@ which should be translated separately and considered part of this sentence. */
"Create Coupon" = "Gutschein erstellen";

/* Create Shipping Label form navigation title
Option to create new shipping label from the action sheet on Products section of Order Details screen
Text on the button that starts shipping label creation */
Option to create new shipping label from the action sheet on Products section of Order Details screen */
"Create Shipping Label" = "Versandetikett erstellen";

/* Button displayed on the prologue screen of the simplified login flow to create a new store */
Expand Down Expand Up @@ -1927,9 +1926,6 @@ which should be translated separately and considered part of this sentence. */
/* Main message on the Print Customs Invoice screen of Shipping Label flow for multiple invoices */
"Customs forms must be printed and included on these international shipments" = "Für diese internationalen Lieferungen müssen Zollformulare gedruckt und beigelegt werden";

/* Details text in the shipping label creation info screen */
"Cut the post office line by printing shipping labels at home with your mobile device at discounted rates!" = "Kein Schlange stehen mehr bei der Post! Drucke Versandetiketten zu reduzierten Preisen zu Hause über dein Mobilgerät aus.";

/* Country option for a site address. */
"Cyprus" = "Zypern";

Expand Down Expand Up @@ -3578,8 +3574,7 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Instructions for hazardous package shipping. The %1$@ is a tappable linkthat will direct the user to a website */
"Learn how to securely package, label, and ship HAZMAT through USPS® at %1$@." = "Unter %1$@ erfährst du, wie du mit USPS® Gefahrgut sicher verpackst, kennzeichnest und versendest.";

/* Button title in the shipping label creation info screen
Button to open the legal page for AI-generated contents on the product sharing message generation screen
/* Button to open the legal page for AI-generated contents on the product sharing message generation screen
Label for the banner Learn more button
Tappable text at the bottom of store onboarding payments setup screen that opens a webview.
Title for the link to open the legal URL for AI-generated content in the product detail screen
Expand All @@ -3601,9 +3596,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* A button to view more about hardware card readers to handle transactions above the contactless limit, shown on the About Tap to Pay screen */
"Learn more about card readers" = "Weitere Informationen zu Kartenlesegeräten";

/* Title of button in order details > info link for creating a shipping label on the mobile device. */
"Learn more about creating labels with your mobile device" = "Weitere Informationen zum Erstellen von Etiketten mit deinem Mobilgerät";

/* Link on the error modal when a user without admin role tries to install Jetpack
Link that points the user to learn more about roles. Clicking will open a web page.Presented when the user has tries to switch to a store with incorrect permissions. */
"Learn more about roles and permissions" = "Weitere Informationen zu Rollen und Berechtigungen";
Expand Down Expand Up @@ -5691,9 +5683,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title of the CTA view for installing WCShip extension */
"Save time and money" = "Spare Zeit und Geld";

/* Message text in the shipping label creation info screen */
"Save time and money by fulfilling with WooCommerce Shipping" = "Spare durch die Ausführung mit WooCommerce Shipping Zeit und Geld";

/* Title of the in-progress UI while saving a Product as draft remotely */
"Saving your product..." = "Dein Produkt wird gespeichert …";

Expand Down Expand Up @@ -6497,9 +6486,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* The accessibility hint for the quantity button when selecting an item to refund */
"Tap to modify the item refund quantity" = "Hier tippen, um die Rückerstattungsmenge für Artikel zu ändern";

/* VoiceOver accessibility hint for the row that shows information about creating a shipping label */
"Tap to show information about creating a shipping label" = "Tippen, um Informationen zum Erstellen von Versandetiketten anzuzeigen";

/* VoiceOver accessibility hint for the row that shows instructions on how to print a shipping label on the mobile device */
"Tap to show instructions on how to print a shipping label on the mobile device" = "Hier tippen, um Anweisungen zum Ausdrucken eines Versandetiketts auf dem Mobiltelefon anzuzeigen";

Expand Down Expand Up @@ -7958,9 +7944,6 @@ If your translation of that term also happens to contains a hyphen, please be su
/* Title for the WooCommerce Setup screen in the login flow */
"WooCommerce Setup" = "WooCommerce-Einrichtung";

/* Navigation bar title in the shipping label creation info screen */
"WooCommerce Shipping" = "WooCommerce Versand";

/* Instructions for hazardous package shipping. The %1$@ is a tappable linkthat will direct the user to a website */
"WooCommerce Shipping does not currently support HAZMAT shipments through %1$@." = "Mit WooCommerce Shipping ist derzeit kein Gefahrgutversand über %1$@ möglich.";

Expand Down Expand Up @@ -10727,12 +10710,6 @@ which should be translated separately and considered part of this sentence. */
/* Singular item count for a shipment. Reads like: 1 item */
"orderDetailsShipmentDetailsView.itemCountSingular" = "%1$d Artikel";

/* Button to print the customs form for a purchased shipping label. */
"orderDetailsShipmentDetailsView.printCustomsForm" = "Zollformular drucken";

/* Button to print a shipping label for a shipment. Placeholder is the shipment index. Reads like: Print Shipping Label (1/2) */
"orderDetailsShipmentDetailsView.printShippingLabel" = "Versandetikett drucken (%1$@)";

/* Message for a refunded shipping label. */
"orderDetailsShipmentDetailsView.refundMessage" = "Du hast erfolgreich einen Antrag auf Rückerstattung gestellt. Du kannst ein neues Etikett kaufen.";

Expand Down Expand Up @@ -11276,9 +11253,6 @@ which should be translated separately and considered part of this sentence. */
/* A message shown on the coupon if's not valid after attempting to apply it */
"pointOfSale.couponRow.invalidCoupon" = "Gutschein nicht angewendet";

/* The title of the menu button to view barcode scanner documentation, shown in a popover menu. */
"pointOfSale.floatingButtons.barcodeScanning.button.title" = "Barcode-Scans";

/* The title of the menu button to start a barcode scanner setup flow. */
"pointOfSale.floatingButtons.barcodeScanningSetup.button.title" = "Ersteinrichtung des Barcode-Scanners";

Expand All @@ -11294,6 +11268,9 @@ which should be translated separately and considered part of this sentence. */
/* The title of the menu button to get support for Point of Sale, shown in a popover menu. */
"pointOfSale.floatingButtons.getSupport.button.title" = "Support erhalten";

/* The title of the menu button to access Point of Sale historical orders, shown in a fullscreen view. */
"pointOfSale.floatingButtons.orders.button.title" = "Bestellungen";

/* The title of the menu button to view product restrictions info, shown in a popover menu. We only show simple and variable products in POS, this shows a modal to help explain that limitation. */
"pointOfSale.floatingButtons.productRestrictionsInfo.button.title" = "Wo sind meine Produkte?";

Expand All @@ -11306,6 +11283,9 @@ which should be translated separately and considered part of this sentence. */
/* The title of the floating button to indicate that reader is in the process of disconnecting. */
"pointOfSale.floatingButtons.readerDisconnecting.title" = "Verbindung wird getrennt";

/* The title of the menu button to access Point of Sale settings. */
"pointOfSale.floatingButtons.settings.button.title" = "Einstellungen";

/* The title of the menu button to read Point of Sale documentation, shown in a popover menu. */
"pointOfSale.floatingButtons.viewDocumentation.button.title" = "Dokumentation";

Expand Down
Loading
Loading