From b4386d8dc750cf7d7d0bee43704efa5226e0353c Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Thu, 19 Mar 2015 13:42:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=20calcu?=
 =?UTF-8?q?late=3D=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20?=
 =?UTF-8?q?=D1=8F=D0=B7=D1=8B=D0=BA=D0=B0=20=D0=B8=20=D1=80=D0=B0=D1=81?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common.inc | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/common.inc b/common.inc
index 57cc400..6b27fdd 100644
--- a/common.inc
+++ b/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 {