Просмотр исходного кода

🚸 improve messages and add translations

jmacura 4 лет назад
Родитель
Сommit
45f2526e60

+ 4 - 2
src/adjuster/adjuster-loader.directive.html

@@ -1,8 +1,10 @@
 <div class="loader-splash" *ngIf="adjusterService.isInProcess()">
   <div class="center-block">
-    <h1>Calculating clusters</h1>
+    <h1 [hidden]="!adjusterService.isLoading()">{{'ADJUSTER.loadingData' | translate}}</h1>
+    <h1 [hidden]="!adjusterService.isCalculatingRAI()">{{'ADJUSTER.calcAttractivity' | translate}}</h1>
+    <h1 [hidden]="!adjusterService.isClustering()">{{'ADJUSTER.calcClusters' | translate}}</h1>
     <div class="spinner-border spinner" role="status">
-      <span class="sr-only">Loading...</span>
+      <span class="sr-only">{{'ADJUSTER.loading' | translate}}...</span>
     </div>
   </div>
 </div>

+ 3 - 4
src/adjuster/adjuster.directive.html

@@ -3,10 +3,9 @@
   <div class="card-body">
     <div class="p-2 center-block">
       <button type="button" class="btn btn-primary" (click)="adjusterService.apply()"
-        [disabled]="adjusterService.isInProcess() || noDataSelected()">Calculate</button>
-      <div class="text-warning pt-2" [hidden]="!noDataSelected() || errorMsg">Select at least one dataset and set at least one
-        factor's weight to a non-zero value.</div>
-      <div class="text-danger pt-2" [hidden]="!errorMsg">Server error: {{errorMsg}}</div>
+        [disabled]="adjusterService.isInProcess() || noDataSelected()">{{'ADJUSTER.calculate' | translate}}</button>
+      <div class="text-warning pt-2" [hidden]="!noDataSelected() || errorMsg">{{'ADJUSTER.noDataSelectedMsg' | translate}}</div>
+      <div class="text-danger pt-2" [hidden]="!errorMsg">{{'ADJUSTER.serverError' | translate}}: {{errorMsg}}</div>
     </div>
     <div *ngFor="let factor of adjusterService.factors; let datasetlistVisible = false">
       <div class="d-flex flex-row">

+ 15 - 0
src/app.config.ts

@@ -148,11 +148,26 @@ export const AppConfig = {
     'cs': {
       'ADJUSTER': {
         adjustFactors: 'Vyladit faktory',
+        calculate: 'Vypočítat',
+        calcAttractivity: 'Počítám atraktivitu',
+        calcClusters: 'Počítám shluky',
+        loading: 'Načítám',
+        loadingData: 'Načítám data',
+        noDataSelectedMsg:
+          'Vyberte alespoň jednu datovou sadu a nastavte váhu aspoň jednoho faktoru na ne-nulovou hodnotu.',
+        serverError: 'Chyba serveru',
       },
     },
     'en': {
       'ADJUSTER': {
         adjustFactors: 'Adjust Factors',
+        calculate: 'Calculate',
+        calcAttractivity: 'Calculating attractivity',
+        calcClusters: 'Calculating clusters',
+        loading: 'Loading',
+        loadingData: 'Loading data',
+        noDataSelectedMsg: `Select at least one dataset and set at least one factor's weight to a non-zero value.`,
+        serverError: 'Server error',
       },
     },
   },