From bd77f3a1a6b341612949cd28237a4efbd2ce2bb4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 15:45:44 +0300 Subject: fix i18n for good?? --- src/i18n/messages.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 2a1161be..c5997230 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - te: () => import('./te.json'), + //te: () => import('./te.json'), // buggy uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') @@ -41,12 +41,12 @@ const loaders = { const messages = { languages: ['en', ...Object.keys(loaders)], default: { - en: require('./en.json') + en: require('./en.json').default }, setLanguage: async (i18n, language) => { if (loaders[language]) { let messages = await loaders[language]() - i18n.setLocaleMessage(language, messages) + i18n.setLocaleMessage(language, messages.default) } i18n.locale = language } -- cgit v1.2.3-70-g09d2 From b213d25711efdbf275c5092fbc3983792476eec9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 15:47:52 +0300 Subject: heck --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index c5997230..869eaec4 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - //te: () => import('./te.json'), // buggy + // te: () => import('./te.json'), // buggy uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') -- cgit v1.2.3-70-g09d2 From 853f5145be2296911862a845d45fbb0242a62ade Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 6 Apr 2022 18:43:47 +0300 Subject: fix tegulu --- src/i18n/messages.js | 2 +- src/i18n/te.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 869eaec4..977b8eb3 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -32,7 +32,7 @@ const loaders = { pt: () => import('./pt.json'), ro: () => import('./ro.json'), ru: () => import('./ru.json'), - // te: () => import('./te.json'), // buggy + te: () => import('./te.json'), uk: () => import('./uk.json'), zh: () => import('./zh.json'), zh_Hant: () => import('./zh_Hant.json') diff --git a/src/i18n/te.json b/src/i18n/te.json index 1216de59..4f255505 100644 --- a/src/i18n/te.json +++ b/src/i18n/te.json @@ -49,7 +49,7 @@ "notifications.repeated_you": "మీ స్థితిని పునరావృతం చేసారు", "notifications.no_more_notifications": "ఇక నోటిఫికేషన్లు లేవు", "post_status.new_status": "క్రొత్త స్థితిని పోస్ట్ చేయండి", - "post_status.account_not_locked_warning": "మీ ఖాతా {౦} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.", + "post_status.account_not_locked_warning": "మీ ఖాతా {0} కాదు. ఎవరైనా మిమ్మల్ని అనుసరించి అనుచరులకు మాత్రమే ఉద్దేశించిన పోస్టులను చూడవచ్చు.", "post_status.account_not_locked_warning_link": "తాళం వేయబడినది", "post_status.attachments_sensitive": "జోడింపులను సున్నితమైనవిగా గుర్తించండి", "post_status.content_type.text/plain": "సాధారణ అక్షరాలు", -- cgit v1.2.3-70-g09d2 From 4ddb6189dc09e03aba5e3da1d2dd2e06e7020b24 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 17:06:41 -0400 Subject: Fix no reactivity on vuex 4 values --- src/App.js | 2 +- src/components/side_drawer/side_drawer.js | 2 +- src/modules/shout.js | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/App.js b/src/App.js index c4360af5..294f6000 100644 --- a/src/App.js +++ b/src/App.js @@ -65,7 +65,7 @@ export default { } } }, - shout () { return this.$store.state.shout.channel.state === 'joined' }, + shout () { return this.$store.state.shout.joined }, suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel && diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 89719df3..bad1806b 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -49,7 +49,7 @@ const SideDrawer = { currentUser () { return this.$store.state.users.currentUser }, - shout () { return this.$store.state.shout.channel.state === 'joined' }, + shout () { return this.$store.state.shout.joined }, unseenNotifications () { return unseenNotificationsFromStore(this.$store) }, diff --git a/src/modules/shout.js b/src/modules/shout.js index 507a4d83..88aefbfe 100644 --- a/src/modules/shout.js +++ b/src/modules/shout.js @@ -1,7 +1,8 @@ const shout = { state: { messages: [], - channel: { state: '' } + channel: { state: '' }, + joined: false }, mutations: { setChannel (state, channel) { @@ -13,11 +14,23 @@ const shout = { }, setMessages (state, messages) { state.messages = messages.slice(-19, 20) + }, + setJoined (state, joined) { + state.joined = joined } }, actions: { initializeShout (store, socket) { const channel = socket.channel('chat:public') + channel.joinPush.receive('ok', () => { + store.commit('setJoined', true) + }) + channel.onClose(() => { + store.commit('setJoined', false) + }) + channel.onError(() => { + store.commit('setJoined', false) + }) channel.on('new_msg', (msg) => { store.commit('addMessage', msg) }) -- cgit v1.2.3-70-g09d2 From 041c72b07c7d0559bd5b97c49503e69707aa08b2 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 20:04:36 -0400 Subject: Fix dropdown menu style inside panel header --- src/components/popover/popover.vue | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src') diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 8588b351..1502c30c 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -149,5 +149,30 @@ } } + + .button-default.dropdown-item { + &, + i[class*=icon-] { + color: $fallback--text; + color: var(--btnText, $fallback--text); + } + + &:active { + background-color: $fallback--fg; + background-color: var(--btnPressed, $fallback--fg); + color: $fallback--text; + color: var(--btnPressedText, $fallback--text); + } + + &:disabled { + color: $fallback--text; + color: var(--btnDisabledText, $fallback--text); + } + + &.toggled { + color: $fallback--text; + color: var(--btnToggledText, $fallback--text); + } + } } -- cgit v1.2.3-70-g09d2 From 6de87e8b658a203a471af0210b6677d22aef9ebb Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 20:26:37 -0400 Subject: Use panel text instead of text for shoutbox icon --- src/components/shout_panel/shout_panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue index c88797d1..f3e9ff96 100644 --- a/src/components/shout_panel/shout_panel.vue +++ b/src/components/shout_panel/shout_panel.vue @@ -98,7 +98,7 @@ .icon { color: $fallback--text; - color: var(--text, $fallback--text); + color: var(--panelText, $fallback--text); margin-right: 0.5em; } -- cgit v1.2.3-70-g09d2 From fce9c5eeb2092a3c66609afbed81f933b6bec069 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 22:50:01 -0400 Subject: Fix active popover style --- src/components/popover/popover.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 1502c30c..332a0398 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -158,10 +158,10 @@ } &:active { - background-color: $fallback--fg; - background-color: var(--btnPressed, $fallback--fg); - color: $fallback--text; - color: var(--btnPressedText, $fallback--text); + background-color: $fallback--lightBg; + background-color: var(--selectedMenuPopover, $fallback--lightBg); + color: $fallback--link; + color: var(--selectedMenuPopoverText, $fallback--link); } &:disabled { -- cgit v1.2.3-70-g09d2