tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add double {{}} explanation to help text and example

Browse Source
This commit is contained in:
TomW1605
2024-08-31 08:16:02 +08:00
parent 813d299c8c
commit 7b0e98827e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/locales/en/common.json
View File

@@ -106,7 +106,7 @@
"button": "Print Labels", "button": "Print Labels",
"title": "Label Printing", "title": "Label Printing",
"template": "Label Template", "template": "Label Template",
"templateHelp": "Use {} to insert values of the spool object as text. For example {id} will be replaced with the spool id, or {filament.material} will be replaced with the material of the spool. Enclose text with double asterix ** to make it bold. Click the button to view a list of all available tags.", "templateHelp": "Use {} to insert values of the spool object as text. For example, {id} will be replaced with the spool id, or {filament.material} will be replaced with the material of the spool. if a value is missing it will be replaced with \"?\". A second set of {} can be used to remove this. In addition, any text between the sets of {} will be removed if the value is missing. For example, {Lot Nr: {lot_nr}} will only show the label if the spool has a lot number. Enclose text with double asterix ** to make it bold. Click the button to view a list of all available tags.",
"textSize": "Label Text Size", "textSize": "Label Text Size",
"showContent": "Print Label", "showContent": "Print Label",
"showQRCode": "Print QR Code", "showQRCode": "Print QR Code",

8
client/src/pages/printing/spoolQrCodePrintingDialog.tsx
View File

@@ -150,10 +150,10 @@ const SpoolQRCodePrintingDialog: React.FC<SpoolQRCodePrintingDialog> = ({ spoolI
`**{filament.vendor.name} - {filament.name} `**{filament.vendor.name} - {filament.name}
#{id} - {filament.material}** #{id} - {filament.material}**
Spool Weight: {filament.spool_weight} g Spool Weight: {filament.spool_weight} g
ET: {filament.settings_extruder_temp} °C {ET: {filament.settings_extruder_temp} °C}
BT: {filament.settings_bed_temp} °C {BT: {filament.settings_bed_temp} °C}
Lot Nr: {lot_nr} {Lot Nr: {lot_nr}}
{comment} {{comment}}
{filament.comment} {filament.comment}
{filament.vendor.comment}`; {filament.vendor.comment}`;