Merge branch 'main' into settings-UI

MdSaifAliMolla · web-flow · commit 1136df748aa9 · 2025-11-05T15:27:30.000+05:30
diff --git a/assets/l10n/app_en.arb b/assets/l10n/app_en.arb
@@ -806,9 +806,15 @@
   "@loginErrorMissingUsername": {
     "description": "Error message when an empty username was provided."
   },
-  "topicValidationErrorTooLong": "Topic length shouldn't be greater than 60 characters.",
+  "topicValidationErrorTooLong": "Topic length shouldn't be greater than {maxLength, plural, =1{1 character} other{{maxLength} characters}}.",
   "@topicValidationErrorTooLong": {
-    "description": "Topic validation error when topic is too long."
+    "description": "Topic validation error when topic is too long.",
+    "placeholders": {
+      "maxLength": {
+        "type": "int",
+        "example": "60"
+      }
+    }
   },
   "topicValidationErrorMandatoryButEmpty": "Topics are required in this organization.",
   "@topicValidationErrorMandatoryButEmpty": {
diff --git a/lib/api/model/initial_snapshot.dart b/lib/api/model/initial_snapshot.dart
@@ -24,6 +24,8 @@ class InitialSnapshot {
 
   final List<CustomProfileField> customProfileFields;
 
+  final int maxTopicLength;
+
   final int serverPresencePingIntervalSeconds;
   final int serverPresenceOfflineThresholdSeconds;
 
@@ -158,6 +160,7 @@ class InitialSnapshot {
     required this.zulipMergeBase,
     required this.alertWords,
     required this.customProfileFields,
+    required this.maxTopicLength,
     required this.serverPresencePingIntervalSeconds,
     required this.serverPresenceOfflineThresholdSeconds,
     required this.serverTypingStartedExpiryPeriodMilliseconds,
diff --git a/lib/api/model/initial_snapshot.g.dart b/lib/api/model/initial_snapshot.g.dart
diff --git a/lib/api/route/messages.dart b/lib/api/route/messages.dart
@@ -121,9 +121,6 @@ class GetMessagesResult {
   Map<String, dynamic> toJson() => _$GetMessagesResultToJson(this);
 }
 
-// https://zulip.com/api/send-message#parameter-topic
-const int kMaxTopicLengthCodePoints = 60;
-
 // https://zulip.com/api/send-message#parameter-content
 const int kMaxMessageLengthCodePoints = 10000;
 
diff --git a/lib/generated/l10n/zulip_localizations.dart b/lib/generated/l10n/zulip_localizations.dart
@@ -1242,8 +1242,8 @@ abstract class ZulipLocalizations {
   /// Topic validation error when topic is too long.
   ///
   /// In en, this message translates to:
-  /// **'Topic length shouldn\'t be greater than 60 characters.'**
-  String get topicValidationErrorTooLong;
+  /// **'Topic length shouldn\'t be greater than {maxLength, plural, =1{1 character} other{{maxLength} characters}}.'**
+  String topicValidationErrorTooLong(int maxLength);
 
   /// Topic validation error when topic is required but was empty.
   ///
diff --git a/lib/generated/l10n/zulip_localizations_ar.dart b/lib/generated/l10n/zulip_localizations_ar.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_de.dart b/lib/generated/l10n/zulip_localizations_de.dart
@@ -680,8 +680,9 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Bitte gib deinen Benutzernamen ein.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Länge des Themas sollte 60 Zeichen nicht überschreiten.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'Länge des Themas sollte 60 Zeichen nicht überschreiten.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_el.dart b/lib/generated/l10n/zulip_localizations_el.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsEl extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_en.dart b/lib/generated/l10n/zulip_localizations_en.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_es.dart b/lib/generated/l10n/zulip_localizations_es.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsEs extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_fr.dart b/lib/generated/l10n/zulip_localizations_fr.dart
@@ -677,8 +677,15 @@ class ZulipLocalizationsFr extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_he.dart b/lib/generated/l10n/zulip_localizations_he.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsHe extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_hu.dart b/lib/generated/l10n/zulip_localizations_hu.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsHu extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_it.dart b/lib/generated/l10n/zulip_localizations_it.dart
@@ -674,8 +674,9 @@ class ZulipLocalizationsIt extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Inserire il proprio nomeutente.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'La lunghezza dell\'argomento non deve superare i 60 caratteri.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'La lunghezza dell\'argomento non deve superare i 60 caratteri.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_ja.dart b/lib/generated/l10n/zulip_localizations_ja.dart
@@ -647,7 +647,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'ユーザー名を入力してください。';
 
   @override
-  String get topicValidationErrorTooLong => 'トピックは60文字以内で入力してください。';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'トピックは60文字以内で入力してください。';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty => 'この組織ではトピックの入力が必須です。';
diff --git a/lib/generated/l10n/zulip_localizations_nb.dart b/lib/generated/l10n/zulip_localizations_nb.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_pl.dart b/lib/generated/l10n/zulip_localizations_pl.dart
@@ -674,8 +674,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Proszę podaj nazwę użytkownika.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Tytuł nie może być dłuższy niż 60 znaków.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'Tytuł nie może być dłuższy niż 60 znaków.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_ru.dart b/lib/generated/l10n/zulip_localizations_ru.dart
@@ -677,8 +677,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
       'Пожалуйста, введите ваше имя пользователя.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Длина темы не должна превышать 60 символов.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'Длина темы не должна превышать 60 символов.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_sk.dart b/lib/generated/l10n/zulip_localizations_sk.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsSk extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Prosím zadajte prihlasovacie meno.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_sl.dart b/lib/generated/l10n/zulip_localizations_sl.dart
@@ -686,8 +686,9 @@ class ZulipLocalizationsSl extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Vnesite svoje uporabniško ime.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Dolžina teme ne sme presegati 60 znakov.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'Dolžina teme ne sme presegati 60 znakov.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_uk.dart b/lib/generated/l10n/zulip_localizations_uk.dart
@@ -676,8 +676,9 @@ class ZulipLocalizationsUk extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Введіть своє ім\'я користувача.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Довжина теми не повинна перевищувати 60 символів.';
+  String topicValidationErrorTooLong(int maxLength) {
+    return 'Довжина теми не повинна перевищувати 60 символів.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
diff --git a/lib/generated/l10n/zulip_localizations_zh.dart b/lib/generated/l10n/zulip_localizations_zh.dart
@@ -661,8 +661,15 @@ class ZulipLocalizationsZh extends ZulipLocalizations {
   String get loginErrorMissingUsername => 'Please enter your username.';
 
   @override
-  String get topicValidationErrorTooLong =>
-      'Topic length shouldn\'t be greater than 60 characters.';
+  String topicValidationErrorTooLong(int maxLength) {
+    String _temp0 = intl.Intl.pluralLogic(
+      maxLength,
+      locale: localeName,
+      other: '$maxLength characters',
+      one: '1 character',
+    );
+    return 'Topic length shouldn\'t be greater than $_temp0.';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty =>
@@ -1787,7 +1794,9 @@ class ZulipLocalizationsZhHansCn extends ZulipLocalizationsZh {
   String get loginErrorMissingUsername => '请输入用户名。';
 
   @override
-  String get topicValidationErrorTooLong => '话题长度不应该超过 60 个字符。';
+  String topicValidationErrorTooLong(int maxLength) {
+    return '话题长度不应该超过 60 个字符。';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty => '话题在该组织为必填项。';
@@ -2891,7 +2900,9 @@ class ZulipLocalizationsZhHantTw extends ZulipLocalizationsZh {
   String get loginErrorMissingUsername => '請輸入您的使用者名稱。';
 
   @override
-  String get topicValidationErrorTooLong => '議題長度不得超過 60 個字元。';
+  String topicValidationErrorTooLong(int maxLength) {
+    return '議題長度不得超過 60 個字元。';
+  }
 
   @override
   String get topicValidationErrorMandatoryButEmpty => '此組織要求必須填寫議題。';
diff --git a/lib/model/realm.dart b/lib/model/realm.dart
@@ -76,6 +76,8 @@ mixin RealmStore on PerAccountStoreBase, UserGroupStore {
 
   Map<String, RealmDefaultExternalAccount> get realmDefaultExternalAccounts;
 
+  int get maxTopicLength;
+
   //|//////////////////////////////
   // Realm settings with their own events.
 
@@ -192,6 +194,8 @@ mixin ProxyRealmStore on RealmStore {
   @override
   Map<String, RealmDefaultExternalAccount> get realmDefaultExternalAccounts => realmStore.realmDefaultExternalAccounts;
   @override
+  int get maxTopicLength => realmStore.maxTopicLength;
+  @override
   List<CustomProfileField> get customProfileFields => realmStore.customProfileFields;
   @override
   bool selfHasPassedWaitingPeriod({required DateTime byDate}) =>
@@ -240,6 +244,7 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {
     realmDeleteOwnMessagePolicy = initialSnapshot.realmDeleteOwnMessagePolicy,
     _realmEmptyTopicDisplayName = initialSnapshot.realmEmptyTopicDisplayName,
     realmDefaultExternalAccounts = initialSnapshot.realmDefaultExternalAccounts,
+    maxTopicLength = initialSnapshot.maxTopicLength,
     customProfileFields = _sortCustomProfileFields(initialSnapshot.customProfileFields);
 
   @override
@@ -406,6 +411,9 @@ class RealmStoreImpl extends HasUserGroupStore with RealmStore {
   @override
   final Map<String, RealmDefaultExternalAccount> realmDefaultExternalAccounts;
 
+  @override
+  final int maxTopicLength;
+
   @override
   List<CustomProfileField> customProfileFields;
 
diff --git a/lib/widgets/compose_box.dart b/lib/widgets/compose_box.dart
diff --git a/test/example_data.dart b/test/example_data.dart
diff --git a/test/widgets/compose_box_test.dart b/test/widgets/compose_box_test.dart
diff --git a/test/widgets/settings_test.dart b/test/widgets/settings_test.dart

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,6 @@ class GetMessagesResult {`
`121`	`121`	`Map<String, dynamic> toJson() => _$GetMessagesResultToJson(this);`
`122`	`122`	`}`
`123`	`123`
`124`		`-// https://zulip.com/api/send-message#parameter-topic`
`125`		`-const int kMaxTopicLengthCodePoints = 60;`
`126`		`-`
`127`	`124`	`// https://zulip.com/api/send-message#parameter-content`
`128`	`125`	`const int kMaxMessageLengthCodePoints = 10000;`
`129`	`126`