diff --git a/pym/cl_lang.py b/pym/cl_lang.py index 2fa94db..eb0cf69 100644 --- a/pym/cl_lang.py +++ b/pym/cl_lang.py @@ -68,7 +68,7 @@ class lang: #self.nameDomain = '' """ Название файла перевода (Домен) если используется 1 файл перевода """ - self.__catalog = os.path.abspath('/usr/share/calculate-2.2/i18n') + self.__catalog = os.path.abspath('/usr/share/calculate/i18n') """ Путь к каталогу переводов (в этом каталоге ru_RU/LC_MESSAGES в котором файл перевода) """ diff --git a/pym/cl_vars.py b/pym/cl_vars.py index dfa7eb2..3656c20 100644 --- a/pym/cl_vars.py +++ b/pym/cl_vars.py @@ -57,7 +57,7 @@ class Data: 'value':'/var/calculate/remote/server.env'} # paths to template files - cl_template_path = {'value':["/usr/share/calculate-2.2/templates", + cl_template_path = {'value':["/usr/share/calculate/templates", "/var/calculate/templates", "/var/calculate/remote/templates"]} # paths to clt-template files diff --git a/pym/update_config/cl_update_config.py b/pym/update_config/cl_update_config.py index 507213a..b584a80 100644 --- a/pym/update_config/cl_update_config.py +++ b/pym/update_config/cl_update_config.py @@ -106,7 +106,7 @@ class shareUpdateConfigs(color_print, writeLog): patternBelongDir = re.compile("belong\(\)") patternBelongName = re.compile("belong\(([^\(\)]+)\)") patternSect = re.compile("^\s*\[([^\[\]]+)\]\s*") - templatePaths = ['/usr/share/calculate-2.2/templates', + templatePaths = ['/usr/share/calculate/templates', '/var/calculate/templates', '/var/calculate/remote/templates'] firstEnvFile = "/etc/calculate/calculate2.env" diff --git a/setup.py b/setup.py index e9cfd51..1f94646 100755 --- a/setup.py +++ b/setup.py @@ -69,7 +69,7 @@ setup( 'calculate-lib.pym.server', 'calculate-lib.pym.client', 'calculate-lib.pym.update_config'], - data_files = [("/usr/share/calculate-2.2/i18n",['i18n/cl_lib_ru.mo']), + data_files = [("/usr/share/calculate/i18n",['i18n/cl_lib_ru.mo']), ("/var/calculate/remote",[])], scripts=["./scripts/cl-update-config"], cmdclass={'build_scripts':cl_build_scripts,