Skip to content

Commit 18b41f3

Browse files
committed
fix: missing l10n due to early @nextcloud/l10n import
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
1 parent badfed3 commit 18b41f3

10 files changed

Lines changed: 21 additions & 25 deletions

File tree

src/authentication/renderer/AuthenticationApp.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ async function login() {
158158
</script>
159159
160160
<template>
161-
<AppWindow class="wrapper">
161+
<AppWindow :title="t('talk_desktop', 'Authentication')" class="wrapper">
162162
<div class="spacer">
163163
<div class="logo" />
164164
</div>

src/authentication/renderer/authentication.main.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { t } from '@nextcloud/l10n'
76
import { createApp } from 'vue'
87
import { setupWebPage } from '../../shared/setupWebPage.js'
98

109
import '../../shared/assets/global.styles.css'
1110

12-
await setupWebPage({
13-
title: () => t('talk_desktop', 'Authentication'),
14-
})
11+
await setupWebPage()
1512

1613
const { default: AuthenticationApp } = await import('./AuthenticationApp.vue')
1714

src/certificate/renderer/CertificateApp.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const isAdvanced = ref(false)
3030
</script>
3131

3232
<template>
33-
<AppWindow class="certificate">
33+
<AppWindow :title="t('talk_desktop', 'Security warning')" class="certificate">
3434
<h2 class="certificate__heading">
3535
{{ t('talk_desktop', 'Warning: potential security risk') }}
3636
</h2>

src/certificate/renderer/certificate.main.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { t } from '@nextcloud/l10n'
76
import { createApp } from 'vue'
87
import { setupWebPage } from '../../shared/setupWebPage.js'
98

109
import '../../shared/assets/global.styles.css'
1110

12-
await setupWebPage({
13-
title: () => t('talk_desktop', 'Security warning'),
14-
})
11+
await setupWebPage()
1512

1613
const { default: CertificateApp } = await import('./CertificateApp.vue')
1714

src/help/renderer/HelpApp.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function close() {
4141
</script>
4242

4343
<template>
44-
<AppWindow class="help">
44+
<AppWindow :title="t('talk_desktop', 'About')" class="help">
4545
<div class="help__title-bar" :class="{ 'help__title-bar--mac': isMac }">
4646
<NcButton
4747
:aria-label="t('talk_desktop', 'Close')"

src/help/renderer/help.app.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { t } from '@nextcloud/l10n'
76
import { createApp } from 'vue'
87
import { setupWebPage } from '../../shared/setupWebPage.js'
98

109
import '../../shared/assets/global.styles.css'
1110
import './help.styles.css'
1211

13-
await setupWebPage({
14-
title: () => t('talk_desktop', 'About'),
15-
})
12+
await setupWebPage()
1613

1714
const { default: HelpApp } = await import('./HelpApp.vue')
1815

src/shared/components/AppWindow.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
- SPDX-License-Identifier: AGPL-3.0-or-later
44
-->
55

6+
<script setup lang="ts">
7+
import { watchEffect } from 'vue'
8+
9+
const props = defineProps<{
10+
title?: string
11+
}>()
12+
13+
watchEffect(async () => {
14+
document.title = await window.TALK_DESKTOP.buildTitle(props.title)
15+
})
16+
</script>
17+
618
<template>
719
<div class="window">
820
<slot />

src/shared/setupWebPage.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,16 +213,11 @@ function applyDownloadLinkHandler() {
213213

214214
/**
215215
* Make all required initial setup for the web page for authorized user: server-rendered data, globals and ect.
216-
*
217-
* @param {() => string} [title] - Getter for a custom title
218216
*/
219-
export async function setupWebPage({
220-
title,
221-
} = {}) {
217+
export async function setupWebPage() {
222218
appData.fromJSON(await window.TALK_DESKTOP.getAppData())
223219
await initAppConfig()
224220
await applyL10n()
225-
document.title = await window.TALK_DESKTOP.buildTitle(title?.())
226221
applyInitialState()
227222
initGlobals()
228223
applyUserData()

src/upgrade/renderer/UpgradeApp.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const browserLink = generateUrl('/apps/spreed')
1717
</script>
1818

1919
<template>
20-
<AppWindow class="upgrade">
20+
<AppWindow :title="t('talk_desktop', 'Upgrade required')" class="upgrade">
2121
<div class="upgrade__content">
2222
<h2 class="upgrade__heading">
2323
{{ t('talk_desktop', 'Upgrade required') }}

src/upgrade/renderer/upgrade.main.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import { setupWebPage } from '../../shared/setupWebPage.js'
99

1010
import '../../shared/assets/global.styles.css'
1111

12-
await setupWebPage({
13-
title: () => t('talk_desktop', 'Upgrade required'),
14-
})
12+
await setupWebPage()
1513

1614
const { default: UpgradeApp } = await import('./UpgradeApp.vue')
1715

0 commit comments

Comments
 (0)