Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Einzelbettsteuerung",
"groupTools": "Identische Werkzeuge gruppieren",
"singleChamberControl": "Einkammersteuerung"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Single bed control",
"groupTools": "Group identical tools",
"singleChamberControl": "Single chamber control"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Control de cama individual",
"groupTools": "Agrupar herramientas idénticas",
"singleChamberControl": "Control de cámara única"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "pouces",
"unitMm": "millimètre",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Commande lit simple",
"groupTools": "Regrouper les outils identiques",
"singleChamberControl": "Commande à chambre unique"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Csoportos asztal vezérlés",
"groupTools": "Azonos szerszámok csoportosítása",
"singleChamberControl": "Csoportos kamra vezérlés"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "インチ",
"unitMm": "んん",
"unitMmSpeed": "mm/秒",
"unitMmPerMinSpeed": "mm/分",
"singleBedControl": "シングルベッドコントロール",
"groupTools": "同一のツールをグループ化する",
"singleChamberControl": "シングルチャンバー制御"
Expand Down
3 changes: 2 additions & 1 deletion src/i18n/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,8 @@
"unitInchSpeed": "ipm",
"unitInches": "inches",
"unitMm": "mm",
"unitMmSpeed": "mm/sec"
"unitMmSpeed": "mm/sec",
"unitMmPerMinSpeed": "mm/min"
},
"settingsBehaviour": {
"behaviourJobStart": "Schakel niet automatisch over naar Statuspaneel bij het starten van de taak",
Expand Down
1 change: 1 addition & 0 deletions src/i18n/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "cale",
"unitMm": "mm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Sterowanie pojedynczym łóżkiem",
"groupTools": "Pogrupuj identyczne narzędzia",
"singleChamberControl": "Sterowanie jednokomorowe"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/pt_br.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "polegadas",
"unitMm": "milímetros",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "Controle de cama de solteiro",
"groupTools": "Agrupar ferramentas idênticas",
"singleChamberControl": "Controle de câmara única"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "дюймы",
"unitMm": "мм",
"unitMmSpeed": "мм/с",
"unitMmPerMinSpeed": "мм/мин",
"singleBedControl": "Раздельное управление столами",
"groupTools": "Сгруппировать одинаковые инструменты",
"singleChamberControl": "Раздельное управление термокамерами"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"unitInches": "inç",
"unitMm": "mm",
"unitMmSpeed": "mm/sn",
"unitMmPerMinSpeed": "mm/dk",
"singleBedControl": "Tek kişilik yatak kontrolü",
"groupTools": "Grup özdeş araçlar",
"singleChamberControl": "Tek bölmeli kontrol"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/хв",
"singleBedControl": "Контроль столом",
"groupTools": "Група ідентичних інструментів",
"singleChamberControl": "Контроль термокамерою"
Expand Down
1 change: 1 addition & 0 deletions src/i18n/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@
"unitMm": "mm",
"unitInchSpeed": "ipm",
"unitMmSpeed": "mm/s",
"unitMmPerMinSpeed": "mm/min",
"singleBedControl": "单个热床控制",
"groupTools": "分组相同的工具",
"singleChamberControl": "单个加热室控制"
Expand Down
11 changes: 8 additions & 3 deletions src/utils/display.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,16 @@ export function displaySize(bytes: number | null | undefined) {
/**
* Display a move speed
* @param speed Speed in mm/s
* @returns Formatted move speed in mm/s or ipm
* @returns Formatted move speed in mm/s (or: mm/min in CNC-Mode) or ipm
*/
export function displayMoveSpeed(speed: number | null | undefined) {
if (typeof speed === "number" && store.state.settings.displayUnits === UnitOfMeasure.imperial) {
return display(speed * 60 / 25.4, 1, i18n.t("panel.settingsAppearance.unitInchSpeed"));
if (typeof speed === "number") {
if (store.state.settings.displayUnits === UnitOfMeasure.imperial) {
return display(speed * 60 / 25.4, 1, i18n.t("panel.settingsAppearance.unitInchSpeed"));
}
if (store.state.machine.model.state.machineMode === MachineMode.cnc) {
return display(speed * 60, 1, i18n.t("panel.settingsAppearance.unitMmPerMinSpeed"));
}
}
return display(speed, 1, i18n.t("panel.settingsAppearance.unitMmSpeed"));
}
Expand Down