From 26ba671ff5d377496da0ab430991c4389fd0ec0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 02:48:37 +0000 Subject: [PATCH 01/12] Bump http-proxy from 1.18.0 to 1.18.1 Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1) Signed-off-by: dependabot[bot] --- yarn.lock | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index e030c3b..8a2d383 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2144,7 +2144,7 @@ debug@=3.1.0: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2796,9 +2796,9 @@ event-emitter@~0.3.5: es5-ext "~0.10.14" eventemitter3@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" - integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: version "3.0.0" @@ -3244,11 +3244,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.0.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f" - integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A== - dependencies: - debug "^3.0.0" + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== for-in@^0.1.3: version "0.1.8" @@ -3933,9 +3931,9 @@ http-proxy-middleware@^0.19.1: micromatch "^3.1.10" http-proxy@^1.17.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" - integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: eventemitter3 "^4.0.0" follow-redirects "^1.0.0" From f0abe951317bd0de03303e615bef84526ba5ccb0 Mon Sep 17 00:00:00 2001 From: Fabian Sander Date: Tue, 13 Oct 2020 12:43:32 +0200 Subject: [PATCH 02/12] Add translation handling for vue components --- resources/js/components/Comment.vue | 14 ++++++++------ resources/js/components/Tool.vue | 16 ++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/resources/js/components/Comment.vue b/resources/js/components/Comment.vue index a07b961..8f850cd 100644 --- a/resources/js/components/Comment.vue +++ b/resources/js/components/Comment.vue @@ -4,11 +4,11 @@ {{ date }} @@ -45,23 +45,25 @@ }, date() { + const language = Nova.app.__('Moment Locale'); + moment.locale(language) let now = moment(); let date = moment.utc(_.find(this.comment.fields, { attribute: 'created_at' }).value) .tz(moment.tz.guess()); if (date.isSame(now, 'minute')) { - return 'just now'; + return Nova.app.__('just now'); } if (date.isSame(now, 'day')) { - return `at ${date.format('LT')}`; + return Nova.app.__('at') + ' ' + date.format('LT'); } if (date.isSame(now, 'year')) { - return `on ${date.format('MMM D')}`; + return Nova.app.__('on') + ' ' + (language === 'de' ? date.format('D MMM') : date.format('MMM D')); } - return `on ${date.format('ll')}`; + return Nova.app.__('on') + ' ' + date.format('ll'); }, hasCommenter() { diff --git a/resources/js/components/Tool.vue b/resources/js/components/Tool.vue index ad330bf..c169ebe 100644 --- a/resources/js/components/Tool.vue +++ b/resources/js/components/Tool.vue @@ -1,14 +1,14 @@