From 90245273ab7fbdd65c7021a2014e93909e3008b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@mailbox.org>
Date: Fri, 10 Sep 2021 21:51:45 +0200
Subject: [PATCH] Don't rely on Vue.prototype.t
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raimund Schlüßler <raimund.schluessler@mailbox.org>
---
 docs/index.md                                              | 2 --
 src/components/AppNavigationItem/InputConfirmCancel.vue    | 2 ++
 src/components/AppSettingsDialog/AppSettingsDialog.vue     | 2 ++
 src/components/DatetimePicker/DatetimePicker.vue           | 4 ++++
 src/components/RichContenteditable/RichContenteditable.vue | 2 +-
 src/components/SettingsSelectGroup/SettingsSelectGroup.vue | 2 ++
 styleguide/global.requires.js                              | 3 ---
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 38a463eb5f..92d66c0d58 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -37,8 +37,6 @@ import Avatar from '@nextcloud/vue/dist/Components/Avatar'
 Some components require Nextcloud functionality to work, so it is currently recommended to extend Vue with the following:
 
 ```js static
-Vue.prototype.t = window.t
-Vue.prototype.n = window.n
 Vue.prototype.OC = window.OC
 Vue.prototype.OCA = window.OCA
 ```
diff --git a/src/components/AppNavigationItem/InputConfirmCancel.vue b/src/components/AppNavigationItem/InputConfirmCancel.vue
index db24f53782..786cd1853c 100644
--- a/src/components/AppNavigationItem/InputConfirmCancel.vue
+++ b/src/components/AppNavigationItem/InputConfirmCancel.vue
@@ -55,6 +55,8 @@
 	</div>
 </template>
 <script>
+import { t } from '../../l10n'
+
 import ArrowRight from 'vue-material-design-icons/ArrowRight'
 import Close from 'vue-material-design-icons/Close'
 
diff --git a/src/components/AppSettingsDialog/AppSettingsDialog.vue b/src/components/AppSettingsDialog/AppSettingsDialog.vue
index ae9daa3ef7..94b0fab571 100644
--- a/src/components/AppSettingsDialog/AppSettingsDialog.vue
+++ b/src/components/AppSettingsDialog/AppSettingsDialog.vue
@@ -54,6 +54,8 @@ export default {
 <script>
 import Modal from '../Modal'
 import isMobile from '../../mixins/isMobile'
+import { t } from '../../l10n'
+
 import debounce from 'debounce'
 
 export default {
diff --git a/src/components/DatetimePicker/DatetimePicker.vue b/src/components/DatetimePicker/DatetimePicker.vue
index ddc54ece74..7e7f5013a2 100644
--- a/src/components/DatetimePicker/DatetimePicker.vue
+++ b/src/components/DatetimePicker/DatetimePicker.vue
@@ -150,6 +150,8 @@ import DatePicker from 'vue2-datepicker'
 import Popover from '../Popover/index'
 import TimezonePicker from '../TimezonePicker'
 
+import l10n from '../../mixins/l10n'
+
 export default {
 	name: 'DatetimePicker',
 
@@ -159,6 +161,8 @@ export default {
 		TimezonePicker,
 	},
 
+	mixins: [l10n],
+
 	inheritAttrs: false,
 
 	props: {
diff --git a/src/components/RichContenteditable/RichContenteditable.vue b/src/components/RichContenteditable/RichContenteditable.vue
index 8a493bc474..c0ddde54da 100644
--- a/src/components/RichContenteditable/RichContenteditable.vue
+++ b/src/components/RichContenteditable/RichContenteditable.vue
@@ -148,7 +148,7 @@ import Tribute from 'tributejs/dist/tribute.esm'
 import debounce from 'debounce'
 import stringLength from 'string-length'
 
-import { t } from '../../l10n.js'
+import { t } from '../../l10n'
 import AutoCompleteResult from './AutoCompleteResult'
 import richEditor from '../../mixins/richEditor/index'
 
diff --git a/src/components/SettingsSelectGroup/SettingsSelectGroup.vue b/src/components/SettingsSelectGroup/SettingsSelectGroup.vue
index eeb5bf4624..6a9203a508 100644
--- a/src/components/SettingsSelectGroup/SettingsSelectGroup.vue
+++ b/src/components/SettingsSelectGroup/SettingsSelectGroup.vue
@@ -48,6 +48,8 @@ import GenRandomId from '../../utils/GenRandomId'
 import { generateOcsUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import l10n from '../../mixins/l10n'
+import { t } from '../../l10n'
+
 export default {
 	name: 'SettingsSelectGroup',
 	components: {
diff --git a/styleguide/global.requires.js b/styleguide/global.requires.js
index 596b4ec85c..ee27487374 100644
--- a/styleguide/global.requires.js
+++ b/styleguide/global.requires.js
@@ -86,9 +86,6 @@ window.OC = {
 window.OCA = {}
 window.appName = 'nextcloud-vue'
 
-window.t = (app, text) => text
-
-Vue.prototype.t = window.t
 Vue.prototype.OC = window.OC
 Vue.prototype.OCA = window.OCA