Added logs with translation for chromium_applier

gpoa/frontend/chromium_applier.py

@@ -25,7 +25,7 @@ import logging
 import json
 import os
 
-from util.logging import slogm
+from util.logging import slogm, log
 from util.util import is_machine_name
 
 class chromium_applier(applier_frontend):
@@ -83,7 +83,10 @@ class chromium_applier(applier_frontend):
     def set_policy(self, name, obj):
         if obj:
             self.policies[name] = obj
-            logging.info(slogm('Chromium policy \'{}\' set to {}'.format(name, obj)))
+            logdata = dict()
+            logdata['name'] = name
+            logdata['set to'] = obj
+            log('I8', logdata)
 
     def set_user_policy(self, name, obj):
         '''
@@ -101,16 +104,24 @@ class chromium_applier(applier_frontend):
                 with open(prefpath, 'r') as f:
                     settings = json.load(f)
             except FileNotFoundError as exc:
-                logging.error(slogm('Chromium preferences file {} does not exist at the moment'.format(prefpath)))
+                logdata = dict()
+                logdata['prefpath'] = prefpath
+                log('E51', logdata)
             except:
-                logging.error(slogm('Error during attempt to read Chromium preferences for user {}'.format(self.username)))
+                logdata = dict()
+                logdata['username'] = self.username
+                log('E51', logdata)
 
             if obj:
                 settings[name] = obj
 
                 with open(prefpath, 'w') as f:
                     json.dump(settings, f)
-                logging.info(slogm('Set user ({}) property \'{}\' to {}'.format(self.username, name, obj)))
+                logdata = dict()
+                logdata['user'] = self.username
+                logdata['name'] = name
+                logdata['set to'] = obj
+                log('I9', logdata)
 
     def get_home_page(self, hkcu=False):
         response = self.get_hklm_string_entry('HomepageLocation')
@@ -130,7 +141,9 @@ class chromium_applier(applier_frontend):
         os.makedirs(self.__managed_policies_path, exist_ok=True)
         with open(destfile, 'w') as f:
             json.dump(self.policies, f)
-            logging.debug(slogm('Wrote Chromium preferences to {}'.format(destfile)))
+            logdata = dict()
+            logdata['destfile'] = destfile
+            log('D97', logdata)
 
     def user_apply(self):
         '''
@@ -143,10 +156,10 @@ class chromium_applier(applier_frontend):
         All actual job done here.
         '''
         if self.__module_enabled:
-            logging.debug(slogm('Running Chromium applier for machine'))
+            log('D95')
             self.machine_apply()
         else:
-            logging.debug(slogm('Chromium applier for machine will not be started'))
+            log('D96')
         #if not self._is_machine_name:
         #    logging.debug('Running user applier for Chromium')
         #    self.user_apply()

gpoa/locale/ru_RU/LC_MESSAGES/gpoa.po

@@ -56,6 +56,12 @@ msgstr "Запуск unit systemd"
 msgid "Firefox policy"
 msgstr "Политика Firefox"
 
+msgid "Chromium policy"
+msgstr "Политика Chromium"
+
+msgid "Set user property to"
+msgstr "Установка свойств  для пользователя"
+
 # Error
 msgid "Insufficient permissions to run gpupdate"
 msgstr "Недостаточно прав для запуска gpupdate"
@@ -186,6 +192,12 @@ msgstr "Ошибка обновления конфигурации dconf"
 msgid "Unable to cache specified URI for user"
 msgstr "Невозможно кэшировать указанный URI для пользователя"
 
+msgid "Chromium preferences file does not exist at the moment"
+msgstr "Файл настроек Chromium в данный момент не существует"
+
+msgid "Error during attempt to read Chromium preferences for user"
+msgstr "Ошибка при попытке прочитать настройки Chromium для пользователя"
+
 # Error_end
 
 # Debug
@@ -397,7 +409,7 @@ msgid "GSettings applier for machine will not be started"
 msgstr "Применение настроек GSettings для машины не удалось"
 
 msgid "Removing GSettings policy file from previous run"
-msgstr "Удаление файла политики GSettings из предыдущего запуска"
+msgstr "Удаление файла политики GSettings от предыдущего запуска"
 
 msgid "Mapping Windows policies to GSettings policies"
 msgstr "Сопоставление политик Windows с политиками GSettings"
@@ -438,6 +450,15 @@ msgstr "Запуск применение настроек Firefox для маш
 msgid "Firefox applier for machine will not be started"
 msgstr "Применение настроек Firefox для компьютера не запускается"
 
+msgid "Running Chromium applier for machine"
+msgstr "Запуск применение настроек Chromium для машины"
+
+msgid "Chromium applier for machine will not be started"
+msgstr "Применение настроек Chromium для компьютера не запускается"
+
+msgid "Wrote Chromium preferences to"
+msgstr "Настройки Chromium записаны в"
+
 # Debug_end
 
 # Warning

gpoa/messages/__init__.py

@@ -28,6 +28,8 @@ def info_code(code):
     info_ids[5] = 'Unable to work with systemd unit'
     info_ids[6] = 'Starting systemd unit'
     info_ids[7] = 'Firefox policy'
+    info_ids[8] = 'Chromium policy'
+    info_ids[9] = 'Set user property to'
 
     return info_ids.get(code, 'Unknown info code')
 
@@ -83,6 +85,8 @@ def error_code(code):
     error_ids[48] = 'Error recompiling global GSettings schemas'
     error_ids[49] = 'Error update configuration dconf'
     error_ids[50] = 'Unable to cache specified URI for user'
+    error_ids[51] = 'Chromium preferences file does not exist at the moment'
+    error_ids[52] = 'Error during attempt to read Chromium preferences for user'
     
     return error_ids.get(code, 'Unknown error code')
 
@@ -182,7 +186,10 @@ def debug_code(code):
     debug_ids[92] = 'Found Firefox profile in'
     debug_ids[93] = 'Running Firefox applier for machine'
     debug_ids[94] = 'Firefox applier for machine will not be started'
-
+    debug_ids[95] = 'Running Chromium applier for machine'
+    debug_ids[96] = 'Chromium applier for machine will not be started'
+    debug_ids[97] = 'Wrote Chromium preferences to'
+    
     return debug_ids.get(code, 'Unknown debug code')
 
 def warning_code(code):