Skip to content

Commit 9cc7a0c

Browse files
EbbeFuglsangurfeex
andauthored
Adding translations for program node issue #11 (#15)
* Adding translations for program node (#11) * Add German button translation --------- Co-authored-by: Felix Exner <[email protected]>
1 parent 87ff100 commit 9cc7a0c

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

external-control-frontend/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
1313
export const httpLoaderFactory = (http: HttpBackend) =>
1414
new MultiTranslateHttpLoader(http, [
1515
{ prefix: PATH + '/assets/i18n/', suffix: '.json' },
16-
{ prefix: './ui/assets/i18n/', suffix: '.json' },
16+
{ prefix: './ui/assets/i18n/', suffix: '.json' }
1717
]);
1818

1919
@NgModule({

external-control-frontend/src/app/components/external-control-program/external-control-program.behavior.worker.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/// <reference lib="webworker" />
22
import {
33
ApplicationContext,
4+
AdvancedTranslatedProgramLabel,
45
AdvancedProgramLabel,
56
ProgramBehaviorAPI,
67
InsertionContext,
@@ -16,11 +17,20 @@ import { ExternalControlProgramNode } from './external-control-program.node';
1617
import { URCAP_ID, VENDOR_ID } from 'src/generated/contribution-constants';
1718
import { ExternalControlApplicationNode } from '../external-control-application/external-control-application.node';
1819

19-
20-
const createProgramNodeLabel = async (node: ExternalControlProgramNode): Promise<AdvancedProgramLabel> => {
20+
const createProgramNodeLabel = async (node: ExternalControlProgramNode): Promise<AdvancedTranslatedProgramLabel> => {
2121
const api = new ProgramBehaviorAPI(self);
2222
const applicationNode = await api.applicationService.getApplicationNode('universal-robots-external-control-external-control-application') as ExternalControlApplicationNode;
23-
return [{ type: 'primary', value: `Program cached from ${applicationNode.robotIP}:${applicationNode.port}`, },];
23+
const programLabel: AdvancedTranslatedProgramLabel = [];
24+
25+
programLabel.push({
26+
type: 'primary',
27+
translationKey: 'presenter.cache-label',
28+
interpolateParams: {
29+
ip: `${applicationNode.robotIP}`,
30+
port: `${applicationNode.port}`
31+
}
32+
});
33+
return programLabel;
2434
};
2535

2636
const createProgramNode = async (): Promise<ExternalControlProgramNode> => {

external-control-frontend/src/app/components/external-control-program/external-control-program.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div *ngIf="contributedNode" class="flex-container">
22
<div class="flex-row">
3-
<ur-label [label]="'Update program from'" [required]="false" [size]="'large'"></ur-label>
3+
<ur-label [label]="'presenter.update-label' | translate" [required]="false" [size]="'large'"></ur-label>
44
<ur-label [label]="'&nbsp;'" [required]="false" [size]="'large'"></ur-label>
55
<ur-label [label]="ipDisplay()" [required]="false" [size]="'large'"></ur-label>
66
<ur-label [label]="':'" [required]="false" [size]="'large'"></ur-label>

external-control-frontend/src/assets/i18n/da.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
"presenter": {
3838
"port-input-description": "Indtast portnummer",
3939
"robotIP-input-description": "Indtast værtsnavn eller IP-adresse",
40-
"update-button": "Opdater program"
40+
"update-button": "Opdater program",
41+
"update-label": "Opater program fra",
42+
"cache-label": "Program gemt fra {{ip}}:{{port}}"
4143
}
4244
}

external-control-frontend/src/assets/i18n/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
"presenter": {
3737
"port-input-description": "Geben Sie die Portnummer auf dem externen Computer für die Bereitstellung des URScript-Codes ein",
3838
"robotIP-input-description": "Geben Sie die IP-Adresse oder den Hostnamen des externen Computers ein",
39-
"update-button": "URScript code aktualisieren"
39+
"update-button": "URScript code aktualisieren",
40+
"update-label": "URScript code aktualisieren von",
41+
"cache-label": "URScript code gespeichert von {{ip}}:{{port}}"
4042
}
4143
}

external-control-frontend/src/assets/i18n/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
"presenter": {
3838
"port-input-description": "Enter port number",
3939
"robotIP-input-description": "Enter computer host name or IP address",
40-
"update-button": "Update program"
40+
"update-button": "Update program",
41+
"update-label": "Update program from",
42+
"cache-label": "Program cached from {{ip}}:{{port}}"
4143
}
4244
}

0 commit comments

Comments
 (0)