aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/notification/notification.vue2
-rw-r--r--src/components/poll/poll.vue2
-rw-r--r--src/components/settings_modal/helpers/integer_setting.js2
-rw-r--r--src/components/settings_modal/tabs/theme_tab/theme_tab.vue6
-rw-r--r--src/components/shadow_control/shadow_control.vue2
-rw-r--r--src/components/thread_tree/thread_tree.vue4
6 files changed, 9 insertions, 9 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 23157a51..d77b2f57 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -112,7 +112,7 @@
</span>
<span v-if="notification.type === 'pleroma:emoji_reaction'">
<small>
- <i18n-t keypath="notifications.reacted_with">
+ <i18n-t scope="global" keypath="notifications.reacted_with">
<span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
</i18n-t>
</small>
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index e949c653..c3880096 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -71,7 +71,7 @@
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;ยท&nbsp;
</template>
</div>
- <i18n-t :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
+ <i18n-t scope="global" :keypath="expired ? 'polls.expired' : 'polls.expires_in'">
<Timeago
:time="expiresAt"
:auto-update="60"
diff --git a/src/components/settings_modal/helpers/integer_setting.js b/src/components/settings_modal/helpers/integer_setting.js
index 4a19bd7c..17dc0e7b 100644
--- a/src/components/settings_modal/helpers/integer_setting.js
+++ b/src/components/settings_modal/helpers/integer_setting.js
@@ -8,7 +8,7 @@ export default {
path: String,
disabled: Boolean,
min: Number,
- expert: Number
+ expert: [Number, String]
},
computed: {
pathDefault () {
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index cf049a70..dfa9a735 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -951,14 +951,14 @@
:fallback="currentShadowFallback"
/>
<div v-if="shadowSelected === 'avatar' || shadowSelected === 'avatarStatus'">
- <i18n-t
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.always_drop_shadow"
tag="p"
>
<code>filter: drop-shadow()</code>
</i18n-t>
<p>{{ $t('settings.style.shadows.filter_hint.avatar_inset') }}</p>
- <i18n-t
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.drop_shadow_syntax"
tag="p"
>
@@ -966,7 +966,7 @@
<code>spread-radius</code>
<code>inset</code>
</i18n-t>
- <i18n-t
+ <i18n-t scope="global"
keypath="settings.style.shadows.filter_hint.inset_classic"
tag="p"
>
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index b59ac3bc..d1e5fc22 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -204,7 +204,7 @@
v-model="selected.alpha"
:disabled="!present"
/>
- <i18n-t
+ <i18n-t scope="global"
keypath="settings.style.shadows.hintV3"
tag="p"
>
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index 48942005..f81653eb 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -74,7 +74,7 @@
v-if="currentReplies.length && !threadShowing"
class="thread-tree-replies thread-tree-replies-hidden"
>
- <i18n-t
+ <i18n-t scope="global"
v-if="simple"
tag="button"
keypath="status.thread_follow_with_icon"
@@ -92,7 +92,7 @@
</span>
</template>
</i18n-t>
- <i18n-t
+ <i18n-t scope="global"
v-else
tag="button"
keypath="status.thread_show_full_with_icon"