Merge branch 'master_CURA-5922_add_safety_data_sheet_links'

This commit is contained in:
Ghostkeeper 2018-11-09 17:04:11 +01:00
commit 4551b73d5c
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276

View File

@ -187,7 +187,8 @@ Item
var result = "" var result = ""
if (base.technicalDataSheetUrl !== undefined) if (base.technicalDataSheetUrl !== undefined)
{ {
result += "<a href='%1'>%2</a>".arg(base.technicalDataSheetUrl).arg("Technical Data Sheet") var tds_name = catalog.i18nc("@action:label", "Technical Data Sheet")
result += "<a href='%1'>%2</a>".arg(base.technicalDataSheetUrl).arg(tds_name)
} }
if (base.safetyDataSheetUrl !== undefined) if (base.safetyDataSheetUrl !== undefined)
{ {
@ -195,7 +196,8 @@ Item
{ {
result += "<br/>" result += "<br/>"
} }
result += "<a href='%1'>%2</a>".arg(base.safetyDataSheetUrl).arg("Safety Data Sheet") var sds_name = catalog.i18nc("@action:label", "Safety Data Sheet")
result += "<a href='%1'>%2</a>".arg(base.safetyDataSheetUrl).arg(sds_name)
} }
if (base.printingGuidelinesUrl !== undefined) if (base.printingGuidelinesUrl !== undefined)
{ {
@ -203,7 +205,8 @@ Item
{ {
result += "<br/>" result += "<br/>"
} }
result += "<a href='%1'>%2</a>".arg(base.printingGuidelinesUrl).arg("Printing Guidelines") var pg_name = catalog.i18nc("@action:label", "Printing Guidelines")
result += "<a href='%1'>%2</a>".arg(base.printingGuidelinesUrl).arg(pg_name)
} }
return result return result
} }