diff --git a/LICENCE b/LICENCE old mode 100644 new mode 100755 diff --git a/console/__init__.py b/console/__init__.py old mode 100644 new mode 100755 diff --git a/console/cl_gui.py b/console/cl_gui.py old mode 100644 new mode 100755 diff --git a/console/cl_vars_gui.py b/console/cl_vars_gui.py old mode 100644 new mode 100755 diff --git a/console/gui/Box.py b/console/gui/Box.py old mode 100644 new mode 100755 index d21f6c1..d4d5913 --- a/console/gui/Box.py +++ b/console/gui/Box.py @@ -16,7 +16,7 @@ # limitations under the License. from PySide import QtGui, QtCore -from PySide.QtGui import QMessageBox, QPixmap +from PySide.QtGui import QMessageBox from DisplayMethod import DisplayMethodScroll, StartWidget from mainframe import MainFrame @@ -50,7 +50,7 @@ class MainWgt(QtGui.QMainWindow): self.ClientObj = ClientObj self.mainwidth = 570 self.initUI() - + self.valSignal.connect(self.setScrollBarVal) def set_wid (self, i): @@ -175,9 +175,9 @@ class MainWgt(QtGui.QMainWindow): # if not list_pid: # list_pid = [] msgBox = QMessageBox() - msgBox.setText("Close your session?") - msgBox.setInformativeText('at closing session, ' - 'data %d processes will be deleted!' %len(list_pid)) + msgBox.setText(_("Close your session?")) + msgBox.setInformativeText(_('at closing session, ' \ + 'data %d processes will be deleted!') %len(list_pid)) msgBox.setStandardButtons(QMessageBox.Yes | QMessageBox.No | \ QMessageBox.Cancel) msgBox.setDefaultButton(QMessageBox.Cancel) diff --git a/console/gui/CertificateClass.py b/console/gui/CertificateClass.py old mode 100644 new mode 100755 index 2492743..3e522d1 --- a/console/gui/CertificateClass.py +++ b/console/gui/CertificateClass.py @@ -23,7 +23,7 @@ from calculate.lib.cl_datavars import ClDataVars from calculate.api.client.function import get_ip_mac_type from calculate.api.cl_api import DataVarsApi -from more import _, show_msg, LabelWordWrap, show_question,ClearLineEdit +from more import show_msg, LabelWordWrap, show_question,ClearLineEdit from create_cert import RequestCreate from client_class import HTTPSClientCertTransport import os diff --git a/console/gui/DisplayMethod.py b/console/gui/DisplayMethod.py old mode 100644 new mode 100755 index 6f433bd..2bc16d3 --- a/console/gui/DisplayMethod.py +++ b/console/gui/DisplayMethod.py @@ -117,7 +117,7 @@ class DisplayMethod(QtGui.QWidget): # transform a list into the dictionary {'group': [methods], ...} guiMethods = {} if type(results) == int: - self.layout.addWidget(LabelWordWrap(' No Methods!',self)) + self.layout.addWidget(LabelWordWrap(_('No Methods!'),self)) self.setLayout(self.layout) self.show() return 1 diff --git a/console/gui/LeftMenu.py b/console/gui/LeftMenu.py old mode 100644 new mode 100755 index 5e948d9..8b81f41 --- a/console/gui/LeftMenu.py +++ b/console/gui/LeftMenu.py @@ -17,7 +17,7 @@ from PySide import QtGui, QtCore from calculate.api.client.function import get_sid -from more import ButtonMenu, icon_visible, LabelWordWrap, _ +from more import ButtonMenu, icon_visible, LabelWordWrap class LeftMenu(QtGui.QScrollArea): diff --git a/console/gui/MainClass.py b/console/gui/MainClass.py old mode 100644 new mode 100755 diff --git a/console/gui/MainFrameResult.py b/console/gui/MainFrameResult.py old mode 100644 new mode 100755 index d2b83f3..ae81d8f --- a/console/gui/MainFrameResult.py +++ b/console/gui/MainFrameResult.py @@ -17,7 +17,7 @@ from PySide import QtGui, QtCore #from PySide.QtGui import QLabel#, QLineEdit, QPushButton, QCheckBox, QGroupBox -from more import LabelWordWrap, _, MultipleChoice +from more import LabelWordWrap, MultipleChoice from calculate.api.client.function import get_sid, switch #from more import show_msg diff --git a/console/gui/ReturnMessage.py b/console/gui/ReturnMessage.py old mode 100644 new mode 100755 diff --git a/console/gui/View_Process.py b/console/gui/View_Process.py old mode 100644 new mode 100755 diff --git a/console/gui/__init__.py b/console/gui/__init__.py old mode 100644 new mode 100755 diff --git a/console/gui/client_class.py b/console/gui/client_class.py old mode 100644 new mode 100755 index fb335f9..3d413e5 --- a/console/gui/client_class.py +++ b/console/gui/client_class.py @@ -31,7 +31,6 @@ from suds.options import Options from calculate.api.client.cert_verify import verify, get_CRL -from more import _ from more import show_msg, show_question, LabelWordWrap flag = 0 diff --git a/console/gui/conf_connection.py b/console/gui/conf_connection.py old mode 100644 new mode 100755 index 4dd1741..3be5c97 --- a/console/gui/conf_connection.py +++ b/console/gui/conf_connection.py @@ -18,7 +18,6 @@ from PySide import QtGui, QtCore from suds import WebFault import threading -import gettext from calculate.api.cl_api import DataVarsApi from calculate.api.client.function import clear @@ -37,15 +36,15 @@ class FrameConnection(QtGui.QWidget): # self.initUI() # # def initUI(self): - gettext.install('default', './', unicode=True) + grid = QtGui.QGridLayout(self) grid.setSpacing(10) - self.lbl_host = LabelWordWrap("Host: ") + self.lbl_host = LabelWordWrap(_("Host")) # f = self.lbl_host.frameShadow() # self.lbl_host.setFrameShadow(f.Plain)#Plain # self.lbl_host.setFrameRect(QtCore.QRect(3,3,3,3)) - self.lbl_port = LabelWordWrap("Port: ") + self.lbl_port = LabelWordWrap(_("Port")) self.text_host = QtGui.QLineEdit(self.ClientObj.default_host) self.text_port = QtGui.QLineEdit(self.ClientObj.default_port) ###################### @@ -83,7 +82,7 @@ class FrameConnection(QtGui.QWidget): self.cmd_connect.setIcon(QtGui.QIcon.fromTheme("network-connect")) self.cmd_connect.setDefault(True) self.cmd_connect.setAutoDefault(True) - self.cmd_connect.setMaximumWidth(100) + self.cmd_connect.setMaximumWidth(120) grid.addWidget(self.cmd_connect, 3, 2) diff --git a/console/gui/create_cert.py b/console/gui/create_cert.py old mode 100644 new mode 100755 index c16a392..81608fa --- a/console/gui/create_cert.py +++ b/console/gui/create_cert.py @@ -20,7 +20,7 @@ from M2Crypto import RSA, X509, EVP, m2#, Rand, Err from calculate.lib.cl_datavars import ClDataVars from PySide import QtGui, QtCore -from more import _, ClearLineEdit, LabelWordWrap, show_msg +from more import ClearLineEdit, LabelWordWrap, show_msg def passphrase_callback(v): return None diff --git a/console/gui/default.mo b/console/gui/default.mo deleted file mode 100644 index de19dfc..0000000 Binary files a/console/gui/default.mo and /dev/null differ diff --git a/console/gui/helpwidget.py b/console/gui/helpwidget.py old mode 100644 new mode 100755 index 31181f7..270e908 --- a/console/gui/helpwidget.py +++ b/console/gui/helpwidget.py @@ -15,22 +15,22 @@ # limitations under the License. from PySide import QtGui, QtCore -from more import _, LabelWordWrap +from more import LabelWordWrap import datetime, os - class HelpWgt(QtGui.QWidget): def __init__(self, parent): QtGui.QWidget.__init__(self) - cur_year = datetime.date.today().year + cur_year = str(datetime.date.today().year) - helpLabel = LabelWordWrap(_('%s v%s. \n'\ - 'Composed of Calculate Utilities 3.0\n' - 'Calculate Utilities разрабатываются компанией ' - 'Калкулэйт. (c) 2007-%d' %(parent.ClientObj.Name, \ - parent.ClientObj.Version, cur_year)) \ - , self) + help_text = '%s v%s. \n' %(parent.ClientObj.Name, \ + parent.ClientObj.Version) + \ + _('Composed of Calculate Utilities 3.0\n') + \ + _("Calculate Utilities developed company ") + \ + _('Calculate. (c) 2007-%s') %cur_year + + helpLabel = LabelWordWrap(help_text, self) helpLabel.setAlignment(QtCore.Qt.AlignJustify | QtCore.Qt.AlignVCenter) # "link", self) linkLabel = LabelWordWrap("Сайт компании"\ diff --git a/console/gui/mainframe.py b/console/gui/mainframe.py old mode 100644 new mode 100755 index 449e9ed..d9a09fe --- a/console/gui/mainframe.py +++ b/console/gui/mainframe.py @@ -20,7 +20,7 @@ from PySide.QtGui import QLabel, QLineEdit, QPushButton, QCheckBox, QGroupBox, \ from calculate.api.client.function import create_obj, get_sid, listToArrayArray, \ listToArray #import analysis -from more import show_msg, LabelWordWrap, MultipleChoice, _, PlusRow, \ +from more import show_msg, LabelWordWrap, MultipleChoice, PlusRow, \ CentralCheckBox, ErrorLabel, icon_visible, FileOpenWgt from suds import WebFault from ReturnMessage import ReturnedMessage diff --git a/console/gui/mainmenu.py b/console/gui/mainmenu.py old mode 100644 new mode 100755 index 5f25da6..a73698e --- a/console/gui/mainmenu.py +++ b/console/gui/mainmenu.py @@ -26,36 +26,36 @@ class MainMenu(QtGui.QWidget): self.hlayout.setAlignment(QtCore.Qt.AlignLeft) ######### Display all methods - self.Methods = TopMenu('Methods','go-previous', self) - self.Methods.setStatusTip('Display Methods') - self.Methods.setToolTip('') + self.Methods = TopMenu(_('Methods'),'go-previous', self) + self.Methods.setStatusTip(_('Display Methods')) + self.Methods.setToolTip(_('Display Methods')) self.Methods.clicked.connect(parent.display_methods) self.Methods.setVisible(False) self.hlayout.addWidget(self.Methods) ######### View information about running processes - self.Processes = TopMenu('Processes','system-run', self) - self.Processes.setStatusTip('View information about running processes') - self.Processes.setToolTip('') + self.Processes = TopMenu(_('Processes'),'system-run', self) + self.Processes.setStatusTip(_('View information about running processes')) + self.Processes.setToolTip(_('View information about running processes')) self.Processes.clicked.connect(parent.view_processes) self.Processes.setVisible(False) self.hlayout.addWidget(self.Processes) ######### View information about current session - self.Session = TopMenu('Session','document-edit-verify', self) - self.Session.setStatusTip('View information about current session') - self.Session.setToolTip('') + self.Session = TopMenu(_('Session'),'document-edit-verify', self) + self.Session.setStatusTip(_('View information about current session')) + self.Session.setToolTip(_('View information about current session')) self.Session.clicked.connect(parent.view_session_info) self.Session.setVisible(False) self.hlayout.addWidget(self.Session) ######### Exit this session - self.Disconnect = TopMenu('Disconnect','network-disconnect', self) - self.Disconnect.setStatusTip('Disconnect') - self.Disconnect.setToolTip('') + self.Disconnect = TopMenu(_('Disconnect'),'network-disconnect', self) + self.Disconnect.setStatusTip(_('Disconnect')) + self.Disconnect.setToolTip(_('Disconnect')) self.Disconnect.clicked.connect(parent.disconnect) self.Disconnect.setVisible(False) @@ -63,42 +63,42 @@ class MainMenu(QtGui.QWidget): ######### Connection - self.Connect = TopMenu('Connect','network-connect', self) - self.Connect.setStatusTip('Connect') - self.Connect.setToolTip('') + self.Connect = TopMenu(_('Connect'),'network-connect', self) + self.Connect.setStatusTip(_('Connect')) + self.Connect.setToolTip(_('Connect')) self.Connect.clicked.connect(parent.connecting) self.hlayout.addWidget(self.Connect) ######### Window work with certificates - self.Certificates = TopMenu('Certificates','view-certificate', self) - self.Certificates.setStatusTip('Window work with certificates') - self.Certificates.setToolTip('') + self.Certificates = TopMenu(_('Certificates'),'view-certificate', self) + self.Certificates.setStatusTip(_('Window work with certificates')) + self.Certificates.setToolTip(_('Window work with certificates')) self.Certificates.clicked.connect(parent.work_with_certificates) self.hlayout.addWidget(self.Certificates) ######### Tools dialog - self.Tool = TopMenu('Tool','preferences-other', self) - self.Tool.setStatusTip('Tool application') - self.Tool.setToolTip('Application Tools') + self.Tool = TopMenu(_('Tool'),'preferences-other', self) + self.Tool.setStatusTip(_('Application settings')) + self.Tool.setToolTip(_('Application settings')) self.Tool.clicked.connect(parent.tools) self.hlayout.addWidget(self.Tool) ######### View help information - self.Help = TopMenu('Help','help-about', self) - self.Help.setStatusTip('Help') - self.Help.setToolTip('About Application') + self.Help = TopMenu(_('Help'),'help-about', self) + self.Help.setStatusTip(_('Help')) + self.Help.setToolTip(_('About Application')) self.Help.clicked.connect(parent.help) self.hlayout.addWidget(self.Help) ######### Exit program - self.Exit = TopMenu('Exit','application-exit', self) - self.Exit.setStatusTip('Exit application') - self.Exit.setToolTip('Exit application') + self.Exit = TopMenu(_('Exit'),'application-exit', self) + self.Exit.setStatusTip(_('Exit application')) + self.Exit.setToolTip(_('Exit application')) self.Exit.clicked.connect(parent.close) self.hlayout.addWidget(self.Exit) diff --git a/console/gui/more.py b/console/gui/more.py old mode 100644 new mode 100755 index 75f8648..b2a4afe --- a/console/gui/more.py +++ b/console/gui/more.py @@ -130,7 +130,7 @@ class ErrorLabel (QtGui.QLabel): class LabelWordWrap(QtGui.QLabel): def __init__(self, name, parent = None): try: - name = _(name.decode('utf-8')) + name = name.decode('utf-8') except (UnicodeDecodeError, UnicodeEncodeError): pass QtGui.QLabel.__init__(self, name, parent) @@ -258,7 +258,7 @@ class CentralCheckBox (QtGui.QWidget): return self.pCheckB.isChecked() def set_label(self, text): - self.pCheckB.setText(_(text)) + self.pCheckB.setText(text) def change_label(self): if self.pCheckB.checkState() == QtCore.Qt.CheckState.PartiallyChecked: @@ -672,26 +672,23 @@ class PlusRow (QtGui.QWidget): self.close() -def _(s): - return s - def show_msg(text, title = None): msgBox = QtGui.QMessageBox() if title: - msgBox.setWindowTitle(_(title)) + msgBox.setWindowTitle(title) if type(text) != str: temp = '' for i in text: temp += str(i).decode('utf-8') text = temp - msgBox.setText(_(text)) + msgBox.setText(text) msgBox.setStandardButtons(QtGui.QMessageBox.Ok) msgBox.exec_() def show_question(parent, text, informative_text): msgBox = QtGui.QMessageBox() - msgBox.setText(_(text)) - msgBox.setInformativeText(_(informative_text)) + msgBox.setText(text) + msgBox.setInformativeText(informative_text) msgBox.setStandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) msgBox.setDefaultButton(QtGui.QMessageBox.No) msgBox.move(parent.frameGeometry().x() + parent.size().width()/2 - 150,\ diff --git a/console/gui/pid_information.py b/console/gui/pid_information.py old mode 100644 new mode 100755 diff --git a/console/gui/session_function.py b/console/gui/session_function.py old mode 100644 new mode 100755 index 3477c59..4db7915 --- a/console/gui/session_function.py +++ b/console/gui/session_function.py @@ -19,7 +19,7 @@ import sys from calculate.api.client.function import get_sid, get_ip_mac_type -from more import _, show_msg, LabelWordWrap +from more import show_msg, LabelWordWrap def client_sid(sid, client, cert_id, lang): diff --git a/console/gui/statusfield.py b/console/gui/statusfield.py old mode 100644 new mode 100755 index ec7e192..9a9352d --- a/console/gui/statusfield.py +++ b/console/gui/statusfield.py @@ -15,7 +15,6 @@ # limitations under the License. from PySide import QtGui, QtCore -from more import _ class StatusLabel(QtGui.QLabel): def __init__(self, name, width): diff --git a/console/gui/tools.py b/console/gui/tools.py old mode 100644 new mode 100755 index 39622e0..170859e --- a/console/gui/tools.py +++ b/console/gui/tools.py @@ -19,12 +19,15 @@ import os from PySide import QtGui, QtCore from PySide.QtGui import QComboBox, QColorDialog -from more import _, LabelWordWrap, FileOpenWgt, show_msg, show_question +from more import LabelWordWrap, FileOpenWgt, show_msg, show_question + + class ToolsWidget (QtGui.QWidget): def __init__(self, parent, ClientObj): QtGui.QWidget.__init__(self) + self.vlayout = QtGui.QVBoxLayout(self) self.vlayout.setAlignment(QtCore.Qt.AlignTop) self.vlayout.setAlignment(QtCore.Qt.AlignRight) @@ -62,7 +65,7 @@ class ToolsWidget (QtGui.QWidget): self.vlayout.addWidget(tab) # clear_button.setMaximumWidth(self.sizeHint().width() / 2) - clear_button.setMaximumWidth(150) + clear_button.setMaximumWidth(220) def clear_config(self, parent, ClientObj): def wrapper(): @@ -103,12 +106,12 @@ class ToolTabWidget(QtGui.QTabWidget): other_signal = QtCore.Signal() def mess(self, tab_num): - tab_list = ['Gui Tools','Other Tools'] + tab_list = [_('Gui Tools'),_('Other Tools')] if self.changed_flag: - text = 'In the %s tab has unsaved changes' \ + text = _('In the %s tab has unsaved changes') \ %tab_list[self.cur_tab_num] - informative_text = '\tApply them?' + informative_text = _('\tApply them?') reply = show_question(self.parent(), text, informative_text) diff --git a/en/console_gui.mo b/en/console_gui.mo new file mode 100644 index 0000000..08c6b77 Binary files /dev/null and b/en/console_gui.mo differ diff --git a/en/console_gui.po b/en/console_gui.po new file mode 100644 index 0000000..a0eb143 --- /dev/null +++ b/en/console_gui.po @@ -0,0 +1,378 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-16 11:15+0300\n" +"PO-Revision-Date: 2012-02-16 11:15+0300\n" +"Last-Translator: dspiridonov \n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"X-Poedit-SearchPath-0: /var/calculate/mydir/source/spyder/cl-api-client/console/gui\n" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/Box.py:178 +msgid "Close your session?" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/Box.py:179 +#, python-format +msgid "at closing session, data %d processes will be deleted!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:29 +msgid "Methods" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:30 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:31 +msgid "Display Methods" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:38 +msgid "Processes" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:39 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:40 +msgid "View information about running processes" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:47 +msgid "Session" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:48 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:49 +msgid "View information about current session" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:56 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:57 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:58 +msgid "Disconnect" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:66 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:67 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:68 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:81 +msgid "Connect" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:75 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:105 +msgid "Certificates" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:76 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:77 +msgid "Window work with certificates" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:83 +msgid "Tool" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:84 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:85 +msgid "Application settings" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:91 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:92 +msgid "Help" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:93 +msgid "About Application" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:99 +msgid "Exit" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:100 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:101 +msgid "Exit application" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:53 +msgid "User@Server_HostName" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:63 +msgid "User Name" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:68 +msgid "Organization Name" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:73 +msgid "Network address" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:78 +msgid "State Name" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:83 +msgid "Country (2 words)" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:93 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:107 +msgid "Create Request" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:98 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:255 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:414 +msgid "Cancel" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:148 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:267 +msgid " Step " +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:204 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:248 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/LeftMenu.py:271 +msgid " > Step " +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:29 +msgid "Composed of Calculate Utilities 3.0\n" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:30 +msgid "Calculate Utilities developed company " +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:31 +#, python-format +msgid "Calculate. (c) 2007-%s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:39 +msgid "Quit" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:68 +msgid "Calculate Utilities" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:52 +#, python-format +msgid "Your certificate ID = %s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:56 +msgid " New Session" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:57 +msgid " Old Session" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:58 +#, python-format +msgid " Your session id = %s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:60 +msgid "Certificate not send!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:62 +#, python-format +msgid " Your certifitate id = %d" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:65 +msgid "expiry date certificate has passed" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/session_function.py:67 +#, python-format +msgid "shelf life expires after %d days" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/more.py:195 +msgid "Open" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/more.py:577 +msgid "Yes" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:48 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:66 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:43 +msgid "Host" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:49 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:67 +msgid "Enter Host" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:52 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:70 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:47 +msgid "Port" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:62 +msgid "Send certificate signing request" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:80 +msgid "Get certificate from server" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:114 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:202 +msgid "Enter Hostname or IP adress" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:114 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:202 +msgid "Field \"Host\" Error!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:119 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:207 +msgid "Enter Port" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:119 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:207 +msgid "Field \"Port\" Error!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:146 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:218 +#, python-format +msgid "Error code: %s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:146 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:218 +msgid "Close. Connecting Error." +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:180 +msgid "This server can not sign certificate!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:185 +#, python-format +msgid "Your request id = %s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:318 +msgid "filename = " +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:321 +msgid "file with ca certificates exists" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:38 +msgid "Tools" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:58 +msgid "Clear config" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:97 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:109 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:134 +msgid "Gui Tools" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:98 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:109 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:138 +msgid "Other Tools" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:112 +#, python-format +msgid "In the %s tab has unsaved changes" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:114 +msgid "\tApply them?" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:156 +msgid "Select Color" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:186 +msgid "Path to bg Image" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:195 +msgid "Select repeat background" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:215 +msgid "Set opacity " +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:246 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:405 +msgid "Ok" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:251 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:410 +msgid "Apply" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:371 +msgid "Select Language" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:388 +msgid "Path to Certificates" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/MainFrameResult.py:395 +#, python-format +msgid "Percent = %s" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/MainFrameResult.py:463 +msgid "Send" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/DisplayMethod.py:120 +msgid "No Methods!" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/client_class.py:113 +msgid "Add certificate to trusted" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:331 +msgid "Press for advanced settings." +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:624 +msgid "Previous" +msgstr "" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:645 +msgid "Next" +msgstr "" + diff --git a/ru/console_gui.mo b/ru/console_gui.mo new file mode 100755 index 0000000..6b94663 Binary files /dev/null and b/ru/console_gui.mo differ diff --git a/console/gui/default.po b/ru/console_gui.po old mode 100644 new mode 100755 similarity index 54% rename from console/gui/default.po rename to ru/console_gui.po index 3d2a32a..b303477 --- a/console/gui/default.po +++ b/ru/console_gui.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: console_gui_translate\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-15 15:55+0300\n" -"PO-Revision-Date: 2012-02-15 16:11+0300\n" +"POT-Creation-Date: 2012-02-16 11:04+0300\n" +"PO-Revision-Date: 2012-02-16 11:06+0300\n" "Last-Translator: dspiridonov \n" "Language-Team: \n" "Language: \n" @@ -15,6 +15,92 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /var/calculate/mydir/source/spyder/cl-api-client/console/gui\n" +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/Box.py:178 +msgid "Close your session?" +msgstr "Закрыть данную сессию?" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/Box.py:179 +#, python-format +msgid "at closing session, data %d processes will be deleted!" +msgstr "При закрытии сессии данные %d процессов будут удалены!" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:29 +msgid "Methods" +msgstr "Главная" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:30 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:31 +msgid "Display Methods" +msgstr "Просмотр методов" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:38 +msgid "Processes" +msgstr "Процессы" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:39 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:40 +msgid "View information about running processes" +msgstr "Просмотр информации о запущенных процессах" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:47 +msgid "Session" +msgstr "Сессия" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:48 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:49 +msgid "View information about current session" +msgstr "Просмотр информации о текущей сессии" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:56 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:57 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:58 +msgid "Disconnect" +msgstr "Отсоединиться" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:66 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:67 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:68 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:81 +msgid "Connect" +msgstr "Соединиться" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:75 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:105 +msgid "Certificates" +msgstr "Сертификаты" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:76 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:77 +msgid "Window work with certificates" +msgstr "Окно работы с сертификатами" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:83 +msgid "Tool" +msgstr "Настройки" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:84 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:85 +msgid "Application settings" +msgstr "Настройки приложения" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:91 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:92 +msgid "Help" +msgstr "Помощь" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:93 +msgid "About Application" +msgstr "О приложении" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:99 +msgid "Exit" +msgstr "Выход" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:100 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainmenu.py:101 +msgid "Exit application" +msgstr "Закрыть приложение" + #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:53 msgid "User@Server_HostName" msgstr "Пользователь@Имя_сервера" @@ -45,6 +131,8 @@ msgid "Create Request" msgstr "Создать Запрос на подпись сертификата" #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/create_cert.py:98 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:255 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:414 msgid "Cancel" msgstr "Отмена" @@ -59,16 +147,18 @@ msgstr " Шаг " msgid " > Step " msgstr " > Шаг " -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:28 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:29 +msgid "Composed of Calculate Utilities 3.0\n" +msgstr "Входит в состав Calculate Utilities 3.0\n" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:30 +msgid "Calculate Utilities developed company " +msgstr "Calculate Utilities Разрабатываются компанией " + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:31 #, python-format -msgid "" -"%s v%s. \n" -"Composed of Calculate Utilities 3.0\n" -"Calculate Utilities разрабатываются компанией Калкулэйт. (c) 2007-%d" -msgstr "" -"%s v%s. \n" -"Входит в состав Calculate Utilities 3.0\n" -"Calculate Utilities разрабатываются компанией Калкулэйт. (c) 2007-%d" +msgid "Calculate. (c) 2007-%s" +msgstr "Калкулэйт. (c) 2007-%s" #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/helpwidget.py:39 msgid "Quit" @@ -124,6 +214,7 @@ msgstr "Да" #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:48 #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:66 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:43 msgid "Host" msgstr "Хост" @@ -134,14 +225,10 @@ msgstr "Введите Хост" #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:52 #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:70 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/conf_connection.py:47 msgid "Port" msgstr "Порт" -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:54 -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:72 -msgid "8888" -msgstr "8888" - #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:62 msgid "Send certificate signing request" msgstr "Отправить запрос на подпись сертификата" @@ -150,10 +237,6 @@ msgstr "Отправить запрос на подпись сертификат msgid "Get certificate from server" msgstr "Забрать сертификат с сервера" -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:105 -msgid "Certificates" -msgstr "Сертификаты" - #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:114 #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/CertificateClass.py:202 msgid "Enter Hostname or IP adress" @@ -202,6 +285,69 @@ msgstr "Имя файла =" msgid "file with ca certificates exists" msgstr "Файл с сертификатом удостоверяющего центра создан" +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:38 +msgid "Tools" +msgstr "Настройки" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:58 +msgid "Clear config" +msgstr "Очистить файл конфигурации" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:97 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:109 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:134 +msgid "Gui Tools" +msgstr "Настройки интерфейса" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:98 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:109 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:138 +msgid "Other Tools" +msgstr "Прочие настройки" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:112 +#, python-format +msgid "In the %s tab has unsaved changes" +msgstr "На вкладке %s имеются несохранённые изменения" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:114 +msgid "\tApply them?" +msgstr "\tПрименить их?" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:156 +msgid "Select Color" +msgstr "Выбор цвета" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:186 +msgid "Path to bg Image" +msgstr "Путь к фоновому изображению" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:195 +msgid "Select repeat background" +msgstr "Повтор фона" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:215 +msgid "Set opacity " +msgstr "Прозрачность " + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:246 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:405 +msgid "Ok" +msgstr "Ok" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:251 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:410 +msgid "Apply" +msgstr "Применить" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:371 +msgid "Select Language" +msgstr "Выбор языка" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/tools.py:388 +msgid "Path to Certificates" +msgstr "Директория с сертификатами" + #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/MainFrameResult.py:395 #, python-format msgid "Percent = %s" @@ -211,7 +357,11 @@ msgstr "Процент = %s" msgid "Send" msgstr "Отправить" -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/client_class.py:114 +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/DisplayMethod.py:120 +msgid "No Methods!" +msgstr "Нет доступных методов!" + +#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/client_class.py:113 msgid "Add certificate to trusted" msgstr "Добавить сертификат в доверенные" @@ -223,11 +373,24 @@ msgstr "Нажмите для дополнительных настроек" msgid "Previous" msgstr "Назад" -#: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:636 -msgid "Ok" -msgstr "Ok" - #: /var/calculate/mydir/source/spyder/cl-api-client/console/gui/mainframe.py:645 msgid "Next" msgstr "Далее" +#~ msgid "" +#~ "%s v%s. \n" +#~ "Composed of Calculate Utilities 3.0\n" +#~ "Calculate Utilities developed company Calculate. (c) 2007-%s" +#~ msgstr "" +#~ "%s v%s. \n" +#~ "Входит в состав Calculate Utilities 3.0\n" +#~ "Calculate Utilities разрабатываются компанией Калкулэйт. (c) 2007-%s" + +#~ msgid "Host: " +#~ msgstr "Хост: " + +#~ msgid "Port: " +#~ msgstr "Порт: " + +#~ msgid "8888" +#~ msgstr "8888" diff --git a/scripts/client-gui b/scripts/client-gui index ee334c4..0a624e6 100755 --- a/scripts/client-gui +++ b/scripts/client-gui @@ -5,6 +5,10 @@ import sys from PySide import QtGui, QtCore from calculate.console.gui.MainClass import ApiClient +import gettext + +gettext.install('console_gui', '/usr/share/locale', unicode=True) + app = QtGui.QApplication(sys.argv) ClientObj = ApiClient(app) diff --git a/setup.cfg b/setup.cfg old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index 27219ea..56800c2 100755 --- a/setup.py +++ b/setup.py @@ -17,8 +17,15 @@ # limitations under the License. import os +from os import path +import glob +import sys + +import distutils from distutils.core import setup from distutils.command.install_data import install_data +import distutils.command.build +import distutils.command.install_egg_info data_files = [] @@ -27,20 +34,22 @@ var_data_files = [] __version__ = "0.1" __app__ = "calculate-console" +locales = ("ru","en") + class cl_console_data(install_data): def run (self): install_data.run(self) data_file = []#("/usr/lib/python2.7/site-packages/calculate/api/images/tool.png",0755)] - fileNames = map(lambda x: os.path.split(x[0])[1], data_file) + fileNames = map(lambda x: path.split(x[0])[1], data_file) listNames = map(lambda x: filter(lambda y: y, x[0].split("/")), data_file) data_find = {} for i in range(len(fileNames)): listNames[i].reverse() data_find[fileNames[i]] =[listNames[i],data_file[i][1]] - + for path in self.get_outputs(): - nameFile = os.path.split(path)[1] + nameFile = path.split(path)[1] if nameFile in data_find.keys(): data = data_find[nameFile][0] mode = data_find[nameFile][1] @@ -48,13 +57,78 @@ class cl_console_data(install_data): iMax = len(data) pathFile = path for i in range(iMax): - if data[i] != os.path.split(pathFile)[1]: + if data[i] != path.split(pathFile)[1]: flagFound = False break - pathFile = os.path.split(pathFile)[0] + pathFile = path.split(pathFile)[0] if flagFound: os.chmod(path, mode) +class build(distutils.command.build.build): + def run (self): + distutils.command.build.build.run(self) +# data_file = []#("/usr/lib/python2.7/site-packages/calculate/api/images/tool.png",0755)] +# fileNames = map(lambda x: os.path.split(x[0])[1], data_file) +# listNames = map(lambda x: filter(lambda y: y, x[0].split("/")), +# data_file) +# data_find = {} +# for i in range(len(fileNames)): +# listNames[i].reverse() +# data_find[fileNames[i]] =[listNames[i],data_file[i][1]] + +# for path in self.get_outputs(): +# nameFile = os.path.split(path)[1] +# if nameFile in data_find.keys(): +# data = data_find[nameFile][0] +# mode = data_find[nameFile][1] +# flagFound = True +# iMax = len(data) +# pathFile = path +# for i in range(iMax): +# if data[i] != os.path.split(pathFile)[1]: +# flagFound = False +# break +# pathFile = os.path.split(pathFile)[0] +# if flagFound: +# os.chmod(path, mode) + + def has_po( self ) : + return len(glob.glob("ru/*.po")) > 0 + sub_commands = distutils.command.build.build.sub_commands + [ + ('build_po',has_po), + ] + +class empty_egg_info( distutils.command.install_egg_info.install_egg_info ): + def run(self): + pass + +def cout(string): + sys.stdout.write(string) + sys.stdout.flush() + +class build_po( distutils.core.Command ) : + + description = "build translation files" + user_options = [] + + def initialize_options( self ) : + pass + def finalize_options( self ) : + pass + + def run( self ) : + #self.mkpath("build") + #build.run( self ) + for locale in locales: + localepath = path.join("build",locale,"LC_MESSAGES") + self.mkpath(localepath) + self.mkpath(locale) + for po in glob.glob("%s/*.po"%locale) : + cmd = "msgfmt -c -o %s/%s %s" % \ + (localepath,path.basename(po)[:-2]+'mo',po) + cout( cmd + "\n" ) + os.system(cmd) + setup( name = __app__, version = __version__, @@ -63,9 +137,16 @@ setup( author_email = "support@calculate.ru", url = "http://calculate-linux.org", license = "http://www.apache.org/licenses/LICENSE-2.0", - data_files = data_files, +# data_files = [("",(glob.glob("build/locale/*.mo")))], + + data_files = [ + (path.join('/usr/share/locale',locale,"LC_MESSAGES"), + glob.glob(path.join("build",locale,"LC_MESSAGES/*.mo"))) + for locale in locales ], + package_dir = {'calculate.console': "console"}, packages = ['calculate.console','calculate.console.gui'], scripts = ['./scripts/client-gui'], - cmdclass={'cl_console_data': cl_console_data} + cmdclass={'cl_console_data': cl_console_data,'build': build,'build_po':build_po, \ + 'install_egg_info':empty_egg_info} )