Skip to content
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.

Sign up for GitHub

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

feat: date time formats from locales #4029

Merged
merged 21 commits into from
Oct 23, 2024
Merged

feat: date time formats from locales #4029

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
46f7c86
chore: humanTime improvements
YUCLing Sep 27, 2024
eefb7cb
chore: correct liveHumanTimes comment
YUCLing Sep 27, 2024
57c2a73
add: flarum customized time formats
YUCLing Sep 27, 2024
f5eba9f
chore: quote styles
YUCLing Sep 27, 2024
9712a64
add: fallback for uppercased formats
YUCLing Sep 27, 2024
5262b72
chore: fix code style
YUCLing Sep 27, 2024
8517f48
fix: dayjsPlugins cannot be added to reg
YUCLing Sep 27, 2024
5532684
chore: code style formatting
YUCLing Sep 27, 2024
6782636
refactor: make the plugin extendable
YUCLing Sep 29, 2024
8db78fe
refactor: use locale for all time formats
YUCLing Oct 2, 2024
7f336dc
add: support for custom time formats
YUCLing Oct 2, 2024
b6bf4d0
fix: code format
YUCLing Oct 2, 2024
2921372
remove: fallback parameter
YUCLing Oct 3, 2024
5325305
add: pass format to date time callback
YUCLing Oct 3, 2024
f89ab96
add: this arg for date time format callback
YUCLing Oct 3, 2024
cd880d7
add: full time format
YUCLing Oct 4, 2024
486de88
fix: code style
YUCLing Oct 4, 2024
f5dc334
chore: pass `id` to custom callback
SychO9 Oct 22, 2024
2804499
Merge branch '2.x' into im/time-formats
SychO9 Oct 22, 2024
0955588
chore: contextual
SychO9 Oct 22, 2024
c6a103d
chore: sort
SychO9 Oct 22, 2024
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
Prev Previous commit
Next Next commit
add: full time format
  • Loading branch information
@YUCLing
YUCLing committed Oct 4, 2024
commit cd880d7a651eff69fc281e37092bc3a7c0d828ec
3 changes: 2 additions & 1 deletion framework/core/js/src/common/helpers/fullTime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import dayjs from 'dayjs';
import type Mithril from 'mithril';
import app from "../app";

/**
* The `fullTime` helper displays a formatted time string wrapped in a <time>
Expand All @@ -9,7 +10,7 @@ export default function fullTime(time: Date): Mithril.Vnode {
const d = dayjs(time);

const datetime = d.format();
const full = d.format('LLLL');
const full = app.translator.formatDateTime(d, "core.lib.datetime_formats.full_time");

return (
<time pubdate datetime={datetime}>
Expand Down
3 changes: 2 additions & 1 deletion framework/core/js/src/common/helpers/humanTime.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import dayjs from 'dayjs';
import type Mithril from 'mithril';
import app from "../app";
import humanTimeUtil from '../utils/humanTime';

/**
Expand All @@ -11,7 +12,7 @@ export default function humanTime(time: Date): Mithril.Vnode {
const d = dayjs(time);

const datetime = d.format();
const full = d.format('LLLL');
const full = app.translator.formatDateTime(d, "core.lib.datetime_formats.full_time");
const ago = humanTimeUtil(time);

return (
Expand Down
1 change: 1 addition & 0 deletions framework/core/locale/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ core:

# These are DayJS formats used in core.
datetime_formats:
full_time: LLLL
human_time_short: D MMM
human_time_full: ll
post_stream_scrubber: MMMM YYYY
Expand Down
Loading