add german translation (#2692)

* add german translation * rename file
UnchartedBull · Feb 22, 2022 · f1358b9 · f1358b9
1 parent 99edd17
commit f1358b9
Show file tree

Hide file tree

Showing 7 changed files with 4,493 additions and 157 deletions.
diff --git a/angular.json b/angular.json
@@ -22,6 +22,10 @@
           "fr": {
             "translation": "src/locale/messages.fr.xlf",
             "baseHref": ""
+          },
+          "de": {
+            "translation": "src/locale/messages.de.xlf",
+            "baseHref": ""
           }
         }
       },
@@ -34,7 +38,7 @@
             "outputPath": "dist",
             "index": "src/index.html",
             "i18nMissingTranslation": "warning",
-            "localize": ["en"],
+            "localize": false,
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
@@ -64,11 +68,8 @@
             "scripts": []
           },
           "configurations": {
-            "fr": {
-              "localize": ["fr"]
-            },
             "production": {
-              "localize": ["en", "fr"],
+              "localize": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
@@ -112,9 +113,6 @@
             "browserTarget": "OctoDash:build"
           },
           "configurations": {
-            "fr": {
-              "browserTarget": "OctoDash:build:fr"
-            },
             "production": {
               "browserTarget": "OctoDash:build:production"
             },

diff --git a/helper/locale.js b/helper/locale.js
@@ -78,8 +78,6 @@ function updateLocales() {
         });
       });
     }
-    // remove extracted messages
-    fs.unlinkSync('./src/locale/messages.xlf');
   });
 }
 

diff --git a/src/app/config/setup/setup.component.html b/src/app/config/setup/setup.component.html
@@ -28,29 +28,25 @@
     (changeURLEntryMethod)="changeURLEntryMethod($event)"
     [(octoprintHost)]="config.octoprint.urlSplit.host"
     [(octoprintPort)]="config.octoprint.urlSplit.port"
-    *ngIf="page === 1"
-  ></app-config-setup-discover-octoprint>
+    *ngIf="page === 1"></app-config-setup-discover-octoprint>
 
   <app-config-setup-octoprint-authentication
     [octoprintURL]="getOctoprintURL().replace('api/', '')"
     (increasePage)="increasePage()"
     [(accessToken)]="config.octoprint.accessToken"
-    *ngIf="page === 2"
-  ></app-config-setup-octoprint-authentication>
+    *ngIf="page === 2"></app-config-setup-octoprint-authentication>
 
   <app-config-setup-personalization
     [octoprintURL]="getOctoprintURL()"
     [apiKey]="config.octoprint.accessToken"
     [(printerName)]="config.printer.name"
     [(useTouchscreen)]="config.octodash.touchscreen"
-    *ngIf="page === 3"
-  ></app-config-setup-personalization>
+    *ngIf="page === 3"></app-config-setup-personalization>
 
   <app-config-setup-extruder-information
     [(feedLength)]="config.filament.feedLength"
     [(feedSpeed)]="config.filament.feedSpeed"
-    *ngIf="page === 4"
-  ></app-config-setup-extruder-information>
+    *ngIf="page === 4"></app-config-setup-extruder-information>
 
   <app-config-setup-plugins
     *ngIf="page === 5"
@@ -64,18 +60,16 @@
     [(ophomPlugin)]="config.plugins.ophom.enabled"
     [(tpLinkSmartPlugPlugin)]="config.plugins.tpLinkSmartPlug.enabled"
     [(tasmotaPlugin)]="config.plugins.tasmota.enabled"
-    [(tasmotaMqttPlugin)]="config.plugins.tasmotaMqtt.enabled"
-  ></app-config-setup-plugins>
+    [(tasmotaMqttPlugin)]="config.plugins.tasmotaMqtt.enabled"></app-config-setup-plugins>
 
   <div *ngIf="page === 6">
     <span class="setup__text" i18n="@@checking">Great! I'll check everything.</span>
     <div class="setup__validation-check-wrapper">
       <span class="setup__validation-check">
         <img
           [src]="octoprintConnection ? 'assets/checkmark.svg' : 'assets/error.svg'"
-          class="setup__validation-check-icon"
-        />
-        <ng-container i18n="@@checking-octoprint-connection"> Octoprint Connection </ng-container>
+          class="setup__validation-check-icon" />
+        <ng-container i18n="@@checking-octoprint-connection"> OctoPrint Connection </ng-container>
       </span>
       <div *ngIf="octoprintConnection">
         <span class="setup__validation-check">

diff --git a/src/app/services/socket/socket.octoprint.service.ts b/src/app/services/socket/socket.octoprint.service.ts
@@ -325,7 +325,7 @@ export class OctoPrintSocketService implements SocketService {
         newState = PrinterEvent.CLOSED;
         if (state.event.payload) {
           this.notificationService.setNotification({
-            heading: $localize`:@@printer-information:Printer error`,
+            heading: $localize`:@@printer-error:Printer error`,
             text: state.event.payload.error,
             type: NotificationType.ERROR,
             time: new Date(),
@@ -359,14 +359,6 @@ export class OctoPrintSocketService implements SocketService {
           callback: this.callbackFunction.bind(this),
           sticky: true,
         } as Notification);
-      } else if (notification.choices?.length == 0) {
-        this.notificationService.setNotification({
-          heading: $localize`:@@printer-information:Printer information`,
-          text: notification.text ?? notification.message,
-          type: NotificationType.WARN,
-          time: new Date(),
-          sticky: true,
-        } as Notification);
       } else if (notification.text || notification.message) {
         this.notificationService.setNotification({
           heading: $localize`:@@printer-information:Printer information`,
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,8 +78,6 @@ function updateLocales() { @@
             });
           });
         }
-        // remove extracted messages
-        fs.unlinkSync('./src/locale/messages.xlf');
       });
     }
@@ Expand Down @@