From af64b01d84ecba8fcfd5572b9467effcaa7fccdc Mon Sep 17 00:00:00 2001 From: Mike Liao Date: Thu, 27 Jun 2024 10:57:20 -0700 Subject: [PATCH] merging --- frontend/src/lang/en.js | 108 ++++++++-------- frontend/src/lang/zh.js | 36 +++--- frontend/src/pages/public/About.vue | 2 +- .../src/pages/user/account/UserHistory.vue | 34 ++--- .../src/pages/user/account/UserProfile.vue | 114 +++++++++-------- frontend/src/pages/user/messages/Home.vue | 4 +- frontend/src/pages/user/providers/Home.vue | 118 ++++++++++-------- frontend/src/pages/user/requests/Home.vue | 38 +++--- .../pages/user/requests/ProposalSubmitted.vue | 6 +- frontend/src/pages/user/requests/Propose.vue | 42 ++++--- .../user/workspace/projectManage/Home.vue | 7 +- .../user/workspace/proposalManage/Home.vue | 7 +- .../user/workspace/requestIssue/Issue.vue | 22 ++-- .../user/workspace/requestIssue/Submitted.vue | 6 +- .../user/workspace/requestManage/Home.vue | 7 +- .../user/workspace/requestManage/Manage.vue | 26 ++-- .../requestManage/ReviewProposal.vue | 22 ++-- 17 files changed, 329 insertions(+), 270 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 2476c22..79a929d 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -69,55 +69,57 @@ export default { 'Invalid password': 'Invalid password', 'Read More': 'Read More', 'Total earning': 'Total earning', - 'Payable': 'Payable', + Payable: 'Payable', 'Total spending': 'Total spending', - 'Deposit': 'Deposit', - 'Spending': 'Spending', - 'Updated': 'Updated', - 'Earining': 'Earining', - 'Login': 'Login', + Deposit: 'Deposit', + Spending: 'Spending', + Updated: 'Updated', + Earining: 'Earining', + Login: 'Login', 'User ID': 'User ID', - 'Email': 'Email', - 'Mobile': 'Mobile', - 'Personal': 'Personal', + Email: 'Email', + Mobile: 'Mobile', + Personal: 'Personal', 'Full name': 'Full name', - 'Portrait': 'Portrait', + Portrait: 'Portrait', 'Self-intro': 'Self-intro', 'Earning now': 'Earning now', - 'Edit': 'Edit', - 'Templates': 'Templates', - 'Cancel': 'Cancel', - 'I want to be a service provider and earn money': 'I want to be a service provider and earn money', + Edit: 'Edit', + Templates: 'Templates', + Cancel: 'Cancel', + 'I want to be a service provider and earn money': + 'I want to be a service provider and earn money', 'Stripe account onboarding is not completed.': 'Stripe account onboarding is not completed.', 'Upload QR code to receive payment': 'Upload QR code to receive payment', 'Have you linked your strip account?': 'Have you linked your strip account?', 'Visit Stripe': 'Visit Stripe', - 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.': 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.', - 'Achievement': 'Achievement', + 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.': + 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.', + Achievement: 'Achievement', 'On Freeleaps': 'On Freeleaps', - 'Connections': 'Connections', - 'Messages': 'Messages', - 'Credit': 'Credit', + Connections: 'Connections', + Messages: 'Messages', + Credit: 'Credit', '12-month spending': '12-month spending', '3-month spending': '3-month spending', - 'Posted': 'Posted', - 'Accomplished': 'Accomplished', - 'Active': 'Active', - 'Ongoing': 'Ongoing', + Posted: 'Posted', + Accomplished: 'Accomplished', + Active: 'Active', + Ongoing: 'Ongoing', '12-month earning': '12-month earning', - 'Delivered': 'Delivered', + Delivered: 'Delivered', 'Delivering time': 'Delivering time', 'Apply self-intro template': 'Apply self-intro template', - 'Apply': 'Apply', + Apply: 'Apply', 'Empty conversation': 'Empty conversation', 'Please choose conversation': 'Please choose conversation', - 'Name': 'Name', + Name: 'Name', 'Stay on Freeleaps': 'Stay on Freeleaps', 'Delivered projects': 'Delivered projects', 'Responding time': 'Responding time', 'Credit score': 'Credit score', 'Self intro': 'Self intro', - 'Profile': 'Profile', + Profile: 'Profile', 'Project delivering time': 'Project delivering time', 'Top programming languages': 'Top programming languages', 'Weekly produced code': 'Weekly produced code', @@ -131,31 +133,33 @@ export default { 'Issue fixing time': 'Issue fixing time', 'Action panel': 'Action panel', 'to my open requests': 'to my open requests', - 'Once the request is selected, the provider will be invited to see the request.': 'Once the request is selected, the provider will be invited to see the request.', - 'Issuer': 'Issuer', - 'Request': 'Request', - 'Score': 'Score', - 'Propose': 'Propose', - 'Preview': 'Preview', - 'Download': 'Download', + 'Once the request is selected, the provider will be invited to see the request.': + 'Once the request is selected, the provider will be invited to see the request.', + Issuer: 'Issuer', + Request: 'Request', + Score: 'Score', + Propose: 'Propose', + Preview: 'Preview', + Download: 'Download', 'Total payment': 'Total payment', 'Your proposal has been submitted!': 'Your proposal has been submitted!', 'You can check the status of proposals in': 'You can check the status of proposals in', 'My work.': 'My work.', 'Copy from existing proposals': 'Copy from existing proposals', - 'Copy': 'Copy', + Copy: 'Copy', 'Apply proposal template': 'Apply proposal template', - 'Proposal': 'Proposal', - 'Milestones': 'Milestones', - 'Notes': 'Notes', + Proposal: 'Proposal', + Milestones: 'Milestones', + Notes: 'Notes', 'Add Milestones': 'Add Milestones', 'Total milestones': 'Total milestones', 'Total duration': 'Total duration', 'Upload file': 'Upload file', - 'Back': 'Back', + Back: 'Back', 'Issue Request': 'Issue Request', - 'pm-1': 'This is the second item\'s accordion body.', - 'pm-2': 'It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It\'s also worth noting that just about any HTML can go within the ', + 'pm-1': "This is the second item's accordion body.", + 'pm-2': + "It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the ", 'pm-3': '.accordion-body', 'pm-4': ', though the transition does limit overflow.', 'Copy from existing request': 'Copy from existing request', @@ -163,16 +167,18 @@ export default { '(Re)Submit': '(Re)Submit', 'The request has been submitted!': 'The request has been submitted!', 'You can find it in': 'You can find it in', - 'Review your request and the associated proposals': 'Review your request and the associated proposals', - 'Title': 'Title', - 'Action': 'Action', + 'Review your request and the associated proposals': + 'Review your request and the associated proposals', + Title: 'Title', + Action: 'Action', 'Proposed by': 'Proposed by', - 'Price': 'Price', - 'Reject': 'Reject', - 'Accept': 'Accept', - 'Please review the following critical information': 'Please review the following critical information', + Price: 'Price', + Reject: 'Reject', + Accept: 'Accept', + 'Please review the following critical information': + 'Please review the following critical information', 'Payment plan proposed by the service provider': 'Payment plan proposed by the service provider', - 'Execution plan proposed by the service provider': 'Execution plan proposed by the service provider', - 'Proceed to workspace': 'Proceed to workspace', - + 'Execution plan proposed by the service provider': + 'Execution plan proposed by the service provider', + 'Proceed to workspace': 'Proceed to workspace' } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7cc8d8c..5d1809d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1,20 +1,20 @@ export default { - About: '关于我们', - Contact: '联系我们', - Blogs: '日志博客', - Career: '工作机会', - Summary: '总结', - Status: '状态', - Date: '日期', - withdraw: '撤销', - edit: '编辑', - Quote: '报价', - Payment: '支付', - Duration: '历时', - days: '日', - Update: '更新', - From: '自从', - reject: '拒绝', - accept: '接受', - Note: '标注', + About: '关于我们', + Contact: '联系我们', + Blogs: '日志博客', + Career: '工作机会', + Summary: '总结', + Status: '状态', + Date: '日期', + withdraw: '撤销', + edit: '编辑', + Quote: '报价', + Payment: '支付', + Duration: '历时', + days: '日', + Update: '更新', + From: '自从', + reject: '拒绝', + accept: '接受', + Note: '标注' } diff --git a/frontend/src/pages/public/About.vue b/frontend/src/pages/public/About.vue index f8ccdef..bfc8750 100644 --- a/frontend/src/pages/public/About.vue +++ b/frontend/src/pages/public/About.vue @@ -9,7 +9,7 @@

{{ directory.title_text }}

{{ directory.summary_text }}

- + diff --git a/frontend/src/pages/user/account/UserHistory.vue b/frontend/src/pages/user/account/UserHistory.vue index 1367f73..108bed1 100644 --- a/frontend/src/pages/user/account/UserHistory.vue +++ b/frontend/src/pages/user/account/UserHistory.vue @@ -15,23 +15,23 @@
- +

2000USD

- +

2000USD

- +

2000USD

- +

2000USD

- +

2000USD

@@ -62,15 +62,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -99,15 +99,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -138,15 +138,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

@@ -162,15 +162,15 @@
- +

Need a python programmer

- +

2000USD

- +

2023-10-19

diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue index d8b76bb..5b6e328 100644 --- a/frontend/src/pages/user/account/UserProfile.vue +++ b/frontend/src/pages/user/account/UserProfile.vue @@ -3,7 +3,7 @@
- + !
@@ -15,7 +15,9 @@ aria-controls="collapse-user-id" >
- + {{ userProfile.account.basic.FLID.identity }} @@ -29,7 +31,9 @@ aria-controls="collapse-password" >
- + ********
@@ -41,7 +45,9 @@ aria-controls="collapse-user-email" >
- + {{ userProfile.account.basic.email.address }} @@ -55,7 +61,9 @@ aria-controls="collapse-user-mobile" >
- + {{ userProfile.account.basic.mobile.number }} @@ -231,7 +239,7 @@
- +
@@ -433,9 +443,9 @@ :disabled="!paymentOperation.ready_to_receive_money" />
@@ -473,9 +483,9 @@ class="uploader-img-btn" src="@/assets/images/qr-code.png" /> - {{$t('Upload QR code to receive payment')}} + {{ + $t('Upload QR code to receive payment') + }}
- {{$t('Have you linked your strip account?')}} + {{ $t('Have you linked your strip account?') }}
- {{$t('You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.')}} + {{ + $t( + 'You are a service provider now. Please review your self-intro to reflect your skills to deliver projects.' + ) + }}
- +
@@ -659,7 +671,9 @@ aria-labelledby="offcanvas-template" >
-
{{$t('Apply self-intro template')}}
+
+ {{ $t('Apply self-intro template') }} +
diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index 38eba70..85d7193 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -35,7 +35,7 @@ v-if="!conversations || conversations.length == 0" class="conversation-list-empty-container" > - {{$t('Empty conversation')}} + {{ $t('Empty conversation') }}
@@ -63,7 +63,7 @@
- {{$t('Please choose conversation')}} + {{ $t('Please choose conversation') }}
diff --git a/frontend/src/pages/user/providers/Home.vue b/frontend/src/pages/user/providers/Home.vue index d5b8eb2..a438532 100644 --- a/frontend/src/pages/user/providers/Home.vue +++ b/frontend/src/pages/user/providers/Home.vue @@ -21,40 +21,44 @@ user portrait
- + {{ provider.user_profile.first_name }} {{ provider.user_profile.last_name }}
- {{ $t('Stay on Freeleaps') }} {{ provider.activeness_achievement.days_of_staying_on }} day(s)
- {{ $t('Delivered projects') }} {{ provider.provider_achievement.delivered_projects }}
- + {{ provider.provider_achievement.responding_time_in_minutes }} min(s)
- + {{ provider.provider_achievement.credit }} @@ -69,7 +73,9 @@ >
- +
- +
- + {{ provider.provider_achievement.delivered_projects }}
- + {{ provider.provider_deliveries.delivering_time_per_project_in_day }} day(s)
- +
- + {{ provider.provider_deliveries.lines_of_code_per_week }} line(s) @@ -125,33 +133,33 @@
- + {{ provider.provider_activities.ongoing_projects }}
- + {{ provider.provider_activities.invitations_to_open_requests }}
- + {{ provider.provider_activities.active_proposals }}
- + {{ provider.provider_profile.expected_salary.hourly }} {{ provider.provider_profile.expected_salary.currency }} @@ -160,33 +168,33 @@
- + {{ provider.provider_work_quality.issues_per_thousand_lines_of_codes }}
- + {{ provider.provider_work_quality.issues_after_delivery_per_project }}
- + {{ provider.provider_work_quality.issue_fixing_rate_pencentage }}%
- + {{ provider.provider_work_quality.issue_fixing_time_minutes }} min(s) @@ -205,7 +213,7 @@ aria-expanded="false" aria-controls="collapse-action-panel" > - {{$t('Action panel')}} + {{ $t('Action panel') }}
{{$t('Invite')}} + >{{ $t('Invite') }} {{ provider.user_profile.first_name }} {{ provider.user_profile.last_name }} - {{$t('to my open requests')}}
*{{$t('Once the request is selected, the provider will be invited to see the request.')}}*{{ + $t( + 'Once the request is selected, the provider will be invited to see the request.' + ) + }}
diff --git a/frontend/src/pages/user/requests/Home.vue b/frontend/src/pages/user/requests/Home.vue index 07c9921..e897552 100644 --- a/frontend/src/pages/user/requests/Home.vue +++ b/frontend/src/pages/user/requests/Home.vue @@ -25,9 +25,9 @@ >
- +
{{ request.issuer_profile.first_name }} @@ -36,15 +36,17 @@
- +
{{ request.title }}
- +
{{ getDateFromFulltimeString(request.update_time) }} @@ -52,9 +54,9 @@
- +
{{ request.score }} @@ -72,15 +74,15 @@
@@ -93,7 +95,7 @@ {{ $t('Name') }}
{{$t('Stay on Freeleaps')}}{{ $t('Stay on Freeleaps') }}
{{$t('Total payment')}}{{ $t('Total payment') }}
{{$t('Deposit')}}{{ $t('Deposit') }}
{{$t('Credit')}}{{ $t('Credit') }}
freeleaps - {{$t('Your proposal has been submitted!')}} + {{ $t('Your proposal has been submitted!') }} - {{$t('You can check the status of proposals in')}} - + {{ $t('You can check the status of proposals in') }} +
diff --git a/frontend/src/pages/user/requests/Propose.vue b/frontend/src/pages/user/requests/Propose.vue index 8e4753f..33061e4 100644 --- a/frontend/src/pages/user/requests/Propose.vue +++ b/frontend/src/pages/user/requests/Propose.vue @@ -8,7 +8,9 @@ aria-labelledby="offcanvas-copy-existing" >
-
{{$t('Copy from existing proposals')}}
+
+ {{ $t('Copy from existing proposals') }} +
-
{{$t('Apply proposal template')}}
+
+ {{ $t('Apply proposal template') }} +
@@ -137,7 +141,7 @@
- +
- +
@@ -177,7 +181,7 @@ type="number" v-model="stage.payment" /> - +
{{ stage.currency }}
@@ -193,7 +197,7 @@ type="number" v-model="stage.duration_in_days" /> - +
day(s)
@@ -209,7 +213,7 @@ type="text" v-model="stage.note" /> - +
@@ -249,25 +253,27 @@
-->
- +
- {{$t('Total milestones')}}: + {{ $t('Total milestones') }}: {{ summary.total_stages }} - {{$t('Total payment')}}:{{ summary.total_payment }} {{ summary.currency }} + {{ $t('Total payment') }}:{{ summary.total_payment }} {{ summary.currency }} - {{$t('Total duration')}}:{{ summary.total_duration_in_days }} day(s) + {{ $t('Total duration') }}:{{ summary.total_duration_in_days }} day(s)
@@ -283,8 +289,8 @@
- - + +
diff --git a/frontend/src/pages/user/workspace/projectManage/Home.vue b/frontend/src/pages/user/workspace/projectManage/Home.vue index 93f1e75..7e97e47 100644 --- a/frontend/src/pages/user/workspace/projectManage/Home.vue +++ b/frontend/src/pages/user/workspace/projectManage/Home.vue @@ -1,7 +1,9 @@
- {{$t('On Freeleaps')}} + {{ $t('On Freeleaps') }} {{ userProfile.achievemnt.activeness.days_of_staying_on }} day(s) @@ -515,7 +527,7 @@
- {{$t('Connections')}} + {{ $t('Connections') }} {{ userProfile.achievemnt.activeness.connections }} @@ -523,7 +535,7 @@
- {{$t('Messages')}} + {{ $t('Messages') }} {{ userProfile.achievemnt.activeness.messages }} @@ -531,7 +543,7 @@
- {{$t('Credit')}} + {{ $t('Credit') }} {{ userProfile.achievemnt.activeness.credit }} @@ -541,7 +553,7 @@
- {{$t('Total spending')}} + {{ $t('Total spending') }} {{ userProfile.achievemnt.issuer.spending.total }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -550,7 +562,7 @@
- {{$t('12-month spending')}} + {{ $t('12-month spending') }} {{ userProfile.achievemnt.issuer.spending.twelve_month }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -559,7 +571,7 @@
- {{$t('3-month spending')}} + {{ $t('3-month spending') }} {{ userProfile.achievemnt.issuer.spending.three_month }} {{ userProfile.achievemnt.issuer.spending.currency }} @@ -568,7 +580,7 @@
- {{$t('Deposit')}} + {{ $t('Deposit') }} {{ userProfile.achievemnt.issuer.deposit.available }} {{ userProfile.achievemnt.issuer.deposit.currency }} @@ -579,7 +591,7 @@
- {{$t('Posted')}} + {{ $t('Posted') }} {{ userProfile.achievemnt.issuer.request.issued }} @@ -587,7 +599,7 @@
- {{$t('Accomplished')}} + {{ $t('Accomplished') }} {{ userProfile.achievemnt.issuer.request.accomplished }} @@ -595,7 +607,7 @@
- {{$t('Active')}} + {{ $t('Active') }} {{ userProfile.achievemnt.issuer.request.active }} @@ -603,7 +615,7 @@
- {{$t('Ongoing')}} + {{ $t('Ongoing') }} {{ userProfile.achievemnt.issuer.request.ongoing }} @@ -613,7 +625,7 @@
- {{$t('Total earning')}} + {{ $t('Total earning') }} {{ userProfile.achievemnt.provider.earnings.total }} {{ userProfile.achievemnt.provider.earnings.currency }} @@ -622,7 +634,7 @@
- {{$t('12-month earning')}} + {{ $t('12-month earning') }} {{ userProfile.achievemnt.provider.earnings.twelve_month }} {{ userProfile.achievemnt.provider.earnings.currency }} @@ -631,7 +643,7 @@
- {{$t('Delivered')}} + {{ $t('Delivered') }} {{ userProfile.achievemnt.provider.deliveries.delivered_projects }} @@ -639,12 +651,12 @@
- {{$t('Delivering time')}} + {{ $t('Delivering time') }} {{ userProfile.achievemnt.provider.deliveries.delivering_time_per_project_in_day }} - {{$t('days')}} + {{ $t('days') }}