Skip to content

Commit 8adbfaa

Browse files
committed
Complete translation support on missing strings
1 parent aa4d9fa commit 8adbfaa

File tree

4 files changed

+521
-471
lines changed

4 files changed

+521
-471
lines changed

FSChangeParams.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,11 @@ class FSChangeParamCommand:
409409
"""Make holes for countersunk screws"""
410410

411411
def GetResources(self):
412-
icon = os.path.join(iconPath, 'IconChangeParam.svg')
412+
icon = os.path.join(iconPath, "IconChangeParam.svg")
413413
return {
414-
'Pixmap': icon, # the name of a svg file available in the resources
415-
'MenuText': _translate("DlgChangeParams", "Change fastener parameters", None),
416-
'ToolTip': _translate("DlgChangeParams", "Change parameters of selected fasteners", None)
414+
"Pixmap": icon, # the name of a svg file available in the resources
415+
"MenuText": translate("DlgChangeParams", "Change fastener parameters"),
416+
"ToolTip": translate("DlgChangeParams", "Change parameters of selected fasteners"),
417417
}
418418

419419
def Activated(self):

FSScrewCalc.py

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,18 @@
4545
try:
4646
_fromUtf8 = QtCore.QString.fromUtf8
4747
except AttributeError:
48+
4849
def _fromUtf8(s):
4950
return s
5051

52+
5153
try:
5254
_encoding = QtGui.QApplication.UnicodeUTF8
5355

5456
def _translate(context, text, disambig):
5557
return QtGui.QApplication.translate(context, text, disambig, _encoding)
5658
except AttributeError:
59+
5760
def _translate(context, text, disambig):
5861
return QtGui.QApplication.translate(context, text, disambig)
5962

@@ -75,7 +78,8 @@ def setupUi(self, DockWidget):
7578
self.label.setObjectName(_fromUtf8("label"))
7679
self.horizontalLayout.addWidget(self.label)
7780
spacerItem = QtGui.QSpacerItem(
78-
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
81+
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum
82+
)
7983
self.horizontalLayout.addItem(spacerItem)
8084
self.comboFastenerType = QtGui.QComboBox(self.dockWidgetContents)
8185
self.comboFastenerType.setObjectName(_fromUtf8("comboFastenerType"))
@@ -87,7 +91,8 @@ def setupUi(self, DockWidget):
8791
self.label_2.setObjectName(_fromUtf8("label_2"))
8892
self.horizontalLayout_2.addWidget(self.label_2)
8993
spacerItem1 = QtGui.QSpacerItem(
90-
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
94+
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum
95+
)
9196
self.horizontalLayout_2.addItem(spacerItem1)
9297
self.comboDiameter = QtGui.QComboBox(self.dockWidgetContents)
9398
self.comboDiameter.setObjectName(_fromUtf8("comboDiameter"))
@@ -99,15 +104,17 @@ def setupUi(self, DockWidget):
99104
self.labelHoleSize.setObjectName(_fromUtf8("labelHoleSize"))
100105
self.horizontalLayout_3.addWidget(self.labelHoleSize)
101106
spacerItem2 = QtGui.QSpacerItem(
102-
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
107+
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum
108+
)
103109
self.horizontalLayout_3.addItem(spacerItem2)
104110
self.textHole = QtGui.QLineEdit(self.dockWidgetContents)
105111
self.textHole.setReadOnly(True)
106112
self.textHole.setObjectName(_fromUtf8("textHole"))
107113
self.horizontalLayout_3.addWidget(self.textHole)
108114
self.verticalLayout.addLayout(self.horizontalLayout_3)
109115
spacerItem3 = QtGui.QSpacerItem(
110-
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
116+
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding
117+
)
111118
self.verticalLayout.addItem(spacerItem3)
112119
self.gridLayout.addLayout(self.verticalLayout, 1, 0, 1, 1)
113120
DockWidget.setWidget(self.dockWidgetContents)
@@ -116,12 +123,10 @@ def setupUi(self, DockWidget):
116123
QtCore.QMetaObject.connectSlotsByName(DockWidget)
117124

118125
def retranslateUi(self, DockWidget):
119-
DockWidget.setWindowTitle(_translate(
120-
"DockWidget", "Screw hole calculator", None))
126+
DockWidget.setWindowTitle(_translate("DockWidget", "Screw hole calculator", None))
121127
self.label.setText(_translate("DockWidget", "Fastener type:", None))
122128
self.label_2.setText(_translate("DockWidget", "Screw Diameter:", None))
123-
self.labelHoleSize.setText(_translate(
124-
"DockWidget", "Suggested Hole diameter (mm):", None))
129+
self.labelHoleSize.setText(_translate("DockWidget", "Suggested Hole diameter (mm):", None))
125130

126131
#######################################################################
127132
# End position for generated code from pyuic4
@@ -133,8 +138,7 @@ def fillScrewTypes(self):
133138
self.comboFastenerType.clear()
134139
for type in FSCScrewTypes:
135140
icon, name, table = type
136-
self.comboFastenerType.addItem(
137-
QtGui.QIcon(os.path.join(iconPath, icon)), name)
141+
self.comboFastenerType.addItem(QtGui.QIcon(os.path.join(iconPath, icon)), name)
138142

139143
def fillDiameters(self):
140144
self.comboDiameter.clear()
@@ -162,7 +166,7 @@ def onTypeChange(self, typeindex):
162166
("M6", 8.75),
163167
("M8", 10.5),
164168
("M10", 14),
165-
("M12", 17)
169+
("M12", 17),
166170
)
167171

168172
# hole size +0.08
@@ -171,7 +175,7 @@ def onTypeChange(self, typeindex):
171175
("3.5M3", 5.41),
172176
("M3.5", 5.41),
173177
("M4", 7.14),
174-
("M5", 7.14)
178+
("M5", 7.14),
175179
)
176180

177181
FSCPEMStudHoleChart = (
@@ -181,15 +185,19 @@ def onTypeChange(self, typeindex):
181185
("M4", 4),
182186
("M5", 5),
183187
("M6", 6),
184-
("M8", 8)
188+
("M8", 8),
185189
)
186190

187191
FSCScrewTypes = (
188-
("ISO7045.svg", "Metric Screw", ScrewMaker.FSCScrewHoleChart),
189-
("PEMPressNut.svg", "PEM Press-nut", FSCPEMPressNutHoleChart),
190-
("PEMBLStandoff.svg", "PEM Stand-off", FSCPEMStandOffHoleChart),
191-
("PEMStud.svg", "PEM Stud", FSCPEMStudHoleChart),
192-
("ASMEB18.2.1.6.svg", "Inch Screw", ScrewMaker.FSC_Inch_ScrewHoleChart)
192+
("ISO7045.svg", translate("DockWidget", "Metric Screw"), ScrewMaker.FSCScrewHoleChart),
193+
("PEMPressNut.svg", translate("DockWidget", "PEM Press-nut"), FSCPEMPressNutHoleChart),
194+
("PEMBLStandoff.svg", translate("DockWidget", "PEM Stand-off"), FSCPEMStandOffHoleChart),
195+
("PEMStud.svg", translate("DockWidget", "PEM Stud"), FSCPEMStudHoleChart),
196+
(
197+
"ASMEB18.2.1.6.svg",
198+
translate("DockWidget", "Inch Screw"),
199+
ScrewMaker.FSC_Inch_ScrewHoleChart,
200+
),
193201
)
194202

195203
FSScrewCalcDlg = QtGui.QDockWidget()
@@ -206,11 +214,11 @@ class FSScrewCalcCommand:
206214

207215
def GetResources(self):
208216
FreeCAD.Console.PrintLog("Getting resources\n")
209-
icon = os.path.join(iconPath, 'IconScrewCalc.svg')
217+
icon = os.path.join(iconPath, "IconScrewCalc.svg")
210218
return {
211-
'Pixmap': icon, # the name of a svg file available in the resources
212-
'MenuText': _translate("DockWidget", "Screw calculator", None),
213-
'ToolTip': _translate("DockWidget", "Show a screw hole calculator", None)
219+
"Pixmap": icon, # the name of a svg file available in the resources
220+
"MenuText": translate("DockWidget", "Screw calculator"),
221+
"ToolTip": translate("DockWidget", "Show a screw hole calculator"),
214222
}
215223

216224
def Activated(self):

0 commit comments

Comments
 (0)