Skip to content

Commit

Permalink
translation: fix source string issues
Browse files Browse the repository at this point in the history
While translating on transifex, the translators identify that the
source string has to be improved or amended. These are marked as issue
on transifex.

This commit fixes most of the current issues.

* Updates the source files.
* Updates the translation files.
* Extracts messages.
* Updates catalogs.
* Cleans license headers when I encountered this weird unnecessary white
  spaces.

Co-Authored-by: Igor Milhit <igor.milhit@rero.ch>
  • Loading branch information
Igor Milhit authored and jma committed Apr 9, 2020
1 parent d3223e0 commit 8e6d39e
Show file tree
Hide file tree
Showing 32 changed files with 370 additions and 427 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export class PatronTransactionService {
this._toastService.error(
message,
this._translateService.instant(
'{{ type }} creation failed !',
'{{ type }} creation failed!',
{ type: record.type }
)
);
Expand Down
31 changes: 16 additions & 15 deletions projects/admin/src/app/circulation/patron/main/main.component.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
 Copyright (C) 2019 RERO

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, version 3 of the License.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.

 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<ng-container *ngIf="patron$ | async as patron">
Expand Down Expand Up @@ -44,17 +44,18 @@
[routerLinkActiveOptions]="{exact: true}"
[routerLink]="['/circulation', 'patron', patron.barcode, 'pickup']"
translate
>Pickup</a
>To pick up</a
>
</li>
<li class="nav-item">
<!-- TODO: change route from requested to pending -->
<a
class="nav-link"
routerLinkActive="active"
[routerLinkActiveOptions]="{exact: true}"
[routerLink]="['/circulation', 'patron', patron.barcode, 'requested']"
translate
>Requested</a
>Pending</a
>
</li>
<li class="nav-item">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h5 class="card-title">{{ transaction.type | translate }}</h5>
<span class="col-8">{{ transaction.creation_date | dateTranslate: 'shortDate'}}</span>
</div>
<div class="row">
<label class="col-4 label-title" translate>Total Amount</label>
<label class="col-4 label-title" translate>Total amount</label>
<span class="col-8">{{ transaction.total_amount | currency: organisation.default_currency }}</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ export class PatronTransactionEventFormComponent implements OnInit {
method: 'cash'
};
} else if (this.action === 'cancel') {
const placeholder = this._translateService.instant('Describe why are you cancel this transaction...');
const placeholder = this._translateService.instant('Cancellation reason');
this.formFields.push(this._amountFormFieldDefinition());
this.formFields.push(this._commentFormFieldDefinition(placeholder));
this.model = {
amount: 0,
method: 'cash'
};
} else {
const placeholder = this._translateService.instant('Describe why are you create a dispute...');
const placeholder = this._translateService.instant('Reason of dispute');
this.formFields.push(this._commentFormFieldDefinition(placeholder));
}
}
Expand All @@ -96,7 +96,7 @@ export class PatronTransactionEventFormComponent implements OnInit {
// As we use 'step' property, we need to specify 'min' property to '0' for a nice value interval. But
// with this special validator, we disallow to place a payment with a 0 amount
expression: (c) => c.value > 0,
message: (error) => this._translateService.instant('should be > 0')
message: (error) => this._translateService.instant('Must be greater than 0')
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h6 translate>Details</h6>
</div>
</div>
<div class="row" *ngIf="transaction.loan.pid | getRecord: 'loans' | async as loan">
<div class="col-sm-2 label-title text-right" translate>Loan started at</div>
<div class="col-sm-2 label-title text-right" translate>Checked out on</div>
<div class="col-sm-10">{{ loan.metadata.start_date | dateTranslate: 'shortDate' }}</div>
</div>
</section>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
 Copyright (C) 2020 RERO

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, version 3 of the License.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.

 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2020 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<section *ngIf="isLoading; else loading" class="content">
<div *ngIf="loans.length > 0; else noPickup">
Expand All @@ -30,7 +30,7 @@
</section>

<ng-template #noPickup>
{{ 'There is no item to be collected.' | translate }}
{{ 'No items' | translate }}
</ng-template>

<ng-template #loading>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
 Copyright (C) 2020 RERO

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, version 3 of the License.

 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.

 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2020 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<section *ngIf="isLoading; else loading" class="content">
<div *ngIf="loans.length > 0; else noRequested">
Expand All @@ -30,7 +30,7 @@
</section>

<ng-template #noRequested>
{{ 'There is no item to be collected.' | translate }}
{{ 'No items' | translate }}
</ng-template>

<ng-template #loading>
Expand Down
4 changes: 2 additions & 2 deletions projects/admin/src/app/menu/menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class MenuComponent implements OnInit {
librariesSwitchMenu = {
navCssClass: 'navbar-nav',
entries: [{
name: this._translateService.instant('Switch libraries'),
name: this._translateService.instant('Switch library'),
iconCssClass: 'fa fa-random',
entries: []
}]
Expand Down Expand Up @@ -99,7 +99,7 @@ export class MenuComponent implements OnInit {
name: `${currentUser.first_name[0]}${currentUser.last_name[0]}`,
entries: [
{
name: this._translateService.instant('Switch to public view'),
name: this._translateService.instant('Public interface'),
href: '/',
iconCssClass: 'fa fa-television'
}, {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
 Copyright (C) 2019 RERO
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, version 3 of the License.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<div *ngIf="!circulationForm || librariesOrg.length == 0" translate>
Expand Down Expand Up @@ -73,7 +73,7 @@ <h1 translate>Circulation Policy</h1>
Checkout duration is required.
</div>
<div *ngIf="checkout_duration.errors.min" translate>
Checkout duration must be greater than 1.
Must be greater than 0
</div>
</div>
</div>
Expand Down Expand Up @@ -101,7 +101,7 @@ <h1 translate>Circulation Policy</h1>
Checkout duration is required.
</div>
<div *ngIf="number_renewals.errors.min" translate>
Checkout duration must be greater than 0.
Must be greater than 0
</div>
</div>
</div>
Expand All @@ -117,7 +117,7 @@ <h1 translate>Circulation Policy</h1>
Renewal duration is required.
</div>
<div *ngIf="renewal_duration.errors.min" translate>
Checkout duration must be great than 1.
Must be greater than 0
</div>
</div>
</div>
Expand Down Expand Up @@ -271,7 +271,7 @@ <h1 translate>Circulation Policy</h1>
<div class="clearfix">
<div class="btn-group float-right" role="group" aria-label="Form Button">
<button class="btn btn-warning" (click)="onCancel($event)" translate>Cancel</button>
<button type="submit" class="btn btn-success" [disabled]="circulationForm.invalid" translate>Submit</button>
<button type="submit" class="btn btn-success" [disabled]="circulationForm.invalid" translate>Save</button>
</div>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<div class="modal-body">
Expand Down Expand Up @@ -89,7 +89,7 @@ <h3 class="modal-title" translate>Exception</h3>
<div class="form-check-inline">
<label class="form-check-label mr-2">
<input type="radio" class="form-check-input" name="date-status" value="false" [checked]="is_open.value === false" (change)="onDateStatusChange($event)">
{{ 'Close' | translate }}
{{ 'Closed' | translate }}
</label>
<label class="form-check-label">
<input type="radio" class="form-check-input" name="date-status" value="true" [checked]="is_open.value === true" (change)="onDateStatusChange($event)">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
 Copyright (C) 2019 RERO
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation, version 3 of the License.
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<ng-container *ngIf="libForm">
Expand Down Expand Up @@ -164,7 +164,7 @@ <h1 translate>Library</h1>
<div class="clearfix">
<div class="btn-group float-right" role="group" aria-label="Basic example">
<button class="btn btn-warning" (click)="onCancel($event)" translate>Cancel</button>
<button type="submit" class="btn btn-success" [disabled]="libForm.invalid" translate>Submit</button>
<button type="submit" class="btn btn-success" [disabled]="libForm.invalid" translate>Save</button>
</div>
</div>
</form>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<!--
RERO ILS UI
Copyright (C) 2019 RERO
This program is free software: you can redistribute it and/or modify
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<h4 class="mt-4" translate>Order lines</h4>

Expand Down Expand Up @@ -91,5 +91,5 @@ <h4 class="mt-4" translate>Order lines</h4>
</div>

<ng-template #noOrderLines>
{{ 'There is no order line to be collected.' | translate }}
{{ 'No order lines' | translate }}
</ng-template>
Loading

0 comments on commit 8e6d39e

Please sign in to comment.