diff --git a/frontend/src/components/FreeleapsEditor.vue b/frontend/src/components/FreeleapsEditor.vue index 00c1961..fa54837 100644 --- a/frontend/src/components/FreeleapsEditor.vue +++ b/frontend/src/components/FreeleapsEditor.vue @@ -98,12 +98,11 @@
- +
- @@ -201,7 +200,7 @@ export default { icon: 'fe-link', drop: false, canChoose: true - }, + } // { // name: 'align-justify', // type: 'alignjustify', diff --git a/frontend/src/headers/HeaderUser.vue b/frontend/src/headers/HeaderUser.vue index d470557..a88967a 100644 --- a/frontend/src/headers/HeaderUser.vue +++ b/frontend/src/headers/HeaderUser.vue @@ -15,7 +15,7 @@ :class="activePath == 'Workspace' ? 'active' : ''" > - {{$t('Workspace')}} + {{ $t('Workspace') }}
- {{$t('Please go to profile page to add money receiving method')}} + {{ $t('Please go to profile page to add money receiving method') }}
@@ -68,17 +68,17 @@ /> diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 2fbcdf3..421eb11 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -182,30 +182,26 @@ export default { 'Execution plan proposed by the service provider', 'Proceed to workspace': 'Proceed to workspace', - - - - - 'Workspace': 'Workspace', - 'Requests': 'Requests', - 'Providers': 'Providers', - 'Post': 'Post', + Workspace: 'Workspace', + Requests: 'Requests', + Providers: 'Providers', + Post: 'Post', 'Providing service': 'Providing service', - 'Please go to profile page to add money receiving method': 'Please go to profile page to add money receiving method', - 'History': 'History', + 'Please go to profile page to add money receiving method': + 'Please go to profile page to add money receiving method', + History: 'History', 'Log out': 'Log out', - 'Proposals': 'Proposals', + Proposals: 'Proposals', 'Milestone(s)': 'Milestone(s)', - 'Information': 'Information', + Information: 'Information', 'Operation Complete': 'Operation Complete', 'Wait for completion': 'Wait for completion', 'Mission complete': 'Mission complete', 'Wait for payment': 'Wait for payment', 'Wait for confirmation': 'Wait for confirmation', 'Confirm receipt': 'Confirm receipt', - 'Ready': 'Ready', + Ready: 'Ready', 'Not available': 'Not available', 'Please input issue description': 'Please input issue description', - 'day(s)': 'day(s)', - + 'day(s)': 'day(s)' } diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue index 37c587f..b9577d3 100644 --- a/frontend/src/pages/user/account/UserProfile.vue +++ b/frontend/src/pages/user/account/UserProfile.vue @@ -271,7 +271,11 @@ class="profile-photo" alt="user portrait" id="personal-photo-operation-image" - :src="userProfile.account.basic.photo.base64 ? userProfile.account.basic.photo.base64 : profileUrl" + :src=" + userProfile.account.basic.photo.base64 + ? userProfile.account.basic.photo.base64 + : profileUrl + " /> - {{ provider.activeness_achievement.days_of_staying_on }} {{$t('day(s)')}}
@@ -101,7 +102,8 @@ $t('Project delivering time') }} - {{ provider.provider_deliveries.delivering_time_per_project_in_day }} {{$t('day(s)')}} + {{ provider.provider_deliveries.delivering_time_per_project_in_day }} + {{ $t('day(s)') }}
diff --git a/frontend/src/pages/user/requests/Home.vue b/frontend/src/pages/user/requests/Home.vue index 9b6759a..aedb0c5 100644 --- a/frontend/src/pages/user/requests/Home.vue +++ b/frontend/src/pages/user/requests/Home.vue @@ -119,7 +119,7 @@ > {{ request.issuer_achievement.activeness.days_of_staying_on }} - {{$t('day(s)')}}
diff --git a/frontend/src/pages/user/requests/Propose.vue b/frontend/src/pages/user/requests/Propose.vue index da94806..81c3666 100644 --- a/frontend/src/pages/user/requests/Propose.vue +++ b/frontend/src/pages/user/requests/Propose.vue @@ -199,7 +199,7 @@ /> - {{$t('day(s)')}} + {{ $t('day(s)') }} @@ -266,7 +266,7 @@ {{ $t('Total payment') }}:{{ summary.total_payment }} {{ summary.currency }} - {{ $t('Total duration') }}:{{ summary.total_duration_in_days }} {{$t('day(s)')}} + {{ $t('Total duration') }}:{{ summary.total_duration_in_days }} {{ $t('day(s)') }} diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index b897211..bd62710 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -225,7 +225,14 @@ data-bs-parent="#collapse-project-invite-collaborator" >
- +
@@ -282,29 +289,45 @@ data-bs-parent="#collapse-project-milestone" > - +
- {{ $t('Milestone') }} - {{ milestone.index }} + {{ + $t('Milestone') + }} + {{ + milestone.index + }}
- {{ $t('Description') }} - {{ milestone.description }} + {{ + $t('Description') + }} + {{ + milestone.description + }}
{{ $t('Status') }} - {{ fromIntToMilestoneStatus(milestone.status) }} + {{ + fromIntToMilestoneStatus(milestone.status) + }}
- {{ $t('Payment') }} + {{ + $t('Payment') + }} {{ milestone.actual_paid }} / {{ milestone.expected_payment }} {{ project.project.progress.payment_currency }} @@ -314,7 +337,9 @@
{{ $t('Update') }} - {{ getDateFromFulltimeString(milestone.update_time) }} + {{ + getDateFromFulltimeString(milestone.update_time) + }}
@@ -322,7 +347,9 @@ {{ $t('Action') }}
- freeleaps + freeleaps