From 25f9cc5ddcce9de216f3e89fdf3e5080c5a5a2c7 Mon Sep 17 00:00:00 2001 From: SebinSong Date: Mon, 27 Jan 2025 17:56:49 +0900 Subject: [PATCH 1/6] correct the sentences --- frontend/views/containers/dashboard/GroupMembersActivity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/views/containers/dashboard/GroupMembersActivity.vue b/frontend/views/containers/dashboard/GroupMembersActivity.vue index e2296fe45..0a43f0772 100644 --- a/frontend/views/containers/dashboard/GroupMembersActivity.vue +++ b/frontend/views/containers/dashboard/GroupMembersActivity.vue @@ -164,8 +164,8 @@ export default ({ ? L('{span_}1 member{_span} hasn\'t {strong_} entered income details{_strong}', argsMap['noIncomeDetails']) : L('{span_}{membercount} members{_span} haven\'t {strong_} entered income details{_strong}', argsMap['noIncomeDetails']), 'missedPayments': this.missedPayments.length === 1 - ? L('{span_}1 member{_span} has {strong_} missed payments {_strong}', argsMap['missedPayments']) - : L('{span_}{membercount} members{_span} have {strong_} missed payments {_strong}', argsMap['missedPayments']), + ? L('{span_}1 member{_span} has {strong_} missed their payments {_strong}', argsMap['missedPayments']) + : L('{span_}{membercount} members{_span} have {strong_} missed their payments {_strong}', argsMap['missedPayments']), 'noVotes': this.noVotes.length === 1 ? L('{span_}1 member{_span} hasn\'t {strong_} voted in the last {proposalcount} proposals {_strong}', argsMap['noVotes']) : L('{span_}{membercount} members{_span} haven\'t {strong_} voted in the last {proposalcount} proposals {_strong}', argsMap['noVotes']) From b1c8ae5eb356d7283532e12d9c4df0e6550aa34c Mon Sep 17 00:00:00 2001 From: SebinSong Date: Tue, 28 Jan 2025 07:47:45 +0900 Subject: [PATCH 2/6] change the constant to 1 --- frontend/model/contracts/shared/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/model/contracts/shared/constants.js b/frontend/model/contracts/shared/constants.js index 0e7914c4e..eb3e58274 100644 --- a/frontend/model/contracts/shared/constants.js +++ b/frontend/model/contracts/shared/constants.js @@ -53,7 +53,7 @@ export const STATUS_EXPIRED = 'expired' export const STATUS_CANCELLED = 'cancelled' export const STREAK_ON_TIME_PAYMENTS = 1 -export const STREAK_MISSED_PAYMENTS = 2 +export const STREAK_MISSED_PAYMENTS = 1 export const STREAK_MISSED_PROPSAL_VOTE = 2 export const STREAK_NOT_LOGGED_IN_DAYS = 14 From c1298d08e835fab90fa73cb409d2230617c954d8 Mon Sep 17 00:00:00 2001 From: SebinSong Date: Tue, 28 Jan 2025 10:47:22 +0900 Subject: [PATCH 3/6] add a comment --- frontend/model/contracts/shared/constants.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/model/contracts/shared/constants.js b/frontend/model/contracts/shared/constants.js index eb3e58274..63518fb45 100644 --- a/frontend/model/contracts/shared/constants.js +++ b/frontend/model/contracts/shared/constants.js @@ -52,6 +52,8 @@ export const STATUS_EXPIRING = 'expiring' // Only useful to notify users that th export const STATUS_EXPIRED = 'expired' export const STATUS_CANCELLED = 'cancelled' +// group-streaks related + export const STREAK_ON_TIME_PAYMENTS = 1 export const STREAK_MISSED_PAYMENTS = 1 export const STREAK_MISSED_PROPSAL_VOTE = 2 From f4bd75945f4624a8eec74f9181a254f69a8ed43f Mon Sep 17 00:00:00 2001 From: SebinSong Date: Tue, 28 Jan 2025 11:22:32 +0900 Subject: [PATCH 4/6] update comment for flaky cypress --- frontend/model/contracts/shared/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/model/contracts/shared/constants.js b/frontend/model/contracts/shared/constants.js index 63518fb45..95a515c1a 100644 --- a/frontend/model/contracts/shared/constants.js +++ b/frontend/model/contracts/shared/constants.js @@ -52,7 +52,7 @@ export const STATUS_EXPIRING = 'expiring' // Only useful to notify users that th export const STATUS_EXPIRED = 'expired' export const STATUS_CANCELLED = 'cancelled' -// group-streaks related +// group-streak related export const STREAK_ON_TIME_PAYMENTS = 1 export const STREAK_MISSED_PAYMENTS = 1 From 043c538063201d5ea4b210a65f352cfafd2b1e01 Mon Sep 17 00:00:00 2001 From: SebinSong Date: Tue, 28 Jan 2025 11:26:44 +0900 Subject: [PATCH 5/6] comment update again --- frontend/model/contracts/shared/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/model/contracts/shared/constants.js b/frontend/model/contracts/shared/constants.js index 95a515c1a..63518fb45 100644 --- a/frontend/model/contracts/shared/constants.js +++ b/frontend/model/contracts/shared/constants.js @@ -52,7 +52,7 @@ export const STATUS_EXPIRING = 'expiring' // Only useful to notify users that th export const STATUS_EXPIRED = 'expired' export const STATUS_CANCELLED = 'cancelled' -// group-streak related +// group-streaks related export const STREAK_ON_TIME_PAYMENTS = 1 export const STREAK_MISSED_PAYMENTS = 1 From a04fafdf1b13eed32111752200af9551c1cca70d Mon Sep 17 00:00:00 2001 From: SebinSong Date: Wed, 29 Jan 2025 07:59:06 +0900 Subject: [PATCH 6/6] revert string updates --- frontend/views/containers/dashboard/GroupMembersActivity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/views/containers/dashboard/GroupMembersActivity.vue b/frontend/views/containers/dashboard/GroupMembersActivity.vue index 0a43f0772..e2296fe45 100644 --- a/frontend/views/containers/dashboard/GroupMembersActivity.vue +++ b/frontend/views/containers/dashboard/GroupMembersActivity.vue @@ -164,8 +164,8 @@ export default ({ ? L('{span_}1 member{_span} hasn\'t {strong_} entered income details{_strong}', argsMap['noIncomeDetails']) : L('{span_}{membercount} members{_span} haven\'t {strong_} entered income details{_strong}', argsMap['noIncomeDetails']), 'missedPayments': this.missedPayments.length === 1 - ? L('{span_}1 member{_span} has {strong_} missed their payments {_strong}', argsMap['missedPayments']) - : L('{span_}{membercount} members{_span} have {strong_} missed their payments {_strong}', argsMap['missedPayments']), + ? L('{span_}1 member{_span} has {strong_} missed payments {_strong}', argsMap['missedPayments']) + : L('{span_}{membercount} members{_span} have {strong_} missed payments {_strong}', argsMap['missedPayments']), 'noVotes': this.noVotes.length === 1 ? L('{span_}1 member{_span} hasn\'t {strong_} voted in the last {proposalcount} proposals {_strong}', argsMap['noVotes']) : L('{span_}{membercount} members{_span} haven\'t {strong_} voted in the last {proposalcount} proposals {_strong}', argsMap['noVotes'])