summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-06-01 12:09:49 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-06-01 12:09:49 -0400
commitf5195008a5214d6fdf982310e80b3542f7f82546 (patch)
tree2ef3140f2e88010ae04e64de6b1c7281d79b3e83
parentmerge: Add configuration option for the "query is slow" warning (!1061) (diff)
downloadsharkey-f5195008a5214d6fdf982310e80b3542f7f82546.tar.gz
sharkey-f5195008a5214d6fdf982310e80b3542f7f82546.tar.bz2
sharkey-f5195008a5214d6fdf982310e80b3542f7f82546.zip
add "unixtime" to the MFM cheatsheet
-rw-r--r--locales/index.d.ts8
-rw-r--r--packages/frontend/src/components/SkMfmWindow.vue13
-rw-r--r--sharkey-locales/en-US.yml2
3 files changed, 23 insertions, 0 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 69c63cc714..f7944c2311 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -12493,6 +12493,14 @@ export interface Locale extends ILocale {
*/
"centerDescription": string;
/**
+ * Unix Time
+ */
+ "unixtime": string;
+ /**
+ * Displays a timestamp in the viewer's current timezone.
+ */
+ "unixtimeDescription": string;
+ /**
* Code (Inline)
*/
"inlineCode": string;
diff --git a/packages/frontend/src/components/SkMfmWindow.vue b/packages/frontend/src/components/SkMfmWindow.vue
index 14d309b7ba..c544bc528c 100644
--- a/packages/frontend/src/components/SkMfmWindow.vue
+++ b/packages/frontend/src/components/SkMfmWindow.vue
@@ -100,6 +100,16 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
<div class="section _block">
+ <div class="title">{{ i18n.ts._mfm.unixtime }}</div>
+ <div class="content">
+ <p>{{ i18n.ts._mfm.unixtimeDescription }}</p>
+ <div class="preview">
+ <Mfm :text="preview_unixtime"/>
+ <MkTextarea v-model="preview_unixtime"><template #label>MFM</template></MkTextarea>
+ </div>
+ </div>
+ </div>
+ <div class="section _block">
<div class="title">{{ i18n.ts._mfm.inlineCode }}</div>
<div class="content">
<p>{{ i18n.ts._mfm.inlineCodeDescription }}</p>
@@ -429,6 +439,9 @@ const preview_small = ref(
const preview_center = ref(
`<center>${i18n.ts._mfm.dummy}</center>`,
);
+const preview_unixtime = ref(
+ `$[unixtime ${Math.floor(Date.now() / 1000)}]`,
+);
const preview_inlineCode = ref('`<: "Hello, world!"`');
const preview_blockCode = ref(
'```ai\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```',
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index f1ad66fc8c..773a8df1cb 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -371,6 +371,8 @@ _mfm:
smallDescription: "Displays content small and thin."
center: "Center"
centerDescription: "Displays content centered."
+ unixtime: "Unix Time"
+ unixtimeDescription: "Displays a timestamp in the viewer's current timezone."
inlineCode: "Code (Inline)"
inlineCodeDescription: "Displays inline syntax highlighting for (program) code."
blockCode: "Code (Block)"