Merge pull request #1936 from nextcloud/tintou/nextcloud/moment

Replace the deprecated OC.Util.relativeModifiedDate by nextcloud/moment

3 files changed, 61 insertions, 2 deletions

diff --git a/package-lock.json b/package-lock.json
index 54112809..3e464272 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3792,6 +3792,57 @@
 				"node-gettext": "^3.0.0"
 			}
 		},
+		"@nextcloud/moment": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/moment/-/moment-1.1.1.tgz",
+			"integrity": "sha512-lh7Xn9Ver12pLfE0rpjxE6x/ipscAV+7fw1u+7TJak1QR1T1UDRMZ9dA7z77W8mZH2C3yveTh/VEHZIflKBrng==",
+			"requires": {
+				"@nextcloud/l10n": "1.2.0",
+				"core-js": "3.6.4",
+				"jed": "^1.1.1",
+				"moment": "2.24.0",
+				"node-gettext": "^2.0.0"
+			},
+			"dependencies": {
+				"@nextcloud/l10n": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.2.0.tgz",
+					"integrity": "sha512-aPsVAewCYMNe2h0yse3Fj7LofvnvFPimojw24K47ip1+I1gawMIsQL+BYAnN8wzlcbsDTEc7I1FxtOh+8dHHIA==",
+					"requires": {
+						"core-js": "^3.6.4",
+						"node-gettext": "^3.0.0"
+					},
+					"dependencies": {
+						"node-gettext": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz",
+							"integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==",
+							"requires": {
+								"lodash.get": "^4.4.2"
+							}
+						}
+					}
+				},
+				"core-js": {
+					"version": "3.6.4",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+					"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+				},
+				"moment": {
+					"version": "2.24.0",
+					"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+					"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+				},
+				"node-gettext": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-2.1.0.tgz",
+					"integrity": "sha512-vsHImHl+Py0vB7M2UXcFEJ5NJ3950gcja45YclBFtYxYeZiqdfQdcu+G9s4L7jpRFSh/J/7VoS3upR4JM1nS+g==",
+					"requires": {
+						"lodash.get": "^4.4.2"
+					}
+				}
+			}
+		},
 		"@nextcloud/paths": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@nextcloud/paths/-/paths-1.1.2.tgz",
@@ -4969,7 +5020,7 @@
 		},
 		"cdav-library": {
 			"version": "git+https://github.com/nextcloud/cdav-library.git#a4f68e91ede952e04867cb3519382c354393c295",
-			"from": "git+https://github.com/nextcloud/cdav-library.git#a4f68e91ede952e04867cb3519382c354393c295",
+			"from": "git+https://github.com/nextcloud/cdav-library.git",
 			"requires": {
 				"core-js": "^3.6.5",
 				"regenerator-runtime": "^0.13.7"
@@ -8729,6 +8780,11 @@
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
 			"dev": true
 		},
+		"jed": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
+			"integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ="
+		},
 		"js-base64": {
 			"version": "2.6.4",
 			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
diff --git a/package.json b/package.json
index d5bd1dd5..f9aced55 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
 		"@nextcloud/dialogs": "^3.1.1",
 		"@nextcloud/initial-state": "^1.2.0",
 		"@nextcloud/l10n": "^1.4.1",
+		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/paths": "^1.1.2",
 		"@nextcloud/router": "^1.2.0",
 		"@nextcloud/vue": "^3.2.0",
diff --git a/src/components/Properties/PropertyRev.vue b/src/components/Properties/PropertyRev.vue
index 4841e346..feb17965 100644
--- a/src/components/Properties/PropertyRev.vue
+++ b/src/components/Properties/PropertyRev.vue
@@ -27,6 +27,8 @@
 </template>
 
 <script>
+import moment from '@nextcloud/moment'
+
 export default {
 	name: 'PropertyRev',
 
@@ -39,7 +41,7 @@ export default {
 
 	computed: {
 		relativeDate() {
-			return OC.Util.relativeModifiedDate(this.value.toUnixTime() * 1000)
+			return moment.unix(this.value.toUnixTime()).fromNow()
 		},
 	},
 }