Skip to content

Commit f408879

Browse files
gnpricegnprice
committed
Merge remote-tracking branch 'pr/1500'
2 parents 156464f + 8911611 commit f408879

21 files changed

+852
-36
lines changed

‎assets/icons/ZulipIcons.ttf

276 Bytes
Binary file not shown.

‎assets/icons/topics.svg

Lines changed: 3 additions & 0 deletions
Loading

‎assets/l10n/app_en.arb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
"@actionSheetOptionMarkChannelAsRead": {
8585
"description": "Label for marking a channel as read."
8686
},
87+
"actionSheetOptionListOfTopics": "List of topics",
88+
"@actionSheetOptionListOfTopics": {
89+
"description": "Label for navigating to a channel's topic-list page."
90+
},
8791
"actionSheetOptionMuteTopic": "Mute topic",
8892
"@actionSheetOptionMuteTopic": {
8993
"description": "Label for muting a topic on action sheet."
@@ -769,6 +773,10 @@
769773
"@mainMenuMyProfile": {
770774
"description": "Label for main-menu button leading to the user's own profile."
771775
},
776+
"topicsButtonLabel": "TOPICS",
777+
"@topicsButtonLabel": {
778+
"description": "Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)"
779+
},
772780
"channelFeedButtonTooltip": "Channel feed",
773781
"@channelFeedButtonTooltip": {
774782
"description": "Tooltip for button to navigate to a given channel's feed"

‎lib/generated/l10n/zulip_localizations.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,12 @@ abstract class ZulipLocalizations {
236236
/// **'Mark channel as read'**
237237
String get actionSheetOptionMarkChannelAsRead;
238238

239+
/// Label for navigating to a channel's topic-list page.
240+
///
241+
/// In en, this message translates to:
242+
/// **'List of topics'**
243+
String get actionSheetOptionListOfTopics;
244+
239245
/// Label for muting a topic on action sheet.
240246
///
241247
/// In en, this message translates to:
@@ -1148,6 +1154,12 @@ abstract class ZulipLocalizations {
11481154
/// **'My profile'**
11491155
String get mainMenuMyProfile;
11501156

1157+
/// Label for message list button leading to topic-list page. (Use ALL CAPS for cased alphabets: Latin, Greek, Cyrillic, etc.)
1158+
///
1159+
/// In en, this message translates to:
1160+
/// **'TOPICS'**
1161+
String get topicsButtonLabel;
1162+
11511163
/// Tooltip for button to navigate to a given channel's feed
11521164
///
11531165
/// In en, this message translates to:

‎lib/generated/l10n/zulip_localizations_ar.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
7676
@override
7777
String get actionSheetOptionMarkChannelAsRead => 'Mark channel as read';
7878

79+
@override
80+
String get actionSheetOptionListOfTopics => 'List of topics';
81+
7982
@override
8083
String get actionSheetOptionMuteTopic => 'Mute topic';
8184

@@ -629,6 +632,9 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
629632
@override
630633
String get mainMenuMyProfile => 'My profile';
631634

635+
@override
636+
String get topicsButtonLabel => 'TOPICS';
637+
632638
@override
633639
String get channelFeedButtonTooltip => 'Channel feed';
634640

‎lib/generated/l10n/zulip_localizations_en.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
7676
@override
7777
String get actionSheetOptionMarkChannelAsRead => 'Mark channel as read';
7878

79+
@override
80+
String get actionSheetOptionListOfTopics => 'List of topics';
81+
7982
@override
8083
String get actionSheetOptionMuteTopic => 'Mute topic';
8184

@@ -629,6 +632,9 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
629632
@override
630633
String get mainMenuMyProfile => 'My profile';
631634

635+
@override
636+
String get topicsButtonLabel => 'TOPICS';
637+
632638
@override
633639
String get channelFeedButtonTooltip => 'Channel feed';
634640

‎lib/generated/l10n/zulip_localizations_ja.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
7676
@override
7777
String get actionSheetOptionMarkChannelAsRead => 'Mark channel as read';
7878

79+
@override
80+
String get actionSheetOptionListOfTopics => 'List of topics';
81+
7982
@override
8083
String get actionSheetOptionMuteTopic => 'Mute topic';
8184

@@ -629,6 +632,9 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
629632
@override
630633
String get mainMenuMyProfile => 'My profile';
631634

635+
@override
636+
String get topicsButtonLabel => 'TOPICS';
637+
632638
@override
633639
String get channelFeedButtonTooltip => 'Channel feed';
634640

‎lib/generated/l10n/zulip_localizations_nb.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
7676
@override
7777
String get actionSheetOptionMarkChannelAsRead => 'Mark channel as read';
7878

79+
@override
80+
String get actionSheetOptionListOfTopics => 'List of topics';
81+
7982
@override
8083
String get actionSheetOptionMuteTopic => 'Mute topic';
8184

@@ -629,6 +632,9 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
629632
@override
630633
String get mainMenuMyProfile => 'My profile';
631634

635+
@override
636+
String get topicsButtonLabel => 'TOPICS';
637+
632638
@override
633639
String get channelFeedButtonTooltip => 'Channel feed';
634640

‎lib/generated/l10n/zulip_localizations_pl.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
7878
String get actionSheetOptionMarkChannelAsRead =>
7979
'Oznacz kanał jako przeczytany';
8080

81+
@override
82+
String get actionSheetOptionListOfTopics => 'List of topics';
83+
8184
@override
8285
String get actionSheetOptionMuteTopic => 'Wycisz wątek';
8386

@@ -638,6 +641,9 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
638641
@override
639642
String get mainMenuMyProfile => 'Mój profil';
640643

644+
@override
645+
String get topicsButtonLabel => 'TOPICS';
646+
641647
@override
642648
String get channelFeedButtonTooltip => 'Strumień kanału';
643649

‎lib/generated/l10n/zulip_localizations_ru.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
7878
String get actionSheetOptionMarkChannelAsRead =>
7979
'Отметить канал как прочитанный';
8080

81+
@override
82+
String get actionSheetOptionListOfTopics => 'List of topics';
83+
8184
@override
8285
String get actionSheetOptionMuteTopic => 'Отключить тему';
8386

@@ -642,6 +645,9 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
642645
@override
643646
String get mainMenuMyProfile => 'Мой профиль';
644647

648+
@override
649+
String get topicsButtonLabel => 'TOPICS';
650+
645651
@override
646652
String get channelFeedButtonTooltip => 'Лента канала';
647653

0 commit comments

Comments
 (0)