modified translate

core/server/baseClass.py

@@ -31,6 +31,8 @@ import threading
 import time
 import collections
 import multiprocessing
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 #import check_rights
 from gen_pid import *

core/server/bootstrap.py

@@ -25,6 +25,8 @@ from calculate.core.datavars import DataVarsCore
 from calculate.lib.utils import ip as ip_mod
 import os, hashlib, OpenSSL, pwd, socket, sys
 from os import path
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 def check(cert, key, cert_path, data_path, certbase, args):
     error_flag = 0

core/server/cert_cmd.py

@@ -26,6 +26,8 @@ from func import new_key_req, uniq
 from calculate.lib.utils import ip as ip
 from calculate.lib.datavars import VariableError
 from itertools import *
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
     
 def getIpLocal():
     for interface in ip.getInterfaces():
@@ -1107,9 +1109,6 @@ def parse():
     parser.add_argument(
         '--start',  action='store_true', default=False, dest = 'start',
         help=_('start server'))
-    parser.add_argument(
-        '-l', '--lang', type=str, dest='lang', 
-        help=_('language for translate'))
     parser.add_argument(
         '-p', '--port', type=int, default = '8888', dest='port',
         help=_('port number'))

core/server/certificate.py

@@ -25,9 +25,12 @@ from calculate.core.server.api_types import ReturnedMessage
 from calculate.core.server.api_types import (Field, GroupField,
                 ViewInfo, ViewParams)
 from calculate.lib.datavars import VariableError
+from calculate.lib.cl_lang import getLazyLocalTranslate, setLocalTranslate
 
 from calculate.core import datavars
 import traceback
+__ = getLazyLocalTranslate(_)
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class CertificateInfo(ClassSerializer):
     """Parameters for method install"""
@@ -257,7 +260,8 @@ class CoreWsdl:
     @rpc(Integer, CertificateInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["view_cert"])
     @Dec.console('view_cert')
-    @Dec.gui('Core', 'View Cert', 'certificate-server,application-certificate')
+    @Dec.gui('Core', __('View Cert'), \
+             'certificate-server,application-certificate')
     def view_cert ( self, sid, info):
         if not info:
             errors = []

core/server/cl_server.py

@@ -35,6 +35,8 @@ import bootstrap
 
 from func import initialization
 from server_class import ClApplication
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class OpenSSLAdapter (pyOpenSSLAdapter):
     def verify_func(self, connection, x509, errnum, errdepth, ok):
@@ -82,9 +84,6 @@ def main(*args, **keywords):
     parser = cert_cmd.parse()
     args = parser.parse_args()
 
-    # translate
-    if args.lang:
-        translate(args.lang)
     port = args.port
     ob = DataVarsCore()
     ob.importCore()
@@ -267,27 +266,3 @@ def main(*args, **keywords):
     if path.exists(args.pidfile):
         os.unlink(args.pidfile)
     sys.exit(0)
-
-def translate(lang = None):
-    import locale
-    import gettext
-    
-    if lang:
-        try:
-            language = gettext.translation ('cl_core', languages = [lang])
-            language.install()
-            return 0
-        except:
-            print "lang %s not supported!" %str(lang)
-    
-    try:
-        current_locale, encoding = locale.getdefaultlocale()
-
-        language = gettext.translation ('cl_core', \
-                                                languages = [current_locale] )
-        language.install()
-        return 0
-    except:
-        pass
-    return 0
-    #print _("set locale"), current_locale

core/server/cl_template.py

@@ -27,6 +27,8 @@ from calculate.core.server.api_types import (ChoiceValue, Table, Option,
                                              Field, GroupField, ViewInfo)
 
 from calculate.core.server.baseClass import Basic
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class ClTemplate (ClassSerializer):
     args = String

core/server/cl_vers_api.py

@@ -14,11 +14,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import soaplib, os
+import soaplib, os, sys
 import soaplib
 from soaplib.serializers.primitive import String, Integer
 from soaplib.service import rpc
-
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 # client and server version
 class VERS:

core/server/cl_wsdl_core.py

@@ -1,90 +0,0 @@
-#-*- coding: utf-8 -*-
-
-# Copyright 2012 Calculate Ltd. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#import soaplib, sys, time
-
-#import lxml.etree
-#from soaplib.serializers.primitive import String, Integer, Any
-#from soaplib.serializers.clazz import Array
-
-#from soaplib.serializers.clazz import ClassSerializer
-#from soaplib.service import rpc
-
-#class NewType (ClassSerializer):
-        #helper = Integer
-        #value = Any
-        
-#class UserInfo(ClassSerializer):
-        #name = String
-        #surname = String
-
-#class GroupInfo(ClassSerializer):
-        #name = String
-        #gid = Integer
-
-#class UserInfoValue (ClassSerializer):
-        #table = UserInfo
-        
-#class GroupInfoValue (ClassSerializer):
-        #table = GroupInfo
-
-## Класс с выполняемым кодом
-#class Wsdl:
-    
-    #def say_hello_meth (self, name, times) :
-        #try:
-            #results = []
-            #self.writeFile()
-            #for i in range( 0, times ) :
-                #results.append('Hello!!!, %s %d'%(name, i))
-            ## Помещение данных в словарь процессов
-            #self.setData (results)
-
-            ## Учёт процесса выполнения
-            #while self.getPercent() < 100:
-                #time.sleep(2)
-                ## Увеличение процента выполнения процесса
-                #self.addPercent (20)
-            #return True
-        ## Обработка сигнала прерывания работы процесса
-        #except KeyboardInterrupt:
-            ## Необходимо передать Fasle для сохранения данных о процессе
-            #return False
-
-
-    #import sys, os
-    ##sys.path.insert(0,os.path.abspath('~/Home/mydir/source/my/soap/temp'))
-    #from baseClass import Basic, check_permissions
-
-    #@rpc( NewType, UserInfoValue, _returns = Array( String ) )
-    #def func (self, a, b):
-        #return []
-    
-    #@rpc( String, Integer, Array(String), Integer, Integer, String,\
-            ##_inVariableNames = {'_stri':'stri', "a" : "a"},\
-            #_returns = NewType, _outVariableName='return') #Array( String ) )
-    ## проверка прав на вызов функции
-    #@check_permissions()
-    ## кэширование параметров
-    #@Basic.cache
-    ## команда для консоли
-    #@Basic.console('cl-say-hello')
-    #@Basic.gui('Misc')
-    ##def say_hello_view
-    #def say_hello ( self, cert, sid, name, times, a = 5, _stri = "stri_"):
-        #say_hello_meth = type("CommonInstall",(self.Common, Wsdl, object), {})
-        #return self.startprocess(sid, target=say_hello_meth, \
-                        #method="say_hello_meth", args_proc = (name[0], times))

core/server/clean.py

@@ -14,11 +14,13 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import os, glob
+import os, glob, sys
 import signal
 import time, datetime
 import pickle
 import soaplib
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 # clear server files after restart
 def clean (SID_FILE, PID_FILE, SID_PID, SIDS_DIR, PIDS_DIR):

core/server/client_class.py

@@ -21,6 +21,8 @@ import httplib
 from httplib import HTTPConnection
 import socket, ssl
 import OpenSSL
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class clientHTTPSConnection (httplib.HTTPSConnection):
     

core/server/create_cert.py

@@ -18,6 +18,8 @@ import urllib, sys, getopt, os
 from M2Crypto import SSL, httpslib
 from M2Crypto import RSA, X509, EVP, m2, Rand, Err
 import socket
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 def passphrase_callback(v):
     return None

core/server/edit_groups.py

@@ -25,10 +25,14 @@ from calculate.core.server.api_types import (Field, GroupField, ViewInfo,
                                              ViewParams)
 from calculate.lib.datavars import VariableError
 from calculate.lib.utils.files import readLinesFile
+from calculate.lib.cl_lang import getLazyLocalTranslate, setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 from calculate.core import datavars
 import traceback
 
+__ = getLazyLocalTranslate(_)
+
 class GroupInfo(ClassSerializer):
     """Parameters for method install"""
     cl_page_count = String
@@ -200,7 +204,7 @@ class CoreWsdl:
     @rpc(Integer, GroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-show-groups')
-    @Dec.gui('Core', _('View Groups'), 'user-group-properties,' \
+    @Dec.gui('Core', __('View Groups'), 'user-group-properties,' \
                             'view-certificate-import,application-certificate')
     def show_groups ( self, sid, info):
         if not info:
@@ -235,7 +239,7 @@ class CoreWsdl:
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-show-group')
-    @Dec.gui(_('Detail Group'))
+    @Dec.gui(__('Detail Group'))
     def detail_group ( self, sid, info):
         if not info:
             mess = 'Field must be in list!'
@@ -359,7 +363,7 @@ class CoreWsdl:
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-change-group')
-    @Dec.gui(_('Change Group'))
+    @Dec.gui(__('Change Group'))
     @catchExcept()
     def change_group ( self, sid, info):
         dv = self.get_cache(sid,'change_group',"vars")
@@ -471,7 +475,7 @@ class CoreWsdl:
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-del-group')
-    @Dec.gui(_('Delete Group'))
+    @Dec.gui(__('Delete Group'))
     @catchExcept()
     def delete_group ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")
@@ -577,7 +581,7 @@ class CoreWsdl:
     @rpc(Integer, AddGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-add-group')
-    @Dec.gui(_('Add Group'))
+    @Dec.gui(__('Add Group'))
     @catchExcept()
     def add_group ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")

core/server/func.py

@@ -28,6 +28,8 @@ import OpenSSL
 import random, hashlib
 from api_types import Message, ReturnProgress
 from decorators import Dec
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class CoreWsdl () :
     
@@ -77,7 +79,6 @@ class CoreWsdl () :
             return return_list
         else:
             curThread = threading.currentThread()
-            print 'lang = ', curThread.lang
             for meth in self.return_guiMethod():
                 right_flag = True
                 for right in Dec.rightsMethods[meth[1]]:

core/server/request.py

@@ -24,10 +24,14 @@ from calculate.core.server.api_types import ReturnedMessage
 from calculate.core.server.api_types import (Field, GroupField, ViewInfo,
                                              ViewParams)
 from calculate.lib.datavars import VariableError
+from calculate.lib.cl_lang import getLazyLocalTranslate, setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 from calculate.core import datavars
 import traceback
 
+__ = getLazyLocalTranslate(_)
+
 class RequestInfo(ClassSerializer):
     """Parameters for method install"""
     cl_page_count = String
@@ -202,7 +206,7 @@ class CoreWsdl:
     @rpc(Integer, RequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    @Dec.gui('Core',_('View Requests'),'view-certificate-import,'\
+    @Dec.gui('Core',__('View Requests'),'view-certificate-import,'\
                                         'application-certificate')
     def show_request ( self, sid, info):
         if not info:
@@ -237,8 +241,7 @@ class CoreWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    @Dec.gui(_('Detail Request'))
-    #@Dec.gui(_('Core'),_('Detail Request'),'view-certificate-import')
+    @Dec.gui(__('Detail Request'))
     def detail_request ( self, sid, info):
         if not info:
             mess = 'Field must be int!'
@@ -385,7 +388,7 @@ class CoreWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    @Dec.gui(_('Confirm Request'))
+    @Dec.gui(__('Confirm Request'))
     @catchExcept()
     def confirm_request ( self, sid, info):
         dv = self.get_cache(sid,'confirm_request',"vars")
@@ -545,7 +548,7 @@ class CoreWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    @Dec.gui(_('Delete Request'))
+    @Dec.gui(__('Delete Request'))
     @catchExcept()
     def delete_request ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")

core/server/system_update.py

@@ -23,7 +23,8 @@ from soaplib.service import rpc, DefinitionBase
 from calculate.core.server.api_types import ReturnedMessage
 from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
                                            GroupField, ViewInfo
-
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 from calculate.core.server.baseClass import Basic
 
 class SU (ClassSerializer):
@@ -67,7 +68,7 @@ class CoreWsdl:
                 self.setProgress (perc)
             
             #self.printERROR ('No internet connected!')
-            self.endTask("System already update!")
+            self.endTask(_("System already update!"))
             
             #self.endFrame()
             # necessary for correct complete the process

core/server/test.py

@@ -25,6 +25,8 @@ from calculate.core.server.api_types import (ChoiceValue, Table, Field,
                                              ReturnedMessage)
 
 from calculate.core.server.baseClass import Basic
+from calculate.lib.cl_lang import setLocalTranslate
+setLocalTranslate('cl_core',sys.modules[__name__])
 
 class SH (ClassSerializer):
     name = String

core/server/writetodb.py

@@ -61,7 +61,7 @@ def writeToDb (num, ip, mac, client_type, data_path, certbase):
     md5.update(c)
     md5sum = md5.hexdigest()
     date = datetime.datetime.now()
-    
+
     # record
     fc = open(certbase,"a")
     fc.write("%d %s %s %s %s %s\n" %(i, md5sum, date, ip, mac, client_type))

scripts/cl-core

@@ -15,8 +15,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from calculate.core.server.cl_server import translate, main
+from calculate.core.server.cl_server import main
 
 if __name__=='__main__':
-    translate()
     main()