borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle singular/plurial in signup

Browse Source
This commit is contained in:
Chocobozzz 2018-06-05 16:09:32 +02:00
parent e309822b93
commit 7a9fd8b54d
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/signup/signup.component.scss
View File

@ -8,10 +8,6 @@
.initial-user-quota-label { .initial-user-quota-label {
font-weight: $font-semibold; font-weight: $font-semibold;
} }
my-help {
margin-left: 5px;
}
} }

31
client/src/app/signup/signup.component.ts
View File

@ -17,18 +17,6 @@ export class SignupComponent extends FormReactive implements OnInit {
error: string = null error: string = null
quotaHelpIndication = '' quotaHelpIndication = ''
private static getApproximateTime (seconds: number) {
const hours = Math.floor(seconds / 3600)
let pluralSuffix = ''
if (hours > 1) pluralSuffix = 's'
if (hours > 0) return `~ ${hours} hour${pluralSuffix}`
const minutes = Math.floor(seconds % 3600 / 60)
if (minutes > 1) pluralSuffix = 's'
return `~ ${minutes} minute${pluralSuffix}`
}
constructor ( constructor (
protected formValidatorService: FormValidatorService, protected formValidatorService: FormValidatorService,
private userValidatorsService: UserValidatorsService, private userValidatorsService: UserValidatorsService,
@ -75,6 +63,19 @@ export class SignupComponent extends FormReactive implements OnInit {
) )
} }
private getApproximateTime (seconds: number) {
const hours = Math.floor(seconds / 3600)
let pluralSuffix = ''
if (hours > 1) pluralSuffix = 's'
if (hours > 0) return `~ ${hours} hour${pluralSuffix}`
const minutes = Math.floor(seconds % 3600 / 60)
if (minutes > 1) pluralSuffix = 's'
return this.i18n('~ {{minutes}} {minutes, plural, =1 {minute} other {minutes}}', { minutes })
}
private buildQuotaHelpIndication () { private buildQuotaHelpIndication () {
if (this.initialUserVideoQuota === -1) return if (this.initialUserVideoQuota === -1) return
@ -88,9 +89,9 @@ export class SignupComponent extends FormReactive implements OnInit {
const normalSeconds = initialUserVideoQuotaBit / (1.5 * 1000 * 1000) const normalSeconds = initialUserVideoQuotaBit / (1.5 * 1000 * 1000)
const lines = [ const lines = [
this.i18n('{{seconds}} of full HD videos', { seconds: SignupComponent.getApproximateTime(fullHdSeconds) }), this.i18n('{{seconds}} of full HD videos', { seconds: this.getApproximateTime(fullHdSeconds) }),
this.i18n('{{seconds}} of HD videos', { seconds: SignupComponent.getApproximateTime(hdSeconds) }), this.i18n('{{seconds}} of HD videos', { seconds: this.getApproximateTime(hdSeconds) }),
this.i18n('{{seconds}} of average quality videos', { seconds: SignupComponent.getApproximateTime(normalSeconds) }) this.i18n('{{seconds}} of average quality videos', { seconds: this.getApproximateTime(normalSeconds) })
] ]
this.quotaHelpIndication = lines.join('<br />') this.quotaHelpIndication = lines.join('<br />')