From 27883b448066815932f687cc3c241edf91b87350 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 11 Nov 2022 00:41:34 -0800 Subject: [PATCH] more i18n fixes --- package.json | 2 +- packages/client/src/components/MkContainer.vue | 1 + packages/client/src/components/MkFormDialog.vue | 1 + packages/client/src/components/MkMediaCaption.vue | 3 ++- packages/client/src/components/MkPostFormAttaches.vue | 1 + packages/client/src/pages/about.emojis.vue | 1 + packages/client/src/pages/admin/metrics.vue | 3 ++- .../src/pages/page-editor/page-editor.container.vue | 8 ++++---- packages/client/src/pages/welcome.entrance.b.vue | 1 + packages/client/src/pages/welcome.entrance.c.vue | 1 + packages/client/src/ui/classic.header.vue | 1 + packages/client/src/ui/classic.sidebar.vue | 1 + packages/client/src/ui/classic.widgets.vue | 1 + packages/client/src/ui/visitor.vue | 1 + packages/client/src/ui/visitor/a.vue | 1 + packages/client/src/ui/visitor/header.vue | 1 + packages/client/src/ui/visitor/kanban.vue | 1 + 17 files changed, 22 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4b3401c360..fe53a2c219 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.12.7", + "version": "12.119.0-calc.12.8", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue index 03a2b40ce6..f1dce72841 100644 --- a/packages/client/src/components/MkContainer.vue +++ b/packages/client/src/components/MkContainer.vue @@ -74,6 +74,7 @@ export default defineComponent({ showBody: this.expanded, omitted: null, ignoreOmit: false, + i18n, }; }, mounted() { diff --git a/packages/client/src/components/MkFormDialog.vue b/packages/client/src/components/MkFormDialog.vue index 7c3f6b1fb7..a92f39d5da 100644 --- a/packages/client/src/components/MkFormDialog.vue +++ b/packages/client/src/components/MkFormDialog.vue @@ -94,6 +94,7 @@ export default defineComponent({ data() { return { values: {}, + i18n, }; }, diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue index 8d7861ea1b..1a1cc5e612 100644 --- a/packages/client/src/components/MkMediaCaption.vue +++ b/packages/client/src/components/MkMediaCaption.vue @@ -79,7 +79,8 @@ export default defineComponent({ data() { return { - inputValue: this.input.default ? this.input.default : null + inputValue: this.input.default ? this.input.default : null, + i18n, }; }, diff --git a/packages/client/src/components/MkPostFormAttaches.vue b/packages/client/src/components/MkPostFormAttaches.vue index 56bbef3f25..8aba4a99ac 100644 --- a/packages/client/src/components/MkPostFormAttaches.vue +++ b/packages/client/src/components/MkPostFormAttaches.vue @@ -42,6 +42,7 @@ export default defineComponent({ data() { return { menu: null as Promise | null, + i18n, }; }, diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue index eae1f5ba77..f5c950789d 100644 --- a/packages/client/src/pages/about.emojis.vue +++ b/packages/client/src/pages/about.emojis.vue @@ -58,6 +58,7 @@ export default defineComponent({ tags: emojiTags, selectedTags: new Set(), searchEmojis: null, + i18n, }; }, diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue index 79667d6ab5..4309ecce6d 100644 --- a/packages/client/src/pages/admin/metrics.vue +++ b/packages/client/src/pages/admin/metrics.vue @@ -133,6 +133,7 @@ export default defineComponent({ overviewHeight: '1fr', queueHeight: '1fr', paused: false, + i18n, }; }, @@ -205,7 +206,7 @@ export default defineComponent({ pointRadius: 0, tension: 0, borderWidth: 2, - borderColor: '#935dbf', + borderColor: '#ebbcba', borderDash: [5, 5], fill: false, data: [], diff --git a/packages/client/src/pages/page-editor/page-editor.container.vue b/packages/client/src/pages/page-editor/page-editor.container.vue index d959551bf6..c979c16605 100644 --- a/packages/client/src/pages/page-editor/page-editor.container.vue +++ b/packages/client/src/pages/page-editor/page-editor.container.vue @@ -81,11 +81,11 @@ export default defineComponent({ } &.warn { - border: solid 2px #dec44c; + border: solid 2px #f6c177; } &.error { - border: solid 2px #f00; + border: solid 2px #eb6f92; } & + .cpjygsrt { @@ -131,14 +131,14 @@ export default defineComponent({ } > .warn { - color: #b19e49; + color: #ea9d34; margin: 0; padding: 16px 16px 0 16px; font-size: 14px; } > .error { - color: #f00; + color: #b4637a; margin: 0; padding: 16px 16px 0 16px; font-size: 14px; diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue index b6b917d824..7bcaa17ee7 100644 --- a/packages/client/src/pages/welcome.entrance.b.vue +++ b/packages/client/src/pages/welcome.entrance.b.vue @@ -65,6 +65,7 @@ export default defineComponent({ stats: null, tags: [], onlineUsersCount: null, + i18n, }; }, diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index ba5b9bf0f4..a61c9ebc93 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -85,6 +85,7 @@ export default defineComponent({ stats: null, tags: [], onlineUsersCount: null, + i18n, }; }, diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue index 05b666ed55..8bb2c36e1b 100644 --- a/packages/client/src/ui/classic.header.vue +++ b/packages/client/src/ui/classic.header.vue @@ -60,6 +60,7 @@ export default defineComponent({ connection: null, navbarItemDef: navbarItemDef, settingsWindowed: false, + i18n, }; }, diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue index e7f825700c..e4e1d4d887 100644 --- a/packages/client/src/ui/classic.sidebar.vue +++ b/packages/client/src/ui/classic.sidebar.vue @@ -66,6 +66,7 @@ export default defineComponent({ navbarItemDef: navbarItemDef, iconOnly: false, settingsWindowed: false, + i18n, }; }, diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue index 05da331355..04ca34b556 100644 --- a/packages/client/src/ui/classic.widgets.vue +++ b/packages/client/src/ui/classic.widgets.vue @@ -29,6 +29,7 @@ export default defineComponent({ data() { return { editMode: false, + i18n, }; }, diff --git a/packages/client/src/ui/visitor.vue b/packages/client/src/ui/visitor.vue index ec9150d346..767c9ddbb5 100644 --- a/packages/client/src/ui/visitor.vue +++ b/packages/client/src/ui/visitor.vue @@ -8,6 +8,7 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import DesignA from './visitor/a.vue'; import DesignB from './visitor/b.vue'; import XCommon from './_common_/common.vue'; +import { i18n } from '@/i18n'; export default defineComponent({ components: { diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue index 06b4a1fd02..6048535b76 100644 --- a/packages/client/src/ui/visitor/a.vue +++ b/packages/client/src/ui/visitor/a.vue @@ -70,6 +70,7 @@ export default defineComponent({ }, mainRouter, isDesktop: window.innerWidth >= DESKTOP_THRESHOLD, + i18n, }; }, diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue index 79e4a42910..0eb7f1c897 100644 --- a/packages/client/src/ui/visitor/header.vue +++ b/packages/client/src/ui/visitor/header.vue @@ -61,6 +61,7 @@ export default defineComponent({ return { narrow: null, showMenu: false, + i18n, isTimelineAvailable: !instance.disableLocalTimeline || !instance.disableRecommendedTimeline || !instance.disableGlobalTimeline, }; }, diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue index d3f310f17c..74f8761ce3 100644 --- a/packages/client/src/ui/visitor/kanban.vue +++ b/packages/client/src/ui/visitor/kanban.vue @@ -82,6 +82,7 @@ export default defineComponent({ endpoint: 'announcements', limit: 10, }, + i18n, }; },