Вывод в calculate= параметр языка и раскладки

common.inc

@@ -359,31 +359,13 @@
     config.lang {
       config.lang "en" ne {
         config.lang
-        config.lang "_" strstr 0 eq {
-          "debian-installer/language=%s "
-        } {
-          "locale=%s "
-        } ifelse
+        "calculate=lang:%s,"
         bc.cmd dup length add sprintf
       } if
     } if
 
     config.lang "en" ne config.keymap .km.name get "us" ne or {
-      /keymap.op keymap.explicit { "=" } { "?=" } ifelse def
-      config.keymap .km.name get
-      dup "_" strstr dup 0 eq {
-        pop
-        keymap.op "keyboard-configuration/layoutcode%s%s " bc.cmd dup length add sprintf
-      } {
-        over over 1 sub 0 put
-        over keymap.op "keyboard-configuration/layoutcode%s%s " bc.cmd dup length add sprintf
-        add keymap.op "keyboard-configuration/variantcode%s%s " bc.cmd dup length add sprintf
-      } ifelse
-      config.keymap .km.model get dup {
-        keymap.op "keyboard-configuration/modelcode%s%s " bc.cmd dup length add sprintf
-      } {
-        pop
-      } ifelse
+      config.keymap .km.name get "keymap:%s," bc.cmd dup length add sprintf
     } if
 
     modes.selected.append .undef ne {