Fixin some i18n function calls and such

because some strings could not be translated

Contributes to #CURA-526
This commit is contained in:
Tamara Hogenhout 2016-01-12 15:24:47 +01:00
parent 019631af2c
commit 6711cd3070
5 changed files with 8 additions and 7 deletions

View file

@ -4,7 +4,7 @@
from . import CuraProfileWriter from . import CuraProfileWriter
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
catalog = i18nCatalog("uranium") catalog = i18nCatalog("cura")
def getMetaData(): def getMetaData():
return { return {

View file

@ -18,12 +18,14 @@ UM.Dialog
minimumHeight: 200*Screen.devicePixelRatio; minimumHeight: 200*Screen.devicePixelRatio;
maximumHeight: 200*Screen.devicePixelRatio; maximumHeight: 200*Screen.devicePixelRatio;
modality: Qt.Modal modality: Qt.Modal
title: catalog.i18nc("@title:window", "Convert Image...") title: catalog.i18nc("@title:window", "Convert Image...")
GridLayout GridLayout
{ {
UM.I18nCatalog{id: catalog; name:"cura"}
anchors.fill: parent; anchors.fill: parent;
Layout.fillWidth: true Layout.fillWidth: true
columnSpacing: 16 columnSpacing: 16
@ -82,8 +84,6 @@ UM.Dialog
onValueChanged: { manager.onSmoothingChanged(value) } onValueChanged: { manager.onSmoothingChanged(value) }
} }
} }
UM.I18nCatalog{id: catalog; name:"ultimaker"}
} }
rightButtons: [ rightButtons: [

View file

@ -13,6 +13,8 @@ Item {
property int currentIndex: UM.ActiveTool.properties.SelectedIndex; property int currentIndex: UM.ActiveTool.properties.SelectedIndex;
property string printSequence: UM.ActiveTool.properties.PrintSequence; property string printSequence: UM.ActiveTool.properties.PrintSequence;
UM.I18nCatalog { id: catalog; name: "cura"; }
width: childrenRect.width; width: childrenRect.width;
height: childrenRect.height; height: childrenRect.height;
@ -157,7 +159,6 @@ Item {
} }
} }
UM.I18nCatalog { id: catalog; name: "uranium"; }
UM.Dialog { UM.Dialog {
id: settingPickDialog id: settingPickDialog

View file

@ -4,7 +4,7 @@
from . import PerObjectSettingsTool from . import PerObjectSettingsTool
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("uranium") i18n_catalog = i18nCatalog("cura")
def getMetaData(): def getMetaData():
return { return {

View file

@ -184,7 +184,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.small font: UM.Theme.fonts.small
color: UM.Theme.colors.text_subtext color: UM.Theme.colors.text_subtext
text: (!base.printDuration || !base.printDuration.valid) ? "00h 00min" : base.printDuration.getDisplayString(UM.DurationFormat.Short) text: (!base.printDuration || !base.printDuration.valid) ? catalog.i18nc("@label", "00h 00min") : base.printDuration.getDisplayString(UM.DurationFormat.Short)
} }
UM.RecolorImage { UM.RecolorImage {
id: lengthIcon id: lengthIcon
@ -204,7 +204,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.fonts.small font: UM.Theme.fonts.small
color: UM.Theme.colors.text_subtext color: UM.Theme.colors.text_subtext
text: base.printMaterialAmount <= 0 ? "0.0 m" : catalog.i18nc("@label %1 is length of filament","%1 m").arg(base.printMaterialAmount) text: base.printMaterialAmount <= 0 ? catalog.i18nc("@label", "0.0 m") : catalog.i18nc("@label", "%1 m").arg(base.printMaterialAmount)
} }
} }
} }