aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/tabs/general_tab.vue
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2024-09-18 01:17:05 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2024-09-18 01:17:05 +0000
commit537145e93467dbc318995d8f709bd6d2eb8c5985 (patch)
treecbbc8346241a60307707344b56a3fdf29ea13606 /src/components/settings_modal/tabs/general_tab.vue
parent8ee51229090ba323ceacf2cb8c6b50f2b1309560 (diff)
parentb14ba1725612ee5ddaa40626c4fcd32212f0cc7f (diff)
Merge branch 'tusooa/date-absolute' into 'develop'
Support displaying time in absolute format See merge request pleroma/pleroma-fe!1938
Diffstat (limited to 'src/components/settings_modal/tabs/general_tab.vue')
-rw-r--r--src/components/settings_modal/tabs/general_tab.vue23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 4ece6cf4..82d5da89 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -217,6 +217,29 @@
{{ $t('settings.no_rich_text_description') }}
</BooleanSetting>
</li>
+ <li>
+ <BooleanSetting
+ path="useAbsoluteTimeFormat"
+ expert="1"
+ >
+ {{ $t('settings.absolute_time_format') }}
+ </BooleanSetting>
+ </li>
+ <ul
+ class="setting-list suboptions"
+ v-if="mergedConfig.useAbsoluteTimeFormat"
+ >
+ <li>
+ <UnitSetting
+ path="absoluteTimeFormatMinAge"
+ unit-set="time"
+ :units="['s', 'm', 'h', 'd']"
+ :min="0"
+ >
+ {{ $t('settings.absolute_time_format_min_age') }}
+ </UnitSetting>
+ </li>
+ </ul>
<h3>{{ $t('settings.attachments') }}</h3>
<li>
<BooleanSetting