Skip to content
Open
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
17 changes: 7 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
"cordova": "13.0.0",
"core-js": "^3.45.0",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.19",
"dompurify": "^3.2.6",
"escape-string-regexp": "^5.0.0",
"filesize": "^11.0.2",
Expand All @@ -125,7 +126,6 @@
"markdown-it-github-alerts": "^1.0.0",
"markdown-it-task-lists": "^2.1.1",
"mime-types": "^3.0.1",
"moment": "^2.30.1",
"mustache": "^4.2.0",
"picomatch": "^4.0.3",
"url-parse": "^1.5.10",
Expand Down
55 changes: 31 additions & 24 deletions src/pages/plugin/plugin.view.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,42 @@
import fsOperation from "fileSystem";
import TabView from "components/tabView";
import toast from "components/toast";
import dayjs from "dayjs/esm";
import dayjsRelativeTime from "dayjs/esm/plugin/relativeTime";
import dayjsUpdateLocale from "dayjs/esm/plugin/updateLocale";
import dayjsUtc from "dayjs/esm/plugin/utc";
import alert from "dialogs/alert";
import DOMPurify from "dompurify";
import Ref from "html-tag-js/ref";
import actionStack from "lib/actionStack";
import constants from "lib/constants";
import moment from "moment";
import helpers from "utils/helpers";
import Url from "utils/Url";

dayjs.extend(dayjsRelativeTime);
dayjs.extend(dayjsUtc);
dayjs.extend(dayjsUpdateLocale);

// Configure dayjs for shorter relative time format
dayjs.updateLocale("en", {
relativeTime: {
future: "in %s",
past: "%s ago",
s: "now",
ss: "now",
m: "1m",
mm: "%dm",
h: "1h",
hh: "%dh",
d: "1d",
dd: "%dd",
M: "1mo",
MM: "%dmo",
y: "1y",
yy: "%dy",
},
});

export default (props) => {
const {
id,
Expand Down Expand Up @@ -48,32 +75,12 @@ export default (props) => {
if (!dateString) return null;

try {
// Configure moment for shorter relative time format
moment.updateLocale("en", {
relativeTime: {
future: "in %s",
past: "%s ago",
s: "now",
ss: "now",
m: "1m",
mm: "%dm",
h: "1h",
hh: "%dh",
d: "1d",
dd: "%dd",
M: "1mo",
MM: "%dmo",
y: "1y",
yy: "%dy",
},
});

const updateTime = moment.utc(dateString);
const updateTime = dayjs.utc(dateString);
if (!updateTime.isValid()) return null;

return updateTime.fromNow();
return updateTime.fromNow(true);
} catch (error) {
console.warn("Error parsing date with moment:", dateString, error);
console.warn("Error parsing date with dayjs:", dateString, error);
return null;
}
};
Expand Down