Merge pull request #1804 from nextcloud/fix/1776/bump-nextcloud-vue

Update nextcloud/vue, cleanup hacks
nextcloud · Sep 29, 2021 · c5212c9 · c5212c9
2 parents 6811c50 + 45d5bfc
commit c5212c9
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
 		"@nextcloud/logger": "^2.0.0",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^4.1.1",
+		"@nextcloud/vue": "^4.2.0",
 		"@nextcloud/vue-dashboard": "^2.0.1",
 		"@vue/test-utils": "^1.2.1",
 		"cdav-library": "github:nextcloud/cdav-library",

diff --git a/src/components/AppNavigation/AppNavigationSettings.vue b/src/components/AppNavigation/AppNavigationSettings.vue
@@ -122,10 +122,13 @@ export default {
 			calendars: 'getSortedWritableCalendars',
 		}),
 	},
-	methods:
-		mapActions([
+	methods: {
+		t,
+
+		...mapActions([
 			'setVisibility',
 		]),
+	},
 }
 </script>
 

diff --git a/src/components/AppNavigation/CalendarSharee.vue b/src/components/AppNavigation/CalendarSharee.vue
@@ -108,6 +108,8 @@ export default {
 		},
 	},
 	methods: {
+		t,
+
 		async deleteSharee() {
 			if (this.loading) {
 				return false

diff --git a/src/components/AppNavigation/Trashbin.vue b/src/components/AppNavigation/Trashbin.vue
@@ -101,7 +101,7 @@ import { uidToHexColor } from '../../utils/color'
 import logger from '../../utils/logger'
 
 import { showError } from '@nextcloud/dialogs'
-import { translate as t } from '@nextcloud/l10n'
+import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
 import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
@@ -187,6 +187,9 @@ export default {
 		},
 	},
 	methods: {
+		t,
+		n,
+
 		async onShow() {
 			this.showModal = true
 

diff --git a/src/main.js b/src/main.js
@@ -97,12 +97,6 @@ if (!OCA.Tasks) {
 	OCA.Tasks = {}
 }
 
-Vue.prototype.t = function() {
-	return t.apply(null, arguments).toString()
-}
-Vue.prototype.n = function() {
-	return n.apply(null, arguments).toString()
-}
 Vue.prototype.$OC = OC
 Vue.prototype.$OCA = OCA
 Vue.prototype.$appVersion = appVersion

diff --git a/src/views/AppNavigation.vue b/src/views/AppNavigation.vue
@@ -456,10 +456,6 @@ export default {
 <style lang="scss" scoped>
 $color-error: #e9322d;
 
-#app-settings::v-deep #app-settings-header .settings-button {
-	padding-left: 50px;
-}
-
 .collection::v-deep {
 	&.collection--edit {
 		.app-navigation-entry-link {