compose [nfc]: Update string to mention "edit" in name and description

PIG208 · chrisbobbe · commit 47680e91a507 · 2025-05-29T16:24:59.000-07:00
This migrates the Polish and Russian translations (the only existing
non-en locales to translate this) to use the new string as well.
diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb
@@ -377,9 +377,9 @@
   "@discardDraftConfirmationDialogTitle": {
     "description": "Title for a confirmation dialog for discarding message text that was typed into the compose box."
   },
-  "discardDraftConfirmationDialogMessage": "When you edit a message, the content that was previously in the compose box is discarded.",
-  "@discardDraftConfirmationDialogMessage": {
-    "description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
+  "discardDraftForEditConfirmationDialogMessage": "When you edit a message, the content that was previously in the compose box is discarded.",
+  "@discardDraftForEditConfirmationDialogMessage": {
+    "description": "Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message."
   },
   "discardDraftConfirmationDialogConfirmButton": "Discard",
   "@discardDraftConfirmationDialogConfirmButton": {
diff --git a/assets/l10n/app_pl.arb b/assets/l10n/app_pl.arb
@@ -1049,9 +1049,9 @@
   "@discardDraftConfirmationDialogTitle": {
     "description": "Title for a confirmation dialog for discarding message text that was typed into the compose box."
   },
-  "discardDraftConfirmationDialogMessage": "Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.",
-  "@discardDraftConfirmationDialogMessage": {
-    "description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
+  "discardDraftForEditConfirmationDialogMessage": "Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.",
+  "@discardDraftForEditConfirmationDialogMessage": {
+    "description": "Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message."
   },
   "discardDraftConfirmationDialogConfirmButton": "Odrzuć",
   "@discardDraftConfirmationDialogConfirmButton": {
diff --git a/assets/l10n/app_ru.arb b/assets/l10n/app_ru.arb
@@ -1069,8 +1069,8 @@
   "@editAlreadyInProgressMessage": {
     "description": "Error message when a message edit cannot be saved because there is another edit already in progress."
   },
-  "discardDraftConfirmationDialogMessage": "При изменении сообщения текст из поля для редактирования удаляется.",
-  "@discardDraftConfirmationDialogMessage": {
+  "discardDraftForEditConfirmationDialogMessage": "При изменении сообщения текст из поля для редактирования удаляется.",
+  "@discardDraftForEditConfirmationDialogMessage": {
     "description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
   }
 }
diff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart
@@ -643,11 +643,11 @@ abstract class ZulipLocalizations {
   /// **'Discard the message you’re writing?'**
   String get discardDraftConfirmationDialogTitle;
 
-  /// Message for a confirmation dialog for discarding message text that was typed into the compose box.
+  /// Message for a confirmation dialog for discarding message text that was typed into the compose box, when editing a message.
   ///
   /// In en, this message translates to:
   /// **'When you edit a message, the content that was previously in the compose box is discarded.'**
-  String get discardDraftConfirmationDialogMessage;
+  String get discardDraftForEditConfirmationDialogMessage;
 
   /// Label for the 'Discard' button on a confirmation dialog for discarding message text that was typed into the compose box.
   ///
diff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart
@@ -325,7 +325,7 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
       'Czy chcesz przerwać szykowanie wpisu?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'Miej na uwadze, że przechodząc do zmiany wiadomości wyczyścisz okno nowej wiadomości.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart
@@ -326,7 +326,7 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
       'Отказаться от написанного сообщения?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'При изменении сообщения текст из поля для редактирования удаляется.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart
@@ -327,7 +327,7 @@ class ZulipLocalizationsUk extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart
@@ -318,7 +318,7 @@ class ZulipLocalizationsZh extends ZulipLocalizations {
       'Discard the message you’re writing?';
 
   @override
-  String get discardDraftConfirmationDialogMessage =>
+  String get discardDraftForEditConfirmationDialogMessage =>
       'When you edit a message, the content that was previously in the compose box is discarded.';
 
   @override
diff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart
@@ -1852,7 +1852,7 @@ class _ComposeBoxState extends State<ComposeBox> with PerAccountStoreAwareStateM
     final zulipLocalizations = ZulipLocalizations.of(context);
 
     final abort = await _abortBecauseContentInputNotEmpty(
-      dialogMessage: zulipLocalizations.discardDraftConfirmationDialogMessage);
+      dialogMessage: zulipLocalizations.discardDraftForEditConfirmationDialogMessage);
     if (abort || !mounted) return;
 
     final store = PerAccountStoreWidget.of(context);
diff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart
@@ -1444,11 +1444,12 @@ void main() {
 
   Future<void> expectAndHandleDiscardConfirmation(
     WidgetTester tester, {
+    required String expectedMessage,
     required bool shouldContinue,
   }) async {
     final (actionButton, cancelButton) = checkSuggestedActionDialog(tester,
       expectedTitle: 'Discard the message you’re writing?',
-      expectedMessage: 'When you edit a message, the content that was previously in the compose box is discarded.',
+      expectedMessage: expectedMessage,
       expectedActionButtonText: 'Discard');
     if (shouldContinue) {
       await tester.tap(find.byWidget(actionButton));
@@ -1623,6 +1624,14 @@ void main() {
     testSmoke(narrow: topicNarrow,   start: _EditInteractionStart.restoreFailedEdit);
     testSmoke(narrow: dmNarrow,      start: _EditInteractionStart.restoreFailedEdit);
 
+    Future<void> expectAndHandleDiscardForEditConfirmation(WidgetTester tester, {
+      required bool shouldContinue,
+    }) {
+      return expectAndHandleDiscardConfirmation(tester,
+        expectedMessage: 'When you edit a message, the content that was previously in the compose box is discarded.',
+        shouldContinue: shouldContinue);
+    }
+
     // Test the "Discard…?" confirmation dialog when you tap "Edit message" in
     // the action sheet but there's text in the compose box for a new message.
     void testInterruptComposingFromActionSheet({required Narrow narrow}) {
@@ -1638,7 +1647,7 @@ void main() {
 
         // Expect confirmation dialog; tap Cancel
         await startEditInteractionFromActionSheet(tester, messageId: messageId);
-        await expectAndHandleDiscardConfirmation(tester, shouldContinue: false);
+        await expectAndHandleDiscardForEditConfirmation(tester, shouldContinue: false);
         check(connection.takeRequests()).isEmpty();
         // fetch-raw-content request wasn't actually sent;
         // take back its prepared response
@@ -1653,7 +1662,7 @@ void main() {
         // Try again, but this time tap Discard and expect to enter an edit session
         await startEditInteractionFromActionSheet(tester,
           messageId: messageId, originalRawContent: 'foo');
-        await expectAndHandleDiscardConfirmation(tester, shouldContinue: true);
+        await expectAndHandleDiscardForEditConfirmation(tester, shouldContinue: true);
         await tester.pump();
         await checkAwaitingRawMessageContent(tester);
         await tester.pump(Duration(seconds: 1)); // fetch-raw-content request
@@ -1702,7 +1711,7 @@ void main() {
         // Expect confirmation dialog; tap Cancel
         await tester.tap(find.text('EDIT NOT SAVED'));
         await tester.pump();
-        await expectAndHandleDiscardConfirmation(tester, shouldContinue: false);
+        await expectAndHandleDiscardForEditConfirmation(tester, shouldContinue: false);
         checkNotInEditingMode(tester,
           narrow: narrow, expectedContentText: 'composing new message');
 
@@ -1712,7 +1721,7 @@ void main() {
         // Try again, but this time tap Discard and expect to enter edit session
         await tester.tap(find.text('EDIT NOT SAVED'));
         await tester.pump();
-        await expectAndHandleDiscardConfirmation(tester, shouldContinue: true);
+        await expectAndHandleDiscardForEditConfirmation(tester, shouldContinue: true);
         await tester.pump();
         checkContentInputValue(tester, 'bar');
         await enterContent(tester, 'baz');

Original file line number	Diff line number	Diff line change
`@@ -1069,8 +1069,8 @@`
`1069`	`1069`	`"@editAlreadyInProgressMessage": {`
`1070`	`1070`	`"description": "Error message when a message edit cannot be saved because there is another edit already in progress."`
`1071`	`1071`	`},`
`1072`		`- "discardDraftConfirmationDialogMessage": "При изменении сообщения текст из поля для редактирования удаляется.",`
`1073`		`- "@discardDraftConfirmationDialogMessage": {`
	`1072`	`+ "discardDraftForEditConfirmationDialogMessage": "При изменении сообщения текст из поля для редактирования удаляется.",`
	`1073`	`+ "@discardDraftForEditConfirmationDialogMessage": {`
`1074`	`1074`	`"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."`
`1075`	`1075`	`}`
`1076`	`1076`	`}`