|
26 | 26 | <span v-if="userId && timestamp"
|
27 | 27 | class="details">
|
28 | 28 | <strong>{{ approvedByText }}</strong>
|
29 |
| - <NcUserBubble |
30 |
| - class="user-bubble" |
31 |
| - :user="userId" |
32 |
| - :display-name="notMe ? userName : you" |
33 |
| - :size="24" /> |
34 | 29 | {{ relativeTime }}
|
35 | 30 | </span>
|
36 | 31 | <span v-else>{{ approvedText }}</span>
|
|
41 | 36 | <span v-if="userId && timestamp"
|
42 | 37 | class="details">
|
43 | 38 | <strong>{{ rejectedByText }}</strong>
|
44 |
| - <NcUserBubble |
45 |
| - class="user-bubble" |
46 |
| - :user="userId" |
47 |
| - :display-name="notMe ? userName : you" |
48 |
| - :size="24" /> |
49 | 39 | {{ relativeTime }}
|
50 | 40 | </span>
|
51 | 41 | <span v-else>{{ rejectedText }}</span>
|
|
56 | 46 | <span v-if="userId && timestamp"
|
57 | 47 | class="details">
|
58 | 48 | <strong>{{ requestedByText }}</strong>
|
59 |
| - <NcUserBubble |
60 |
| - class="user-bubble" |
61 |
| - :user="userId" |
62 |
| - :display-name="notMe ? userName : you" |
63 |
| - :size="24" /> |
64 | 49 | {{ relativeTime }}
|
65 | 50 | </span>
|
66 | 51 | <span v-else>{{ pendingTextWithTime }}</span>
|
@@ -143,22 +128,10 @@ export default {
|
143 | 128 | type: String,
|
144 | 129 | default: t('approval', 'Approved'),
|
145 | 130 | },
|
146 |
| - approvedByText: { |
147 |
| - type: String, |
148 |
| - default: t('approval', 'Approved by'), |
149 |
| - }, |
150 | 131 | rejectedText: {
|
151 | 132 | type: String,
|
152 | 133 | default: t('approval', 'Rejected'),
|
153 | 134 | },
|
154 |
| - rejectedByText: { |
155 |
| - type: String, |
156 |
| - default: t('approval', 'Rejected by'), |
157 |
| - }, |
158 |
| - requestedByText: { |
159 |
| - type: String, |
160 |
| - default: t('approval', 'Approval requested by'), |
161 |
| - }, |
162 | 135 | pendingText: {
|
163 | 136 | type: String,
|
164 | 137 | default: t('approval', 'Approval requested'),
|
@@ -217,6 +190,15 @@ export default {
|
217 | 190 | }
|
218 | 191 | return ''
|
219 | 192 | },
|
| 193 | + approvedByText() { |
| 194 | + return t('approval', 'Approved by {user}', { user: this.notMe ? this.userName : this.you }) |
| 195 | + }, |
| 196 | + rejectedByText() { |
| 197 | + return t('approval', 'Rejected by {user}', { user: this.notMe ? this.userName : this.you }) |
| 198 | + }, |
| 199 | + requestedByText() { |
| 200 | + return t('approval', 'Approval requested by {user}', { user: this.notMe ? this.userName : this.you }) |
| 201 | + }, |
220 | 202 | },
|
221 | 203 |
|
222 | 204 | watch: {
|
|
0 commit comments