Skip to content

fix: hard to translate portions #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged

fix: hard to translate portions #302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 9 additions & 27 deletions src/components/Info.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@
<span v-if="userId && timestamp"
class="details">
<strong>{{ approvedByText }}</strong>
<NcUserBubble
class="user-bubble"
:user="userId"
:display-name="notMe ? userName : you"
:size="24" />
{{ relativeTime }}
</span>
<span v-else>{{ approvedText }}</span>
Expand All @@ -41,11 +36,6 @@
<span v-if="userId && timestamp"
class="details">
<strong>{{ rejectedByText }}</strong>
<NcUserBubble
class="user-bubble"
:user="userId"
:display-name="notMe ? userName : you"
:size="24" />
{{ relativeTime }}
</span>
<span v-else>{{ rejectedText }}</span>
Expand All @@ -56,11 +46,6 @@
<span v-if="userId && timestamp"
class="details">
<strong>{{ requestedByText }}</strong>
<NcUserBubble
class="user-bubble"
:user="userId"
:display-name="notMe ? userName : you"
:size="24" />
{{ relativeTime }}
</span>
<span v-else>{{ pendingTextWithTime }}</span>
Expand Down Expand Up @@ -143,22 +128,10 @@ export default {
type: String,
default: t('approval', 'Approved'),
},
approvedByText: {
type: String,
default: t('approval', 'Approved by'),
},
rejectedText: {
type: String,
default: t('approval', 'Rejected'),
},
rejectedByText: {
type: String,
default: t('approval', 'Rejected by'),
},
requestedByText: {
type: String,
default: t('approval', 'Approval requested by'),
},
pendingText: {
type: String,
default: t('approval', 'Approval requested'),
Expand Down Expand Up @@ -217,6 +190,15 @@ export default {
}
return ''
},
approvedByText() {
return t('approval', 'Approved by {user}', { user: this.notMe ? this.userName : this.you })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to make proper if blocks
Approved by You does not work in german

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, to reformulate, you need a specific translation for "approved by you" and "approved by DISPLAY_NAME".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I made a new pr #304 that hopefully implements it correctly this time.

},
rejectedByText() {
return t('approval', 'Rejected by {user}', { user: this.notMe ? this.userName : this.you })
},
requestedByText() {
return t('approval', 'Approval requested by {user}', { user: this.notMe ? this.userName : this.you })
},
},

watch: {
Expand Down