- trying to fix some conflicts
This commit is contained in:
parent
1002373484
commit
4a238463a6
@ -1,10 +1,10 @@
|
|||||||
# ########################################################## ##
|
# ##########################################################
|
||||||
# FlatCAM: 2D Post-processing for Manufacturing #
|
# FlatCAM: 2D Post-processing for Manufacturing #
|
||||||
# http://flatcam.org #
|
# http://flatcam.org #
|
||||||
# File Author: Marius Adrian Stanciu (c) #
|
# File Author: Marius Adrian Stanciu (c) #
|
||||||
# Date: 3/10/2019 #
|
# Date: 3/10/2019 #
|
||||||
# MIT Licence #
|
# MIT Licence #
|
||||||
# ########################################################## ##
|
# ##########################################################
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
@ -16,11 +16,10 @@ from PyQt5.QtCore import QSettings
|
|||||||
from flatcamGUI.GUIElements import log
|
from flatcamGUI.GUIElements import log
|
||||||
import gettext
|
import gettext
|
||||||
|
|
||||||
|
import builtins
|
||||||
|
|
||||||
# import builtins
|
if '_' not in builtins.__dict__:
|
||||||
#
|
_ = gettext.gettext
|
||||||
# if '_' not in builtins.__dict__:
|
|
||||||
# _ = gettext.gettext
|
|
||||||
|
|
||||||
# ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
|
# ISO639-1 codes from here: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
|
||||||
languages_dict = {
|
languages_dict = {
|
||||||
@ -94,8 +93,8 @@ def on_language_apply_click(app, restart=False):
|
|||||||
name.capitalize())
|
name.capitalize())
|
||||||
msgbox.setWindowTitle(_("Apply Language ..."))
|
msgbox.setWindowTitle(_("Apply Language ..."))
|
||||||
msgbox.setWindowIcon(QtGui.QIcon('share/language32.png'))
|
msgbox.setWindowIcon(QtGui.QIcon('share/language32.png'))
|
||||||
bt_yes = msgbox.addButton('Yes', QtWidgets.QMessageBox.YesRole)
|
bt_yes = msgbox.addButton(_("Yes"), QtWidgets.QMessageBox.YesRole)
|
||||||
bt_no = msgbox.addButton('No', QtWidgets.QMessageBox.NoRole)
|
bt_no = msgbox.addButton(_("No"), QtWidgets.QMessageBox.NoRole)
|
||||||
|
|
||||||
msgbox.setDefaultButton(bt_yes)
|
msgbox.setDefaultButton(bt_yes)
|
||||||
msgbox.exec_()
|
msgbox.exec_()
|
||||||
|
BIN
locale/ru/LC_MESSAGES/strings.mo
Normal file
BIN
locale/ru/LC_MESSAGES/strings.mo
Normal file
Binary file not shown.
11212
locale/ru/LC_MESSAGES/strings.po
Normal file
11212
locale/ru/LC_MESSAGES/strings.po
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user