Skip to content

Commit b162192

Browse files
chrisbobbechrisbobbe
committed
NOMERGE code [nfc]: s/localizations/zulipLocalizations/g
There are other localization classes, like MaterialLocalizations, and in any case it seems right to have a consistent naming pattern.
1 parent 1e560d6 commit b162192

File tree

8 files changed

+46
-46
lines changed

8 files changed

+46
-46
lines changed

‎lib/model/store.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,10 +1444,10 @@ class UpdateMachine {
14441444
}
14451445

14461446
void _reportToUserErrorConnectingToServer(Object error) {
1447-
final localizations = GlobalLocalizations.zulipLocalizations;
1447+
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
14481448
reportErrorToUserBriefly(
1449-
localizations.errorConnectingToServerShort,
1450-
details: localizations.errorConnectingToServerDetails(
1449+
zulipLocalizations.errorConnectingToServerShort,
1450+
details: zulipLocalizations.errorConnectingToServerDetails(
14511451
store.realmUrl.toString(), error.toString()));
14521452
}
14531453

‎lib/widgets/action_sheet.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,11 @@ class CopyChannelLinkButton extends ActionSheetMenuItemButton {
471471

472472
@override
473473
void onPressed() async {
474-
final localizations = ZulipLocalizations.of(pageContext);
474+
final zulipLocalizations = ZulipLocalizations.of(pageContext);
475475
final store = PerAccountStoreWidget.of(pageContext);
476476

477477
PlatformActions.copyWithPopup(context: pageContext,
478-
successContent: Text(localizations.successChannelLinkCopied),
478+
successContent: Text(zulipLocalizations.successChannelLinkCopied),
479479
data: ClipboardData(text: narrowLink(store, ChannelNarrow(channelId)).toString()));
480480
}
481481
}
@@ -882,11 +882,11 @@ class CopyTopicLinkButton extends ActionSheetMenuItemButton {
882882
}
883883

884884
@override void onPressed() async {
885-
final localizations = ZulipLocalizations.of(pageContext);
885+
final zulipLocalizations = ZulipLocalizations.of(pageContext);
886886
final store = PerAccountStoreWidget.of(pageContext);
887887

888888
PlatformActions.copyWithPopup(context: pageContext,
889-
successContent: Text(localizations.successTopicLinkCopied),
889+
successContent: Text(zulipLocalizations.successTopicLinkCopied),
890890
data: ClipboardData(text: narrowLink(store, narrow).toString()));
891891
}
892892
}

‎lib/widgets/app.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@ class ZulipApp extends StatefulWidget {
112112
return;
113113
}
114114

115-
final localizations = ZulipLocalizations.of(navigatorKey.currentContext!);
115+
final zulipLocalizations = ZulipLocalizations.of(navigatorKey.currentContext!);
116116
final newSnackBar = scaffoldMessenger!.showSnackBar(
117117
snackBarAnimationStyle: AnimationStyle(
118118
duration: const Duration(milliseconds: 200),
119119
reverseDuration: const Duration(milliseconds: 50)),
120120
SnackBar(
121121
content: Text(message),
122122
action: (details == null) ? null : SnackBarAction(
123-
label: localizations.snackBarDetails,
123+
label: zulipLocalizations.snackBarDetails,
124124
onPressed: () => showErrorDialog(context: navigatorKey.currentContext!,
125-
title: localizations.errorDialogTitle,
125+
title: zulipLocalizations.errorDialogTitle,
126126
message: details))));
127127

128128
_snackBarCount++;

‎lib/widgets/autocomplete.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ class ComposeAutocomplete extends AutocompleteField<ComposeAutocompleteQuery, Co
178178
@override
179179
ComposeAutocompleteView initViewModel(BuildContext context, ComposeAutocompleteQuery query) {
180180
final store = PerAccountStoreWidget.of(context);
181-
final localizations = ZulipLocalizations.of(context);
182-
return query.initViewModel(store: store, localizations: localizations,
181+
final zulipLocalizations = ZulipLocalizations.of(context);
182+
return query.initViewModel(store: store, localizations: zulipLocalizations,
183183
narrow: narrow);
184184
}
185185

@@ -273,18 +273,18 @@ class MentionAutocompleteItem extends StatelessWidget {
273273
}) {
274274
final isDmNarrow = narrow is DmNarrow;
275275
final isChannelWildcardAvailable = store.zulipFeatureLevel >= 247; // TODO(server-9)
276-
final localizations = ZulipLocalizations.of(context);
276+
final zulipLocalizations = ZulipLocalizations.of(context);
277277
return switch (wildcardOption) {
278278
WildcardMentionOption.all || WildcardMentionOption.everyone => isDmNarrow
279-
? localizations.wildcardMentionAllDmDescription
279+
? zulipLocalizations.wildcardMentionAllDmDescription
280280
: isChannelWildcardAvailable
281-
? localizations.wildcardMentionChannelDescription
282-
: localizations.wildcardMentionStreamDescription,
283-
WildcardMentionOption.channel => localizations.wildcardMentionChannelDescription,
281+
? zulipLocalizations.wildcardMentionChannelDescription
282+
: zulipLocalizations.wildcardMentionStreamDescription,
283+
WildcardMentionOption.channel => zulipLocalizations.wildcardMentionChannelDescription,
284284
WildcardMentionOption.stream => isChannelWildcardAvailable
285-
? localizations.wildcardMentionChannelDescription
286-
: localizations.wildcardMentionStreamDescription,
287-
WildcardMentionOption.topic => localizations.wildcardMentionTopicDescription,
285+
? zulipLocalizations.wildcardMentionChannelDescription
286+
: zulipLocalizations.wildcardMentionStreamDescription,
287+
WildcardMentionOption.topic => zulipLocalizations.wildcardMentionTopicDescription,
288288
};
289289
}
290290

‎lib/widgets/profile.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,15 @@ class _SetStatusButton extends StatelessWidget {
252252

253253
@override
254254
Widget build(BuildContext context) {
255-
final localizations = ZulipLocalizations.of(context);
255+
final zulipLocalizations = ZulipLocalizations.of(context);
256256
final store = PerAccountStoreWidget.of(context);
257257
final userStatus = store.getUserStatus(store.selfUserId);
258258

259259
return ZulipMenuItemButton(
260260
style: ZulipMenuItemButtonStyle.list,
261261
label: userStatus == UserStatus.zero
262-
? localizations.statusButtonLabelStatusUnset
263-
: localizations.statusButtonLabelStatusSet,
262+
? zulipLocalizations.statusButtonLabelStatusUnset
263+
: zulipLocalizations.statusButtonLabelStatusSet,
264264
subLabel: userStatus == UserStatus.zero ? null : TextSpan(children: [
265265
UserStatusEmoji.asWidgetSpan(
266266
userId: store.selfUserId,
@@ -270,7 +270,7 @@ class _SetStatusButton extends StatelessWidget {
270270
neverAnimate: false,
271271
),
272272
userStatus.text == null
273-
? TextSpan(text: localizations.noStatusText,
273+
? TextSpan(text: zulipLocalizations.noStatusText,
274274
style: TextStyle(fontStyle: FontStyle.italic))
275275
: TextSpan(text: userStatus.text),
276276
]),

‎lib/widgets/read_receipts.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,15 @@ class _ReadReceiptsUserList extends StatelessWidget {
137137

138138
@override
139139
Widget build(BuildContext context) {
140-
final localizations = ZulipLocalizations.of(context);
140+
final zulipLocalizations = ZulipLocalizations.of(context);
141141

142142
return switch(status) {
143143
FetchStatus.loading => BottomSheetEmptyContentPlaceholder(loading: true),
144144
FetchStatus.error => BottomSheetEmptyContentPlaceholder(
145-
message: localizations.actionSheetReadReceiptsErrorReadCount),
145+
message: zulipLocalizations.actionSheetReadReceiptsErrorReadCount),
146146
FetchStatus.success => userIds.isEmpty
147147
? BottomSheetEmptyContentPlaceholder(
148-
message: localizations.actionSheetReadReceiptsZeroReadCount)
148+
message: zulipLocalizations.actionSheetReadReceiptsZeroReadCount)
149149
: InsetShadowBox(
150150
top: 8, bottom: 8,
151151
color: DesignVariables.of(context).bgContextMenu,

‎lib/widgets/set_status.dart‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@ class _SetStatusPageState extends State<SetStatusPage> {
8585

8686
List<UserStatus> statusSuggestions(BuildContext context) {
8787
final store = PerAccountStoreWidget.of(context);
88-
final localizations = ZulipLocalizations.of(context);
88+
final zulipLocalizations = ZulipLocalizations.of(context);
8989

9090
final values = [
91-
('1f6e0', localizations.userStatusBusy),
92-
('1f4c5', localizations.userStatusInAMeeting),
93-
('1f68c', localizations.userStatusCommuting),
94-
('1f912', localizations.userStatusOutSick),
95-
('1f334', localizations.userStatusVacationing),
96-
('1f3e0', localizations.userStatusWorkingRemotely),
97-
('1f3e2', localizations.userStatusAtTheOffice),
91+
('1f6e0', zulipLocalizations.userStatusBusy),
92+
('1f4c5', zulipLocalizations.userStatusInAMeeting),
93+
('1f68c', zulipLocalizations.userStatusCommuting),
94+
('1f912', zulipLocalizations.userStatusOutSick),
95+
('1f334', zulipLocalizations.userStatusVacationing),
96+
('1f3e0', zulipLocalizations.userStatusWorkingRemotely),
97+
('1f3e2', zulipLocalizations.userStatusAtTheOffice),
9898
];
9999
return [
100100
for (final (emojiCode, statusText) in values)
@@ -115,15 +115,15 @@ class _SetStatusPageState extends State<SetStatusPage> {
115115

116116
Future<void> handleStatusSave() async {
117117
final store = PerAccountStoreWidget.of(context);
118-
final localizations = ZulipLocalizations.of(context);
118+
final zulipLocalizations = ZulipLocalizations.of(context);
119119

120120
Navigator.pop(context);
121121
if (newStatus == oldStatus) return;
122122

123123
try {
124124
await updateStatus(store.connection, change: statusChange.value);
125125
} catch (e) {
126-
reportErrorToUserBriefly(localizations.updateStatusErrorTitle);
126+
reportErrorToUserBriefly(zulipLocalizations.updateStatusErrorTitle);
127127
}
128128
}
129129

@@ -152,18 +152,18 @@ class _SetStatusPageState extends State<SetStatusPage> {
152152
@override
153153
Widget build(BuildContext context) {
154154
final designVariables = DesignVariables.of(context);
155-
final localizations = ZulipLocalizations.of(context);
155+
final zulipLocalizations = ZulipLocalizations.of(context);
156156

157157
final suggestions = statusSuggestions(context);
158158

159159
return Scaffold(
160-
appBar: ZulipAppBar(title: Text(localizations.setStatusPageTitle),
160+
appBar: ZulipAppBar(title: Text(zulipLocalizations.setStatusPageTitle),
161161
actions: [
162162
ValueListenableBuilder(
163163
valueListenable: statusChange,
164164
builder: (_, _, _) {
165165
return _ActionButton(
166-
label: localizations.statusClearButtonLabel,
166+
label: zulipLocalizations.statusClearButtonLabel,
167167
icon: ZulipIcons.remove,
168168
onPressed: newStatus == UserStatus.zero
169169
? null
@@ -174,7 +174,7 @@ class _SetStatusPageState extends State<SetStatusPage> {
174174
valueListenable: statusChange,
175175
builder: (_, change, _) {
176176
return _ActionButton(
177-
label: localizations.statusSaveButtonLabel,
177+
label: zulipLocalizations.statusSaveButtonLabel,
178178
icon: ZulipIcons.check,
179179
onPressed: switch ((change.text, change.emoji)) {
180180
(OptionNone(), OptionNone()) => null,
@@ -233,7 +233,7 @@ class _SetStatusPageState extends State<SetStatusPage> {
233233
// TODO: display a counter as suggested in CZO discussion:
234234
// https://chat.zulip.org/#narrow/channel/530-mobile-design/topic/Set.20user.20status/near/2224549
235235
counterText: '',
236-
hintText: localizations.statusTextHint,
236+
hintText: zulipLocalizations.statusTextHint,
237237
hintStyle: TextStyle(color: designVariables.labelSearchPrompt),
238238
isDense: true,
239239
contentPadding: EdgeInsets.symmetric(

‎test/widgets/profile_test.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,13 +446,13 @@ void main() {
446446
});
447447

448448
group('user status', () {
449-
final localizations = GlobalLocalizations.zulipLocalizations;
449+
final zulipLocalizations = GlobalLocalizations.zulipLocalizations;
450450

451451
Finder findStatusButton({required bool statusSet}) {
452452
return find.widgetWithText(ZulipMenuItemButton,
453453
statusSet
454-
? localizations.statusButtonLabelStatusSet
455-
: localizations.statusButtonLabelStatusUnset);
454+
? zulipLocalizations.statusButtonLabelStatusSet
455+
: zulipLocalizations.statusButtonLabelStatusUnset);
456456
}
457457

458458
testWidgets('non-self profile, status set: no status button, status info appears', (tester) async {
@@ -514,7 +514,7 @@ void main() {
514514

515515
final statusButtonFinder = findStatusButton(statusSet: true);
516516
final textPlaceholderFinder = findText(
517-
includePlaceholders: false, localizations.noStatusText);
517+
includePlaceholders: false, zulipLocalizations.noStatusText);
518518

519519
check(statusButtonFinder).findsOne();
520520
check(textPlaceholderFinder).findsOne();

0 commit comments

Comments
 (0)