Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/icons/ZulipIcons.ttf
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/icons/more_horizontal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 20 additions & 1 deletion assets/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
"@chooseAccountButtonAddAnAccount": {
"description": "Label for ChooseAccountPage button to add an account"
},
"navButtonAllChannels": "All channels",
"@navButtonAllChannels": {
"description": "Title for a nav button that opens the 'All channels' page."
},
"allChannelsPageTitle": "All channels",
"@allChannelsPageTitle": {
"description": "Title for the 'All channels' page."
},
"allChannelsEmptyPlaceholder": "There are no channels you can view in this organization.",
"@allChannelsEmptyPlaceholder": {
"description": "Centered text on the 'All channels' page saying that there is no content to show."
},
"profileButtonSendDirectMessage": "Send direct message",
"@profileButtonSendDirectMessage": {
"description": "Label for button in profile screen to navigate to DMs with the shown user."
Expand Down Expand Up @@ -1074,10 +1086,17 @@
"@channelsPageTitle": {
"description": "Title for the page with a list of subscribed channels."
},
"channelsEmptyPlaceholder": "You are not subscribed to any channels yet.",
"channelsEmptyPlaceholder": "You’re not subscribed to any channels yet.",
"@channelsEmptyPlaceholder": {
"description": "Centered text on the 'Channels' page saying that there is no content to show."
},
"channelsEmptyPlaceholderWithAllChannelsLink": "You’re not subscribed to any channels yet. Try going to <z-link>{allChannelsPageTitle}</z-link> and joining some of them.",
"@channelsEmptyPlaceholderWithAllChannelsLink": {
"description": "Centered text on the 'Channels' page saying that there is no content to show, with a link to 'All channels'.",
"placeholders": {
"allChannelsPageTitle": {"type": "String", "example": "All channels"}
}
},
"sharePageTitle": "Share",
"@sharePageTitle": {
"description": "Title for the page about sharing content received from other apps."
Expand Down
7 changes: 6 additions & 1 deletion lib/api/model/model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -628,10 +628,15 @@ class ZulipStream {
final int streamId;
String name;

// We don't expect `true` for this until we declare the `archived_channels`
// client capability.
//
// Servers that don't send this property will only send non-archived channels;
// default to false for those servers.
// TODO(server-10) remove default and its comment
// TODO(#800) remove comment about `archived_channels` client capability.
@JsonKey(defaultValue: false)
bool isArchived; // TODO(server-10) remove default and its comment
bool isArchived;

String description;
String renderedDescription;
Expand Down
28 changes: 27 additions & 1 deletion lib/generated/l10n/zulip_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,24 @@ abstract class ZulipLocalizations {
/// **'Add an account'**
String get chooseAccountButtonAddAnAccount;

/// Title for a nav button that opens the 'All channels' page.
///
/// In en, this message translates to:
/// **'All channels'**
String get navButtonAllChannels;

/// Title for the 'All channels' page.
///
/// In en, this message translates to:
/// **'All channels'**
String get allChannelsPageTitle;

/// Centered text on the 'All channels' page saying that there is no content to show.
///
/// In en, this message translates to:
/// **'There are no channels you can view in this organization.'**
String get allChannelsEmptyPlaceholder;

/// Label for button in profile screen to navigate to DMs with the shown user.
///
/// In en, this message translates to:
Expand Down Expand Up @@ -1588,9 +1606,17 @@ abstract class ZulipLocalizations {
/// Centered text on the 'Channels' page saying that there is no content to show.
///
/// In en, this message translates to:
/// **'You are not subscribed to any channels yet.'**
/// **'You’re not subscribed to any channels yet.'**
String get channelsEmptyPlaceholder;

/// Centered text on the 'Channels' page saying that there is no content to show, with a link to 'All channels'.
///
/// In en, this message translates to:
/// **'You’re not subscribed to any channels yet. Try going to <z-link>{allChannelsPageTitle}</z-link> and joining some of them.'**
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
);

/// Title for the page about sharing content received from other apps.
///
/// In en, this message translates to:
Expand Down
19 changes: 18 additions & 1 deletion lib/generated/l10n/zulip_localizations_ar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsAr extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Add an account';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Send direct message';

Expand Down Expand Up @@ -898,7 +908,14 @@ class ZulipLocalizationsAr extends ZulipLocalizations {

@override
String get channelsEmptyPlaceholder =>
'You are not subscribed to any channels yet.';
'You’re not subscribed to any channels yet.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Share';
Expand Down
17 changes: 17 additions & 0 deletions lib/generated/l10n/zulip_localizations_de.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Account hinzufügen';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Direktnachricht senden';

Expand Down Expand Up @@ -923,6 +933,13 @@ class ZulipLocalizationsDe extends ZulipLocalizations {
@override
String get channelsEmptyPlaceholder => 'Du hast noch keine Kanäle abonniert.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Teilen';

Expand Down
19 changes: 18 additions & 1 deletion lib/generated/l10n/zulip_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsEn extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Add an account';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Send direct message';

Expand Down Expand Up @@ -898,7 +908,14 @@ class ZulipLocalizationsEn extends ZulipLocalizations {

@override
String get channelsEmptyPlaceholder =>
'You are not subscribed to any channels yet.';
'You’re not subscribed to any channels yet.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Share';
Expand Down
19 changes: 18 additions & 1 deletion lib/generated/l10n/zulip_localizations_fr.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ class ZulipLocalizationsFr extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Ajouter un compte';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Envoyer un message direct';

Expand Down Expand Up @@ -912,7 +922,14 @@ class ZulipLocalizationsFr extends ZulipLocalizations {

@override
String get channelsEmptyPlaceholder =>
'You are not subscribed to any channels yet.';
'You’re not subscribed to any channels yet.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Share';
Expand Down
17 changes: 17 additions & 0 deletions lib/generated/l10n/zulip_localizations_it.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsIt extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Aggiungi un account';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Invia un messaggio diretto';

Expand Down Expand Up @@ -915,6 +925,13 @@ class ZulipLocalizationsIt extends ZulipLocalizations {
String get channelsEmptyPlaceholder =>
'Non sei ancora iscritto ad alcun canale.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Share';

Expand Down
17 changes: 17 additions & 0 deletions lib/generated/l10n/zulip_localizations_ja.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => '新しいアカウントを追加';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'ダイレクトメッセージを送信';

Expand Down Expand Up @@ -879,6 +889,13 @@ class ZulipLocalizationsJa extends ZulipLocalizations {
@override
String get channelsEmptyPlaceholder => 'まだ参加しているチャンネルはありません。';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => '共有';

Expand Down
19 changes: 18 additions & 1 deletion lib/generated/l10n/zulip_localizations_nb.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsNb extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Add an account';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Send direct message';

Expand Down Expand Up @@ -898,7 +908,14 @@ class ZulipLocalizationsNb extends ZulipLocalizations {

@override
String get channelsEmptyPlaceholder =>
'You are not subscribed to any channels yet.';
'You’re not subscribed to any channels yet.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Share';
Expand Down
17 changes: 17 additions & 0 deletions lib/generated/l10n/zulip_localizations_pl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Dodaj konto';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Wyślij wiadomość bezpośrednią';

Expand Down Expand Up @@ -914,6 +924,13 @@ class ZulipLocalizationsPl extends ZulipLocalizations {
@override
String get channelsEmptyPlaceholder => 'Nie śledzisz żadnego z kanałów.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Udostępnij';

Expand Down
17 changes: 17 additions & 0 deletions lib/generated/l10n/zulip_localizations_ru.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
@override
String get chooseAccountButtonAddAnAccount => 'Добавить учетную запись';

@override
String get navButtonAllChannels => 'All channels';

@override
String get allChannelsPageTitle => 'All channels';

@override
String get allChannelsEmptyPlaceholder =>
'There are no channels you can view in this organization.';

@override
String get profileButtonSendDirectMessage => 'Отправить личное сообщение';

Expand Down Expand Up @@ -925,6 +935,13 @@ class ZulipLocalizationsRu extends ZulipLocalizations {
String get channelsEmptyPlaceholder =>
'Вы ещё не подписаны ни на один канал.';

@override
String channelsEmptyPlaceholderWithAllChannelsLink(
String allChannelsPageTitle,
) {
return 'You’re not subscribed to any channels yet. Try going to <z-link>$allChannelsPageTitle</z-link> and joining some of them.';
}

@override
String get sharePageTitle => 'Поделиться';

Expand Down
Loading
Loading