Skip to content

Commit 4eafb09

Browse files
authored
Merge pull request #302 from nextcloud/fix/translations
fix: hard to translate portions
2 parents 010ae1a + 245a631 commit 4eafb09

File tree

1 file changed

+9
-27
lines changed

1 file changed

+9
-27
lines changed

src/components/Info.vue

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<span v-if="userId && timestamp"
2727
class="details">
2828
<strong>{{ approvedByText }}</strong>
29-
<NcUserBubble
30-
class="user-bubble"
31-
:user="userId"
32-
:display-name="notMe ? userName : you"
33-
:size="24" />
3429
{{ relativeTime }}
3530
</span>
3631
<span v-else>{{ approvedText }}</span>
@@ -41,11 +36,6 @@
4136
<span v-if="userId && timestamp"
4237
class="details">
4338
<strong>{{ rejectedByText }}</strong>
44-
<NcUserBubble
45-
class="user-bubble"
46-
:user="userId"
47-
:display-name="notMe ? userName : you"
48-
:size="24" />
4939
{{ relativeTime }}
5040
</span>
5141
<span v-else>{{ rejectedText }}</span>
@@ -56,11 +46,6 @@
5646
<span v-if="userId && timestamp"
5747
class="details">
5848
<strong>{{ requestedByText }}</strong>
59-
<NcUserBubble
60-
class="user-bubble"
61-
:user="userId"
62-
:display-name="notMe ? userName : you"
63-
:size="24" />
6449
{{ relativeTime }}
6550
</span>
6651
<span v-else>{{ pendingTextWithTime }}</span>
@@ -143,22 +128,10 @@ export default {
143128
type: String,
144129
default: t('approval', 'Approved'),
145130
},
146-
approvedByText: {
147-
type: String,
148-
default: t('approval', 'Approved by'),
149-
},
150131
rejectedText: {
151132
type: String,
152133
default: t('approval', 'Rejected'),
153134
},
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-
},
162135
pendingText: {
163136
type: String,
164137
default: t('approval', 'Approval requested'),
@@ -217,6 +190,15 @@ export default {
217190
}
218191
return ''
219192
},
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+
},
220202
},
221203
222204
watch: {

0 commit comments

Comments
 (0)