Skip to content

Commit 7dfad7c

Browse files
gnpricechrisbobbe
authored andcommitted
deps: Upgrade Flutter to 3.32.0-1.0.pre.332
And update Flutter's supporting libraries to match. In particular this pulls in this recent PR of mine so we can use it: flutter/flutter#166731 This also causes all the generated l10n files to get reformatted. That's due to this upstream PR: flutter/flutter#167029
1 parent 37dc9ea commit 7dfad7c

11 files changed

+569
-247
lines changed

lib/generated/l10n/zulip_localizations.dart

Lines changed: 59 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,17 @@ import 'zulip_localizations_uk.dart';
6868
/// be consistent with the languages listed in the ZulipLocalizations.supportedLocales
6969
/// property.
7070
abstract class ZulipLocalizations {
71-
ZulipLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
71+
ZulipLocalizations(String locale)
72+
: localeName = intl.Intl.canonicalizedLocale(locale.toString());
7273

7374
final String localeName;
7475

7576
static ZulipLocalizations of(BuildContext context) {
7677
return Localizations.of<ZulipLocalizations>(context, ZulipLocalizations)!;
7778
}
7879

79-
static const LocalizationsDelegate<ZulipLocalizations> delegate = _ZulipLocalizationsDelegate();
80+
static const LocalizationsDelegate<ZulipLocalizations> delegate =
81+
_ZulipLocalizationsDelegate();
8082

8183
/// A list of this localizations delegate along with the default localizations
8284
/// delegates.
@@ -88,12 +90,13 @@ abstract class ZulipLocalizations {
8890
/// Additional delegates can be added by appending to this list in
8991
/// MaterialApp. This list does not have to be used at all if a custom list
9092
/// of delegates is preferred or required.
91-
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
92-
delegate,
93-
GlobalMaterialLocalizations.delegate,
94-
GlobalCupertinoLocalizations.delegate,
95-
GlobalWidgetsLocalizations.delegate,
96-
];
93+
static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
94+
<LocalizationsDelegate<dynamic>>[
95+
delegate,
96+
GlobalMaterialLocalizations.delegate,
97+
GlobalCupertinoLocalizations.delegate,
98+
GlobalWidgetsLocalizations.delegate,
99+
];
97100

98101
/// A list of this localizations delegate's supported locales.
99102
static const List<Locale> supportedLocales = <Locale>[
@@ -104,7 +107,7 @@ abstract class ZulipLocalizations {
104107
Locale('pl'),
105108
Locale('ru'),
106109
Locale('sk'),
107-
Locale('uk')
110+
Locale('uk'),
108111
];
109112

110113
/// Title for About Zulip page.
@@ -381,7 +384,11 @@ abstract class ZulipLocalizations {
381384
///
382385
/// In en, this message translates to:
383386
/// **'{num, plural, =1{File is} other{{num} files are}} larger than the server\'s limit of {maxFileUploadSizeMib} MiB and will not be uploaded:\n\n{listMessage}'**
384-
String errorFilesTooLarge(int num, int maxFileUploadSizeMib, String listMessage);
387+
String errorFilesTooLarge(
388+
int num,
389+
int maxFileUploadSizeMib,
390+
String listMessage,
391+
);
385392

386393
/// Error title when attached files are too large in size.
387394
///
@@ -459,7 +466,11 @@ abstract class ZulipLocalizations {
459466
///
460467
/// In en, this message translates to:
461468
/// **'Error handling a Zulip event from {serverUrl}; will retry.\n\nError: {error}\n\nEvent: {event}'**
462-
String errorHandlingEventDetails(String serverUrl, String error, String event);
469+
String errorHandlingEventDetails(
470+
String serverUrl,
471+
String error,
472+
String event,
473+
);
463474

464475
/// Error title when opening a link failed.
465476
///
@@ -831,7 +842,11 @@ abstract class ZulipLocalizations {
831842
///
832843
/// In en, this message translates to:
833844
/// **'{url} is running Zulip Server {zulipVersion}, which is unsupported. The minimum supported version is Zulip Server {minSupportedZulipVersion}.'**
834-
String errorServerVersionUnsupportedMessage(String url, String zulipVersion, String minSupportedZulipVersion);
845+
String errorServerVersionUnsupportedMessage(
846+
String url,
847+
String zulipVersion,
848+
String minSupportedZulipVersion,
849+
);
835850

836851
/// Error message in the dialog for invalid API key.
837852
///
@@ -1290,40 +1305,58 @@ abstract class ZulipLocalizations {
12901305
String get zulipAppTitle;
12911306
}
12921307

1293-
class _ZulipLocalizationsDelegate extends LocalizationsDelegate<ZulipLocalizations> {
1308+
class _ZulipLocalizationsDelegate
1309+
extends LocalizationsDelegate<ZulipLocalizations> {
12941310
const _ZulipLocalizationsDelegate();
12951311

12961312
@override
12971313
Future<ZulipLocalizations> load(Locale locale) {
1298-
return SynchronousFuture<ZulipLocalizations>(lookupZulipLocalizations(locale));
1314+
return SynchronousFuture<ZulipLocalizations>(
1315+
lookupZulipLocalizations(locale),
1316+
);
12991317
}
13001318

13011319
@override
1302-
bool isSupported(Locale locale) => <String>['ar', 'en', 'ja', 'nb', 'pl', 'ru', 'sk', 'uk'].contains(locale.languageCode);
1320+
bool isSupported(Locale locale) => <String>[
1321+
'ar',
1322+
'en',
1323+
'ja',
1324+
'nb',
1325+
'pl',
1326+
'ru',
1327+
'sk',
1328+
'uk',
1329+
].contains(locale.languageCode);
13031330

13041331
@override
13051332
bool shouldReload(_ZulipLocalizationsDelegate old) => false;
13061333
}
13071334

13081335
ZulipLocalizations lookupZulipLocalizations(Locale locale) {
1309-
1310-
13111336
// Lookup logic when only language code is specified.
13121337
switch (locale.languageCode) {
1313-
case 'ar': return ZulipLocalizationsAr();
1314-
case 'en': return ZulipLocalizationsEn();
1315-
case 'ja': return ZulipLocalizationsJa();
1316-
case 'nb': return ZulipLocalizationsNb();
1317-
case 'pl': return ZulipLocalizationsPl();
1318-
case 'ru': return ZulipLocalizationsRu();
1319-
case 'sk': return ZulipLocalizationsSk();
1320-
case 'uk': return ZulipLocalizationsUk();
1338+
case 'ar':
1339+
return ZulipLocalizationsAr();
1340+
case 'en':
1341+
return ZulipLocalizationsEn();
1342+
case 'ja':
1343+
return ZulipLocalizationsJa();
1344+
case 'nb':
1345+
return ZulipLocalizationsNb();
1346+
case 'pl':
1347+
return ZulipLocalizationsPl();
1348+
case 'ru':
1349+
return ZulipLocalizationsRu();
1350+
case 'sk':
1351+
return ZulipLocalizationsSk();
1352+
case 'uk':
1353+
return ZulipLocalizationsUk();
13211354
}
13221355

13231356
throw FlutterError(
13241357
'ZulipLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
13251358
'an issue with the localizations generation tool. Please file an issue '
13261359
'on GitHub with a reproducible sample app and the gen-l10n configuration '
1327-
'that was used.'
1360+
'that was used.',
13281361
);
13291362
}

lib/generated/l10n/zulip_localizations_ar.dart

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
4444
String get logOutConfirmationDialogTitle => 'Log out?';
4545

4646
@override
47-
String get logOutConfirmationDialogMessage => 'To use this account in the future, you will have to re-enter the URL for your organization and your account information.';
47+
String get logOutConfirmationDialogMessage =>
48+
'To use this account in the future, you will have to re-enter the URL for your organization and your account information.';
4849

4950
@override
5051
String get logOutConfirmationDialogConfirmButton => 'Log out';
@@ -65,10 +66,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
6566
String get permissionsNeededOpenSettings => 'Open settings';
6667

6768
@override
68-
String get permissionsDeniedCameraAccess => 'To upload an image, please grant Zulip additional permissions in Settings.';
69+
String get permissionsDeniedCameraAccess =>
70+
'To upload an image, please grant Zulip additional permissions in Settings.';
6971

7072
@override
71-
String get permissionsDeniedReadExternalStorage => 'To upload files, please grant Zulip additional permissions in Settings.';
73+
String get permissionsDeniedReadExternalStorage =>
74+
'To upload files, please grant Zulip additional permissions in Settings.';
7275

7376
@override
7477
String get actionSheetOptionMarkChannelAsRead => 'Mark channel as read';
@@ -95,7 +98,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
9598
String get errorResolveTopicFailedTitle => 'Failed to mark topic as resolved';
9699

97100
@override
98-
String get errorUnresolveTopicFailedTitle => 'Failed to mark topic as unresolved';
101+
String get errorUnresolveTopicFailedTitle =>
102+
'Failed to mark topic as unresolved';
99103

100104
@override
101105
String get actionSheetOptionCopyMessageText => 'Copy message text';
@@ -136,7 +140,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
136140
}
137141

138142
@override
139-
String get errorCouldNotFetchMessageSource => 'Could not fetch message source';
143+
String get errorCouldNotFetchMessageSource =>
144+
'Could not fetch message source';
140145

141146
@override
142147
String get errorCopyingFailed => 'Copying failed';
@@ -152,7 +157,11 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
152157
}
153158

154159
@override
155-
String errorFilesTooLarge(int num, int maxFileUploadSizeMib, String listMessage) {
160+
String errorFilesTooLarge(
161+
int num,
162+
int maxFileUploadSizeMib,
163+
String listMessage,
164+
) {
156165
String _temp0 = intl.Intl.pluralLogic(
157166
num,
158167
locale: localeName,
@@ -191,7 +200,8 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
191200
String get errorCouldNotConnectTitle => 'Could not connect';
192201

193202
@override
194-
String get errorMessageDoesNotSeemToExist => 'That message does not seem to exist.';
203+
String get errorMessageDoesNotSeemToExist =>
204+
'That message does not seem to exist.';
195205

196206
@override
197207
String get errorQuotationFailed => 'Quotation failed';
@@ -202,18 +212,24 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
202212
}
203213

204214
@override
205-
String get errorConnectingToServerShort => 'Error connecting to Zulip. Retrying…';
215+
String get errorConnectingToServerShort =>
216+
'Error connecting to Zulip. Retrying…';
206217

207218
@override
208219
String errorConnectingToServerDetails(String serverUrl, String error) {
209220
return 'Error connecting to Zulip at $serverUrl. Will retry:\n\n$error';
210221
}
211222

212223
@override
213-
String get errorHandlingEventTitle => 'Error handling a Zulip event. Retrying connection…';
224+
String get errorHandlingEventTitle =>
225+
'Error handling a Zulip event. Retrying connection…';
214226

215227
@override
216-
String errorHandlingEventDetails(String serverUrl, String error, String event) {
228+
String errorHandlingEventDetails(
229+
String serverUrl,
230+
String error,
231+
String event,
232+
) {
217233
return 'Error handling a Zulip event from $serverUrl; will retry.\n\nError: $error\n\nEvent: $event';
218234
}
219235

@@ -256,10 +272,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
256272
String get successMessageLinkCopied => 'Message link copied';
257273

258274
@override
259-
String get errorBannerDeactivatedDmLabel => 'You cannot send messages to deactivated users.';
275+
String get errorBannerDeactivatedDmLabel =>
276+
'You cannot send messages to deactivated users.';
260277

261278
@override
262-
String get errorBannerCannotPostInChannelLabel => 'You do not have permission to post in this channel.';
279+
String get errorBannerCannotPostInChannelLabel =>
280+
'You do not have permission to post in this channel.';
263281

264282
@override
265283
String get composeBoxAttachFilesTooltip => 'Attach files';
@@ -328,16 +346,19 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
328346
String get messageListGroupYouWithYourself => 'Messages with yourself';
329347

330348
@override
331-
String get contentValidationErrorTooLong => 'Message length shouldn\'t be greater than 10000 characters.';
349+
String get contentValidationErrorTooLong =>
350+
'Message length shouldn\'t be greater than 10000 characters.';
332351

333352
@override
334353
String get contentValidationErrorEmpty => 'You have nothing to send!';
335354

336355
@override
337-
String get contentValidationErrorQuoteAndReplyInProgress => 'Please wait for the quotation to complete.';
356+
String get contentValidationErrorQuoteAndReplyInProgress =>
357+
'Please wait for the quotation to complete.';
338358

339359
@override
340-
String get contentValidationErrorUploadInProgress => 'Please wait for the upload to complete.';
360+
String get contentValidationErrorUploadInProgress =>
361+
'Please wait for the upload to complete.';
341362

342363
@override
343364
String get dialogCancel => 'Cancel';
@@ -411,13 +432,19 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
411432
String get loginErrorMissingUsername => 'Please enter your username.';
412433

413434
@override
414-
String get topicValidationErrorTooLong => 'Topic length shouldn\'t be greater than 60 characters.';
435+
String get topicValidationErrorTooLong =>
436+
'Topic length shouldn\'t be greater than 60 characters.';
415437

416438
@override
417-
String get topicValidationErrorMandatoryButEmpty => 'Topics are required in this organization.';
439+
String get topicValidationErrorMandatoryButEmpty =>
440+
'Topics are required in this organization.';
418441

419442
@override
420-
String errorServerVersionUnsupportedMessage(String url, String zulipVersion, String minSupportedZulipVersion) {
443+
String errorServerVersionUnsupportedMessage(
444+
String url,
445+
String zulipVersion,
446+
String minSupportedZulipVersion,
447+
) {
421448
return '$url is running Zulip Server $zulipVersion, which is unsupported. The minimum supported version is Zulip Server $minSupportedZulipVersion.';
422449
}
423450

@@ -457,10 +484,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
457484
String get serverUrlValidationErrorInvalidUrl => 'Please enter a valid URL.';
458485

459486
@override
460-
String get serverUrlValidationErrorNoUseEmail => 'Please enter the server URL, not your email.';
487+
String get serverUrlValidationErrorNoUseEmail =>
488+
'Please enter the server URL, not your email.';
461489

462490
@override
463-
String get serverUrlValidationErrorUnsupportedScheme => 'The server URL must start with http:// or https://.';
491+
String get serverUrlValidationErrorUnsupportedScheme =>
492+
'The server URL must start with http:// or https://.';
464493

465494
@override
466495
String get spoilerDefaultHeaderText => 'Spoiler';
@@ -655,13 +684,15 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
655684
String get experimentalFeatureSettingsPageTitle => 'Experimental features';
656685

657686
@override
658-
String get experimentalFeatureSettingsWarning => 'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
687+
String get experimentalFeatureSettingsWarning =>
688+
'These options enable features which are still under development and not ready. They may not work, and may cause issues in other areas of the app.\n\nThe purpose of these settings is for experimentation by people working on developing Zulip.';
659689

660690
@override
661691
String get errorNotificationOpenTitle => 'Failed to open notification';
662692

663693
@override
664-
String get errorNotificationOpenAccountMissing => 'The account associated with this notification no longer exists.';
694+
String get errorNotificationOpenAccountMissing =>
695+
'The account associated with this notification no longer exists.';
665696

666697
@override
667698
String get errorReactionAddingFailedTitle => 'Adding reaction failed';

0 commit comments

Comments
 (0)