From 08c23166894aa65ee91bb3f0c065ee760c60eb1c Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Mon, 7 Dec 2015 17:53:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=81=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=20=D0=BD=D0=B0=20livecd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/calculate/lib/variables/locale.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pym/calculate/lib/variables/locale.py b/pym/calculate/lib/variables/locale.py
index c415271..a065c01 100644
--- a/pym/calculate/lib/variables/locale.py
+++ b/pym/calculate/lib/variables/locale.py
@@ -467,11 +467,19 @@ class VariableOsLocaleLocale(ReadonlyVariable, Locale):
         locale_file = '/etc/env.d/02locale'
         locale_val = getValueFromCmdLine("calculate", 0)
         if self.isLangExists(locale_val):
-            return self.getFieldByLang('locale', locale_val)
+            cmd_val = self.getFieldByLang('locale', locale_val)
         else:
-            locale_val = getValueFromConfig(locale_file, 'LANG')
-            if self.isValueInFieldExists('locale', locale_val):
-                return locale_val
+            cmd_val = None
+        locale_val = getValueFromConfig(locale_file, 'LANG')
+        if self.isValueInFieldExists('locale', locale_val):
+            file_val = locale_val
+        else:
+            file_val = None
+        if file_val or cmd_val:
+            if self.GetBool('cl_system_boot_set'):
+                return cmd_val or file_val
+            else:
+                return file_val or cmd_val
         if "LANG" in os.environ and os.environ["LANG"] != "C":
             return os.environ["LANG"]
         return self.getFieldByLang("locale", "default")
@@ -517,12 +525,14 @@ class VariableOsLocaleXkbname(ReadonlyVariable, Locale):
             return locale_xkb.split("(")[0]
         return ""
 
+
 class VariableOsLocaleLatSet(ReadonlyVariable, Locale):
     """
     Локаль содержит раскладку совместимую с латиницей
 
     Используется для отображения индикатора переключения языка
     """
+
     def get(self):
         """xkb layouts (example: en,ru)"""
         layout = self.Get('os_locale_xkbname').split(',')
@@ -531,6 +541,7 @@ class VariableOsLocaleLatSet(ReadonlyVariable, Locale):
         else:
             return "off"
 
+
 class VariableOsLang(ReadonlyVariable, Locale):
     """
     Supported langs