From 25acef90a85c1584880dec96aa402f896af8364a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 5 Jun 2018 09:13:26 +0200 Subject: Fix i18n in components --- .../account-videos/account-videos.component.ts | 2 +- .../edit-custom-config.component.ts | 6 +++--- .../following-add/following-add.component.ts | 2 +- .../following-list/following-list.component.ts | 4 ++-- .../users/user-edit/user-create.component.ts | 2 +- .../users/user-edit/user-update.component.ts | 2 +- .../+admin/users/user-list/user-list.component.ts | 2 +- .../video-blacklist-list.component.ts | 2 +- .../my-account-video-channel-create.component.ts | 2 +- .../my-account-video-channel-update.component.ts | 2 +- .../my-account-video-channels.component.ts | 4 ++-- .../video-channel-videos.component.ts | 2 +- client/src/app/core/auth/auth.service.ts | 2 +- client/src/app/shared/misc/from-now.pipe.ts | 22 +++++++++++----------- .../src/app/shared/rest/rest-extractor.service.ts | 2 +- client/src/app/signup/signup.component.ts | 8 ++++---- .../comment/video-comments.component.ts | 2 +- .../videos/+video-watch/video-watch.component.ts | 6 +++--- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts index 7b7629480..476f04024 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.ts +++ b/client/src/app/+accounts/account-videos/account-videos.component.ts @@ -69,7 +69,7 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit, .getAccountVideos(this.account, newPagination, this.sort) .pipe( tap(({ totalVideos }) => { - this.titlePage = this.i18n('Published {{ totalVideos }} videos', { totalVideos }) + this.titlePage = this.i18n('Published {{totalVideos}} videos', { totalVideos }) }) ) } diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index 3ffcc6c31..73ff4b7bb 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts @@ -161,14 +161,14 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { const customizationsText = customizations.join('/') // FIXME: i18n service does not support string concatenation - const message = this.i18n('You set custom {{ customizationsText }}. ', { customizationsText }) + + const message = this.i18n('You set custom {{customizationsText}}. ', { customizationsText }) + this.i18n('This could lead to security issues or bugs if you do not understand it. ') + this.i18n('Are you sure you want to update the configuration?') const label = this.i18n( - 'Please type "I understand the {{ customizationsText }} I set" to confirm.', + 'Please type "I understand the {{customizationsText}} I set" to confirm.', { customizationsText } ) - const expectedInputValue = this.i18n('I understand the {{ customizationsText }} I set', { customizationsText }) + const expectedInputValue = this.i18n('I understand the {{customizationsText}} I set', { customizationsText }) const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue) if (confirmRes === false) return diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts index f197c1fe9..bd9cc022b 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.ts +++ b/client/src/app/+admin/follows/following-add/following-add.component.ts @@ -36,7 +36,7 @@ export class FollowingAddComponent { for (const host of hosts) { if (validateHost(host) === false) { - newHostsErrors.push(this.i18n('{{ host }} is not valid', { host })) + newHostsErrors.push(this.i18n('{{host}} is not valid', { host })) } } diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index 2fb818c90..06e341e68 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts @@ -33,7 +33,7 @@ export class FollowingListComponent extends RestTable implements OnInit { async removeFollowing (follow: AccountFollow) { const res = await this.confirmService.confirm( - this.i18n('Do you really want to unfollow {{ host }}?', { host: follow.following.host }), + this.i18n('Do you really want to unfollow {{host}}?', { host: follow.following.host }), this.i18n('Unfollow') ) if (res === false) return @@ -42,7 +42,7 @@ export class FollowingListComponent extends RestTable implements OnInit { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('You are not following {{ host }} anymore.', { host: follow.following.host }) + this.i18n('You are not following {{host}} anymore.', { host: follow.following.host }) ) this.loadData() }, diff --git a/client/src/app/+admin/users/user-edit/user-create.component.ts b/client/src/app/+admin/users/user-edit/user-create.component.ts index b91ffa115..8478a7692 100644 --- a/client/src/app/+admin/users/user-edit/user-create.component.ts +++ b/client/src/app/+admin/users/user-edit/user-create.component.ts @@ -72,7 +72,7 @@ export class UserCreateComponent extends UserEdit implements OnInit { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('User {{ username }} created.', { username: userCreate.username }) + this.i18n('User {{username}} created.', { username: userCreate.username }) ) this.router.navigate([ '/admin/users/list' ]) }, diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts index dca555706..5689aab2f 100644 --- a/client/src/app/+admin/users/user-edit/user-update.component.ts +++ b/client/src/app/+admin/users/user-edit/user-update.component.ts @@ -85,7 +85,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('User {{ username }} updated.', { username: this.username }) + this.i18n('User {{username}} updated.', { username: this.username }) ) this.router.navigate([ '/admin/users/list' ]) }, diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index b644fcf71..ab25608c1 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts @@ -44,7 +44,7 @@ export class UserListComponent extends RestTable implements OnInit { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('User {{ username }} deleted.', { username: user.username }) + this.i18n('User {{username}} deleted.', { username: user.username }) ) this.loadData() }, diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts index 1864e5f65..143ec8406 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts @@ -43,7 +43,7 @@ export class VideoBlacklistListComponent extends RestTable implements OnInit { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('Video {{ name }} removed from the blacklist.', { name: entry.name }) + this.i18n('Video {{name}} removed from the blacklist.', { name: entry.name }) ) this.loadData() }, diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts index 9b5a12d18..a4073728b 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts @@ -73,7 +73,7 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE this.authService.refreshUserInformation() this.notificationsService.success( this.i18n('Success'), - this.i18n('Video channel {{ videoChannelName }} created.', { videoChannelName: videoChannelCreate.displayName }) + this.i18n('Video channel {{videoChannelName}} created.', { videoChannelName: videoChannelCreate.displayName }) ) this.router.navigate([ '/my-account', 'video-channels' ]) }, diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts index 78c578764..db38c7da9 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts @@ -101,7 +101,7 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE this.authService.refreshUserInformation() this.notificationsService.success( this.i18n('Success'), - this.i18n('Video channel {{ videoChannelName }} updated.', { videoChannelName: videoChannelUpdate.displayName }) + this.i18n('Video channel {{videoChannelName}} updated.', { videoChannelName: videoChannelUpdate.displayName }) ) this.router.navigate([ '/my-account', 'video-channels' ]) }, diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts index cff1041f6..6d1098865 100644 --- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts +++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts @@ -35,7 +35,7 @@ export class MyAccountVideoChannelsComponent implements OnInit { async deleteVideoChannel (videoChannel: VideoChannel) { const res = await this.confirmService.confirmWithInput( this.i18n( - 'Do you really want to delete {{ videoChannelName }}? It will delete all videos uploaded in this channel too.', + 'Do you really want to delete {{videoChannelName}}? It will delete all videos uploaded in this channel too.', { videoChannelName: videoChannel.displayName } ), this.i18n('Please type the name of the video channel to confirm'), @@ -50,7 +50,7 @@ export class MyAccountVideoChannelsComponent implements OnInit { this.loadVideoChannels() this.notificationsService.success( this.i18n('Success'), - this.i18n('Video channel {{ videoChannelName } deleted.', { videoChannelName: videoChannel.displayName }) + this.i18n('Video channel {{videoChannelName}} deleted.', { videoChannelName: videoChannel.displayName }) ) }, diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts index 22239d75b..28c591039 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts @@ -69,7 +69,7 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On .getVideoChannelVideos(this.videoChannel, newPagination, this.sort) .pipe( tap(({ totalVideos }) => { - this.titlePage = this.i18n('Published {{ totalVideos }} videos', { totalVideos }) + this.titlePage = this.i18n('Published {{totalVideos}} videos', { totalVideos }) }) ) } diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts index 363f58155..9ec404557 100644 --- a/client/src/app/core/auth/auth.service.ts +++ b/client/src/app/core/auth/auth.service.ts @@ -76,7 +76,7 @@ export class AuthService { let errorMessage = error.message if (error.status === 403) { - errorMessage = this.i18n('Cannot retrieve OAuth Client credentials: {{ errorText }}.\n', { errorText: error.text }) + errorMessage = this.i18n('Cannot retrieve OAuth Client credentials: {{errorText}}.\n', { errorText: error.text }) errorMessage += this.i18n( 'Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.' ) diff --git a/client/src/app/shared/misc/from-now.pipe.ts b/client/src/app/shared/misc/from-now.pipe.ts index 3a64a4077..33e6d25fe 100644 --- a/client/src/app/shared/misc/from-now.pipe.ts +++ b/client/src/app/shared/misc/from-now.pipe.ts @@ -12,28 +12,28 @@ export class FromNowPipe implements PipeTransform { let interval = Math.floor(seconds / 31536000) if (interval > 1) { - return this.i18n('{{ interval }} years ago', { interval }) + return this.i18n('{{interval}} years ago', { interval }) } interval = Math.floor(seconds / 2592000) - if (interval > 1) return this.i18n('{{ interval }} months ago', { interval }) - if (interval === 1) return this.i18n('{{ interval }} month ago', { interval }) + if (interval > 1) return this.i18n('{{interval}} months ago', { interval }) + if (interval === 1) return this.i18n('{{interval}} month ago', { interval }) interval = Math.floor(seconds / 604800) - if (interval > 1) return this.i18n('{{ interval }} weeks ago', { interval }) - if (interval === 1) return this.i18n('{{ interval }} week ago', { interval }) + if (interval > 1) return this.i18n('{{interval}} weeks ago', { interval }) + if (interval === 1) return this.i18n('{{interval}} week ago', { interval }) interval = Math.floor(seconds / 86400) - if (interval > 1) return this.i18n('{{ interval }} days ago', { interval }) - if (interval === 1) return this.i18n('{{ interval }} day ago', { interval }) + if (interval > 1) return this.i18n('{{interval}} days ago', { interval }) + if (interval === 1) return this.i18n('{{interval}} day ago', { interval }) interval = Math.floor(seconds / 3600) - if (interval > 1) return this.i18n('{{ interval }} hours ago', { interval }) - if (interval === 1) return this.i18n('{{ interval }} hour ago', { interval }) + if (interval > 1) return this.i18n('{{interval}} hours ago', { interval }) + if (interval === 1) return this.i18n('{{interval}} hour ago', { interval }) interval = Math.floor(seconds / 60) - if (interval >= 1) return this.i18n('{{ interval }} min ago', { interval }) + if (interval >= 1) return this.i18n('{{interval}} min ago', { interval }) - return this.i18n('{{ interval }} sec ago', { interval: Math.floor(seconds) }) + return this.i18n('{{interval}} sec ago', { interval: Math.floor(seconds) }) } } diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts index 468ac3e32..0d5b6d6f3 100644 --- a/client/src/app/shared/rest/rest-extractor.service.ts +++ b/client/src/app/shared/rest/rest-extractor.service.ts @@ -71,7 +71,7 @@ export class RestExtractor { const secondsLeft = err.headers.get('retry-after') if (secondsLeft) { const minutesLeft = Math.floor(parseInt(secondsLeft, 10) / 60) - errorMessage = this.i18n('Too many attempts, please try again after {{ minutesLeft }} minutes.', { minutesLeft }) + errorMessage = this.i18n('Too many attempts, please try again after {{minutesLeft}} minutes.', { minutesLeft }) } else { errorMessage = this.i18n('Too many attempts, please try again later.') } diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts index 72a0c045b..eaed2626d 100644 --- a/client/src/app/signup/signup.component.ts +++ b/client/src/app/signup/signup.component.ts @@ -84,7 +84,7 @@ export class SignupComponent extends FormReactive implements OnInit { () => { this.notificationsService.success( this.i18n('Success'), - this.i18n('Registration for {{ username }} complete.', { username: userCreate.username }) + this.i18n('Registration for {{username}} complete.', { username: userCreate.username }) ) this.redirectService.redirectToHomepage() }, @@ -106,9 +106,9 @@ export class SignupComponent extends FormReactive implements OnInit { const normalSeconds = initialUserVideoQuotaBit / (1.5 * 1000 * 1000) const lines = [ - this.i18n('{{ seconds }} of full HD videos', { seconds: SignupComponent.getApproximateTime(fullHdSeconds) }), - this.i18n('{{ seconds }} of HD videos', { seconds: SignupComponent.getApproximateTime(hdSeconds) }), - this.i18n('{{ seconds }} of average quality videos', { seconds: SignupComponent.getApproximateTime(normalSeconds) }) + this.i18n('{{seconds}} of full HD videos', { seconds: SignupComponent.getApproximateTime(fullHdSeconds) }), + this.i18n('{{seconds}} of HD videos', { seconds: SignupComponent.getApproximateTime(hdSeconds) }), + this.i18n('{{seconds}} of average quality videos', { seconds: SignupComponent.getApproximateTime(normalSeconds) }) ] this.quotaHelpIndication = lines.join('
') diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts index 8c6ddb89e..72f66ff09 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts @@ -114,7 +114,7 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy { async onWantedToDelete (commentToDelete: VideoComment) { let message = 'Do you really want to delete this comment?' if (commentToDelete.totalReplies !== 0) { - message += this.i18n(' {{ totalReplies }} replies will be deleted too.', { totalReplies: commentToDelete.totalReplies }) + message += this.i18n(' {{totalReplies}} replies will be deleted too.', { totalReplies: commentToDelete.totalReplies }) } const res = await this.confirmService.confirm(message, this.i18n('Delete')) diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index f3b4f7a2b..23d74494c 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -163,7 +163,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { status => { this.notificationsService.success( this.i18n('Success'), - this.i18n('Video {{ videoName }} had been blacklisted.', { videoName: this.video.name }) + this.i18n('Video {{videoName}} had been blacklisted.', { videoName: this.video.name }) ) this.redirectService.redirectToHomepage() }, @@ -265,7 +265,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { status => { this.notificationsService.success( this.i18n('Success'), - this.i18n('Video {{ videoName }} deleted.', { videoName: this.video.name }) + this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name }) ) // Go back to the video-list. @@ -297,7 +297,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private setVideoLikesBarTooltipText () { this.likesBarTooltipText = this.i18n( - '{{ likesNumber }} likes / {{ dislikesNumber }} dislikes', + '{{likesNumber}} likes / {{dislikesNumber}} dislikes', { likesNumber: this.video.likes, dislikes: this.video.dislikes } ) } -- cgit v1.2.3