Skip to content

profile: Display user's local time #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft
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
9 changes: 8 additions & 1 deletion assets/l10n/app_ar.arb
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,12 @@
"wildcardMentionChannelDescription": "إخطار القناة",
"wildcardMentionStreamDescription": "إخطار الدفق",
"wildcardMentionAllDmDescription": "إخطار المستلمين",
"wildcardMentionTopicDescription": "إخطار الموضوع"
"wildcardMentionTopicDescription": "إخطار الموضوع",
"userLocalTime": "{userTime} الوقت المحلي",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
10 changes: 9 additions & 1 deletion assets/l10n/app_de.arb
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
{}
{
"userLocalTime": "{userTime} Ortszeit",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
7 changes: 7 additions & 0 deletions assets/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1006,5 +1006,12 @@
"zulipAppTitle": "Zulip",
"@zulipAppTitle": {
"description": "The name of Zulip. This should be either 'Zulip' or a transliteration."
},
"userLocalTime": "{userTime} local time",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
9 changes: 8 additions & 1 deletion assets/l10n/app_ja.arb
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,12 @@
"userRoleGuest": "ゲスト",
"@userRoleGuest": {},
"userRoleUnknown": "不明",
"@userRoleUnknown": {}
"@userRoleUnknown": {},
"userLocalTime": "現地時間 {userTime}",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
7 changes: 7 additions & 0 deletions assets/l10n/app_pl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1076,5 +1076,12 @@
"actionSheetOptionListOfTopics": "Lista wątków",
"@actionSheetOptionListOfTopics": {
"description": "Label for navigating to a channel's topic-list page."
},
"userLocalTime": "{userTime} czas lokalny",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
7 changes: 7 additions & 0 deletions assets/l10n/app_ru.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1068,5 +1068,12 @@
"discardDraftForEditConfirmationDialogMessage": "При изменении сообщения текст из поля для редактирования удаляется.",
"@discardDraftForEditConfirmationDialogMessage": {
"description": "Message for a confirmation dialog for discarding message text that was typed into the compose box."
},
"userLocalTime": "{userTime} местное время",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
7 changes: 7 additions & 0 deletions assets/l10n/app_uk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1006,5 +1006,12 @@
"emojiReactionsMore": "більше",
"@emojiReactionsMore": {
"description": "Label for a button opening the emoji picker."
},
"userLocalTime": "{userTime} місцевий час",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
9 changes: 8 additions & 1 deletion assets/l10n/app_zh_Hans_CN.arb
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{
"settingsPageTitle": "设置"
"settingsPageTitle": "设置",
"userLocalTime": "{userTime} 当地时间",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
9 changes: 8 additions & 1 deletion assets/l10n/app_zh_Hant_TW.arb
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
{
"settingsPageTitle": "設定"
"settingsPageTitle": "設定",
"userLocalTime": "{userTime} 本地時間",
"@userLocalTime": {
"description": "Current time in the user's timezone",
"placeholders": {
"userTime": {"type": "DateTime", "format": "jm"}
}
}
}
Binary file added assets/timezone/latest_all.tzf
Binary file not shown.
6 changes: 6 additions & 0 deletions lib/generated/l10n/zulip_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,12 @@ abstract class ZulipLocalizations {
/// In en, this message translates to:
/// **'Zulip'**
String get zulipAppTitle;

/// Current time in the user's timezone
///
/// In en, this message translates to:
/// **'{userTime} local time'**
String userLocalTime(DateTime userTime);
}

class _ZulipLocalizationsDelegate
Expand Down
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_ar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,12 @@ class ZulipLocalizationsAr extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString الوقت المحلي';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_de.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,12 @@ class ZulipLocalizationsDe extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString Ortszeit';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,14 @@ class ZulipLocalizationsEn extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString local time';
}
}

/// The translations for English, as used in the United Kingdom (`en_GB`).
Expand Down
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_ja.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,12 @@ class ZulipLocalizationsJa extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '現地時間 $userTimeString';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_nb.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,4 +813,12 @@ class ZulipLocalizationsNb extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString local time';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_pl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -824,4 +824,12 @@ class ZulipLocalizationsPl extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString czas lokalny';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_ru.dart
Original file line number Diff line number Diff line change
Expand Up @@ -827,4 +827,12 @@ class ZulipLocalizationsRu extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString местное время';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_sk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -815,4 +815,12 @@ class ZulipLocalizationsSk extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString local time';
}
}
8 changes: 8 additions & 0 deletions lib/generated/l10n/zulip_localizations_uk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -827,4 +827,12 @@ class ZulipLocalizationsUk extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString місцевий час';
}
}
24 changes: 24 additions & 0 deletions lib/generated/l10n/zulip_localizations_zh.dart
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,14 @@ class ZulipLocalizationsZh extends ZulipLocalizations {

@override
String get zulipAppTitle => 'Zulip';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString local time';
}
}

/// The translations for Chinese, as used in China, using the Han script (`zh_Hans_CN`).
Expand All @@ -821,6 +829,14 @@ class ZulipLocalizationsZhHansCn extends ZulipLocalizationsZh {

@override
String get settingsPageTitle => '设置';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString 当地时间';
}
}

/// The translations for Chinese, as used in Taiwan, using the Han script (`zh_Hant_TW`).
Expand All @@ -829,4 +845,12 @@ class ZulipLocalizationsZhHantTw extends ZulipLocalizationsZh {

@override
String get settingsPageTitle => '設定';

@override
String userLocalTime(DateTime userTime) {
final intl.DateFormat userTimeDateFormat = intl.DateFormat.jm(localeName);
final String userTimeString = userTimeDateFormat.format(userTime);

return '$userTimeString 本地時間';
}
}
9 changes: 9 additions & 0 deletions lib/model/binding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ abstract class ZulipBinding {
/// Outside tests, this just calls the [Stopwatch] constructor.
Stopwatch stopwatch();

/// Provides access to current time.
///
/// Please refer to this issue:
/// https://github.com/dart-lang/sdk/issues/28985
DateTime now();

/// Provides device and operating system information,
/// via package:device_info_plus.
///
Expand Down Expand Up @@ -394,6 +400,9 @@ class LiveZulipBinding extends ZulipBinding {
@override
Stopwatch stopwatch() => Stopwatch();

@override
DateTime now() => DateTime.now();

@override
Future<BaseDeviceInfo?> get deviceInfo => _deviceInfo;
late Future<BaseDeviceInfo?> _deviceInfo;
Expand Down
9 changes: 5 additions & 4 deletions lib/model/store.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import '../log.dart';
import '../notifications/receive.dart';
import 'actions.dart';
import 'autocomplete.dart';
import 'binding.dart';
import 'database.dart';
import 'emoji.dart';
import 'localizations.dart';
Expand Down Expand Up @@ -656,7 +657,7 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
///
/// To determine if a user is a full member, callers must also check that the
/// user's role is at least [UserRole.member].
bool hasPassedWaitingPeriod(User user, {required DateTime byDate}) {
bool hasPassedWaitingPeriod(User user) {
// [User.dateJoined] is in UTC. For logged-in users, the format is:
// YYYY-MM-DDTHH:mm+00:00, which includes the timezone offset for UTC.
// For logged-out spectators, the format is: YYYY-MM-DD, which doesn't
Expand All @@ -668,7 +669,8 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
// See the related discussion:
// https://chat.zulip.org/#narrow/channel/412-api-documentation/topic/provide.20an.20explicit.20format.20for.20.60realm_user.2Edate_joined.60/near/1980194
final dateJoined = DateTime.parse(user.dateJoined);
return byDate.difference(dateJoined).inDays >= realmWaitingPeriodThreshold;
final now = ZulipBinding.instance.now();
return now.difference(dateJoined).inDays >= realmWaitingPeriodThreshold;
}

/// The given user's real email address, if known, for displaying in the UI.
Expand Down Expand Up @@ -719,7 +721,6 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
bool hasPostingPermission({
required ZulipStream inChannel,
required User user,
required DateTime byDate,
}) {
final role = user.role;
// We let the users with [unknown] role to send the message, then the server
Expand All @@ -731,7 +732,7 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
case ChannelPostPolicy.fullMembers: {
if (!role.isAtLeast(UserRole.member)) return false;
return role == UserRole.member
? hasPassedWaitingPeriod(user, byDate: byDate)
? hasPassedWaitingPeriod(user)
: true;
}
case ChannelPostPolicy.moderators: return role.isAtLeast(UserRole.moderator);
Expand Down
3 changes: 1 addition & 2 deletions lib/widgets/compose_box.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2015,8 +2015,7 @@ class _ComposeBoxState extends State<ComposeBox> with PerAccountStoreAwareStateM
case ChannelNarrow(:final streamId):
case TopicNarrow(:final streamId):
final channel = store.streams[streamId];
if (channel == null || !store.hasPostingPermission(inChannel: channel,
user: store.selfUser, byDate: DateTime.now())) {
if (channel == null || !store.hasPostingPermission(inChannel: channel, user: store.selfUser)) {
return _ErrorBanner(getLabel: (zulipLocalizations) =>
zulipLocalizations.errorBannerCannotPostInChannelLabel);
}
Expand Down
Loading