Skip to content

Commit e0d4368

Browse files
renemadsenrenemadsen
committed
2 parents 0762f4a + 2e27e62 commit e0d4368

File tree

11 files changed

+51
-33
lines changed

11 files changed

+51
-33
lines changed

‎eform-client/src/app/components/auth/auth.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@
100100
<img width="100%" src="../../../assets/images/google-auth-image.jpg"/>
101101
</ng-container>
102102
<ng-container *ngIf="googleAuthenticatorModel.psk">
103-
<p class="p-header-wrapper p-font" translate>
104-
Open Google Authenticator and add EformApplication by scanning the QR Code to the right.
103+
<p class="p-header-wrapper p-font">
104+
{{ 'Open Google Authenticator and add Eform application by scanning the QR Code to the right' | translate }}.
105105
</p>
106106
</ng-container>
107-
<p translate>Enter the 6 digit code that Google Authenticator generates</p>
107+
<p>{{ 'Enter the 6 digit code that Google Authenticator generates' | translate }}</p>
108108
<p *ngIf="googleAuthenticatorModel.psk">
109109
{{'Your PSK' | translate}}: <strong>{{googleAuthenticatorModel.psk}}</strong>
110110
</p>

‎eform-client/src/app/modules/account-management/components/user-grid/user-grid.component.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@
5757
<div class="row">
5858
<div class="col-xs-6">
5959
<div class="dataTables_info" id="searchable_groups_info" translate>
60-
Showing {{this.paginationModel.offset + 1}}
61-
to {{getLastPageNumber()}} of {{userInfoModelList.totalUsers}} records
60+
{{ 'Showing to of records' |
61+
translate:{currentPageAmount: (this.paginationModel.offset + 1),
62+
currentPage: getLastPageNumber(), total: userInfoModelList.totalUsers} }}
6263
</div>
6364
</div>
6465
<div class="col-xs-6"></div>

‎eform-client/src/app/modules/account-management/components/user-settings/user-settings.component.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ <h1 class="page-title header-page-title">
5858
<br>
5959
</div>
6060
<ng-container *ngIf="googleAuthInfoModel.psk" >
61-
<p translate>Secret key between <strong>Eform</strong> application and <strong>Google Authenticator</strong>.
62-
Keep it safe and do not tell anyone.
63-
</p>
64-
<p translate>You should remove this key, if <strong>Google Authenticator</strong>
65-
is reinstalled or key was removed</p>
61+
<div [innerHTML]="'Google Authenticator description' | translate">
62+
</div>
63+
6664
<p><strong>{{googleAuthInfoModel.psk}}</strong></p>
6765
</ng-container>
6866
</td>

‎eform-client/src/app/modules/advanced/components/edit-entity-searchable-group/edit-entity-searchable-group.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ <h4 translate>Create searchable list</h4>
7070
container="body" placement="top" tooltip="Ikke færdigudfyldt!"></span>
7171
</span>
7272
</div>
73-
<button tooltip="{{'Redigér Søgbar element' | translate}}" (click)="openEditAdvEntitySearchableModal(entityItem)"
73+
<button tooltip="{{'Edit Searchable item' | translate}}" (click)="openEditAdvEntitySearchableModal(entityItem)"
7474
class="needs_tooltip btn btn-ar btn-sm btn-default"
7575
placement="top" type="button" container="body">
7676
<span class="fa fa-pencil"></span>
7777
</button>
78-
<button tooltip="{{'Slet Søgbar element' | translate}}" placement="top" (click)="deleteAdvEntitySearchableItem(entityItem)"
78+
<button tooltip="{{ 'Delete Searchable item' | translate }}" placement="top" (click)="deleteAdvEntitySearchableItem(entityItem)"
7979
class="needs_tooltip btn btn-ar btn-sm btn-danger"
8080
type="button" container="body">
8181
<span class="fa fa-trash-o"></span>
@@ -102,7 +102,7 @@ <h4 translate>Create searchable list</h4>
102102

103103
<modal #editAdvEntitySearchableItemModal (onDismiss)="onChildModalDismissed()">
104104
<modal-header [show-close]="true">
105-
<h4 translate>Redigér Søgbar element</h4>
105+
<h4>{{ 'Edit Searchable item' | translate }}</h4>
106106
</modal-header>
107107
<modal-body>
108108
<div class="create_eform">

‎eform-client/src/app/modules/advanced/components/edit-entity-selectable-group/edit-entity-selectable-group.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ <h4 translate>Create new selectable list</h4>
7070
container="body" placement="top" tooltip="{{'Ikke færdigudfyldt' | translate}}!"></span>
7171
</span>
7272
</div>
73-
<button tooltip="{{ 'Redigér Søgbar element' | translate }}" (click)="openEditAdvEntitySelectableModal(entityItem)"
73+
<button tooltip="{{ 'Edit Searchable item' | translate }}" (click)="openEditAdvEntitySelectableModal(entityItem)"
7474
class="needs_tooltip btn btn-ar btn-sm btn-default"
7575
placement="top" type="button" container="body">
7676
<span class="fa fa-pencil"></span>
7777
</button>
78-
<button tooltip="{{ 'Slet Søgbar element' | translate }}" placement="top" (click)="deleteAdvEntitySelectableItem(entityItem)"
78+
<button tooltip="{{ 'Delete Searchable item' | translate }}" placement="top" (click)="deleteAdvEntitySelectableItem(entityItem)"
7979
class="needs_tooltip btn btn-ar btn-sm btn-danger"
8080
type="button" container="body">
8181
<span class="fa fa-trash-o"></span>

‎eform-client/src/app/modules/advanced/components/entity-search-grid/entity-search-grid.component.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
type="button">
3939
<span class="fa fa-pencil"></span>
4040
</a>
41-
<button tooltip="Slet Søgbar element" placement="top" container="body"
41+
<button tooltip="{{ 'Delete Searchable item' | translate }}" placement="top" container="body"
4242
(click)="showDeleteAdvEntitySearchableGroupModal(advEntitySearchableGroup)"
4343
class="needs_tooltip btn btn-ar btn-danger btn-sm dangerous-action" type="button">
4444
<span class="fa fa-trash-o"></span>
@@ -49,9 +49,10 @@
4949
</table>
5050
<div class="row">
5151
<div class="col-xs-6">
52-
<div class="dataTables_info" id="searchable_groups_info" *ngIf="advEntitySearchableGroupListModel.numOfElements > 0" translate>
53-
Showing {{this.advEntitySearchableGroupListRequestModel.offset + 1}}
54-
to {{getLastPageNumber()}} of {{advEntitySearchableGroupListModel.numOfElements}} records
52+
<div class="dataTables_info" id="searchable_groups_info" *ngIf="advEntitySearchableGroupListModel.numOfElements > 0">
53+
{{ 'Showing to of records' |
54+
translate:{currentPageAmount: (this.advEntitySearchableGroupListRequestModel.offset + 1),
55+
currentPage: getLastPageNumber(), total: advEntitySearchableGroupListModel.numOfElements} }}
5556
</div>
5657
</div>
5758
<div class="col-xs-6"></div>

‎eform-client/src/app/modules/advanced/components/entity-search/entity-search.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1 class="page-title header-page-title">
66
</div>
77
</h1>
88
<div class="pull-right">
9-
<button class="needs_tooltip btn btn-ar btn-success" tooltip='Create new searchable list'
9+
<button class="needs_tooltip btn btn-ar btn-success" tooltip="{{ 'Create new searchable list' | translate }}"
1010
(click)="showCreateAdvEntitySearchableGroupModal()" type="button">
1111
{{ 'Create new searchable list' | translate }}
1212
</button>

‎eform-client/src/app/modules/advanced/components/entity-select-grid/entity-select-grid.component.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
type="button">
3939
<span class="fa fa-pencil"></span>
4040
</a>
41-
<button tooltip="{{ 'Slet Søgbar element' | translate }}" placement="top" container="body"
41+
<button tooltip="{{ 'Delete Searchable item' | translate }}" placement="top" container="body"
4242
(click)="showDeleteAdvEntitySelectableGroupModal(advEntitySelectableGroup)"
4343
class="needs_tooltip btn btn-ar btn-danger btn-sm dangerous-action" type="button">
4444
<span class="fa fa-trash-o"></span>
@@ -49,9 +49,10 @@
4949
</table>
5050
<div class="row">
5151
<div class="col-xs-6">
52-
<div class="dataTables_info" id="searchable_groups_info" *ngIf="advEntitySelectableGroupListModel.numOfElements > 0" translate>
53-
Showing {{this.advEntitySelectableGroupListRequestModel.offset + 1}}
54-
to {{getLastPageNumber()}} of {{advEntitySelectableGroupListModel.numOfElements}} records
52+
<div class="dataTables_info" id="searchable_groups_info" *ngIf="advEntitySelectableGroupListModel.numOfElements > 0">
53+
{{ 'Showing to of records' |
54+
translate:{currentPageAmount: (this.advEntitySelectableGroupListRequestModel.offset + 1),
55+
currentPage: getLastPageNumber(), total: advEntitySelectableGroupListModel.numOfElements} }}
5556
</div>
5657
</div>
5758
<div class="col-xs-6"></div>

‎eform-client/src/app/modules/eform/components/eform-page/eform-table.component.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,10 @@ <h1 class="page-title header-page-title">
163163
</table>
164164
<div class="row" *ngIf="false">
165165
<div class="col-xs-6">
166-
<div class="dataTables_info" id="searchable_groups_info" *ngIf="templateListModel.numOfElements > 0" translate>
167-
Showing {{this.templateRequestModel.offset + 1}}
168-
to {{getLastPageNumber()}} of {{templateListModel.numOfElements}} records
166+
<div class="dataTables_info" id="searchable_groups_info" *ngIf="templateListModel.numOfElements > 0">
167+
{{ 'Showing to of records' |
168+
translate:{currentPageAmount: (this.templateRequestModel.offset + 1),
169+
currentPage: getLastPageNumber(), total: templateListModel.numOfElements} }}
169170
</div>
170171
</div>
171172
<div class="col-xs-6"></div>

‎eform-client/src/assets/i18n/da-DK.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"Done by": "Gøres ved",
3939
"OK": "OK",
4040
"Cancel": "Afbestille",
41-
"Redigér Søgbar element": "Rediger Søgbar element",
42-
"Slet Søgbar element": "Slet Søgbar element",
41+
"Edit Searchable item": "Rediger Søgbar element",
42+
"Delete Searchable item": "Slet Søgbar element",
4343
"Edit searchable element": "Rediger søgbart element",
4444
"Name": "Navn",
4545
"Ok": "Ok",
@@ -150,5 +150,10 @@
150150
"change will logout you from the application": "ændre vil logge dig fra programmet",
151151
"Remove google authenticator secret key": "Fjern Google Authenticator-hemmelig nøgle",
152152
"Remove PSK": "Fjern PSK",
153-
"Full Name": "Fulde navn"
153+
"Full Name": "Fulde navn",
154+
"Open Google Authenticator and add Eform application by scanning the QR Code to the right": "Åbn Google Authenticator og tilføj Eform applikation ved at scanne QR-koden til højre",
155+
"Enter the 6 digit code that Google Authenticator generates": "Indtast den 6-cifrede kode, som Google Authenticator genererer",
156+
157+
"Showing to of records": "Viser {{currentPageAmount}} til {{currentPage}} ud af {{total}} poster",
158+
"Google Authenticator description": "<p>Hemmelig nøgle mellem <strong>Eform</strong> applikation og <strong>Google Authenticator</strong>. Hold det sikkert og fortæl ikke nogen.</p><p>Du bør fjerne denne nøgle, hvis <strong>Google Authenticator</strong> geninstalleres eller nøglen er fjernet</p>"
154159
}

0 commit comments

Comments
 (0)