Merge branch 'consolegui3.0'

consolegui/application/tools.py

@@ -377,7 +377,7 @@ class ToolOther(QtGui.QWidget):
         self.lang_lbl.setMaximumWidth(self.lang_lbl.sizeHint().width())
 
         self.lang_ComboBox = QComboBox(self)
-        lang_dict = {'en': _('English'),'ru': _('Russian')}
+        lang_dict = {'en': _('English'),'ru': _('Russian'),'fr':_('French')}
 
         for lang in lang_dict:
             self.lang_ComboBox.addItem(lang_dict[lang])
@@ -532,4 +532,4 @@ class ToolOther(QtGui.QWidget):
                     if type (ClientObj.MainWidget.MainFrameWgt) \
                                                             == DisplayMethod:
                         ClientObj.MainWidget.display_methods()
-        return wrapper
+        return wrapper

consolegui/datavars.py

@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-__version__ = "3.0.0"
+__version__ = "3.0.2"
 __app__ = "Calculate Console"
 
 from calculate.lib.datavars import DataVars

ru/console_gui.po

@@ -883,6 +883,10 @@ msgstr "Английский"
 msgid "Russian"
 msgstr "Русский"
 
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:380
+msgid "French"
+msgstr "Французский"
+
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:394
 msgid "Path to Certificates"
 msgstr "Директория с сертификатами"

setup.py

@@ -52,10 +52,10 @@ for size in [16,22,24,48,64,72,96,128]:
 
 var_data_files = []
 
-__version__ = "0.1"
+__version__ = "3.0.2"
 __app__ = "calculate-console"
 
-locales = ("ru",'en')
+locales = ("ru",'en',"fr")
 
 class cl_console_data(install_data):
     def run (self):
@@ -90,7 +90,7 @@ class build(distutils.command.build.build):
         distutils.command.build.build.run(self)
 
     def has_po( self ) :
-        return len(glob.glob("ru/*.po")) > 0
+        return bool(len(glob.glob("%s/*.po"%i)) for i in locales)
     sub_commands = distutils.command.build.build.sub_commands + [
         ('build_po',has_po),
     ]