From 0fa4c6110f757da0f6ccd1802ce348413656c267 Mon Sep 17 00:00:00 2001
From: deadc0de6 <info@deadc0de.ch>
Date: Sun, 24 Sep 2023 14:20:31 +0200
Subject: [PATCH] fix dotfile trans

---
 dotdrop/cfg_yaml.py | 18 ++++++++----------
 dotdrop/dotdrop.py  |  4 ++--
 dotdrop/dotfile.py  |  4 ----
 dotdrop/importer.py | 12 ++++++------
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py
index 2d88cfb..faedacf 100644
--- a/dotdrop/cfg_yaml.py
+++ b/dotdrop/cfg_yaml.py
@@ -816,9 +816,6 @@ class CfgYaml:
         new = {}
 
         for k, val in dotfiles.items():
-            # fix depreacated trans
-            self._fix_deprecated_trans_in_dict(val)
-
             if self.key_dotfile_src not in val:
                 # add 'src' as key' if not present
                 val[self.key_dotfile_src] = k
@@ -1193,7 +1190,7 @@ class CfgYaml:
         if old_key in yamldic:
             yamldic[old_key] = yamldic[new_key]
             del yamldic[old_key]
-            msg = f'\"{old_key}\" is deprecated, '
+            msg = f'deprecated \"{old_key}\", '
             msg += f', updated to {new_key}\"'
             self._log.warn(msg)
             self._dirty = True
@@ -1225,12 +1222,13 @@ class CfgYaml:
 
     def _fix_deprecated_trans(self, yamldict):
         """fix deprecated trans key"""
-        if self.key_settings not in yamldict:
-            return
-        if not yamldict[self.key_settings]:
-            return
-        config = yamldict[self.key_settings]
-        self._fix_deprecated_trans_in_dict(config)
+        # top ones
+        self._fix_deprecated_trans_in_dict(yamldict)
+        # dotfiles ones
+        if self.key_dotfiles in yamldict and yamldict[self.key_dotfiles]:
+            config = yamldict[self.key_dotfiles]
+            for _, val in config.items():
+                self._fix_deprecated_trans_in_dict(val)
 
     def _fix_deprecated_link_by_default(self, yamldict):
         """fix deprecated link_by_default"""
diff --git a/dotdrop/dotdrop.py b/dotdrop/dotdrop.py
index e822b45..62fb803 100644
--- a/dotdrop/dotdrop.py
+++ b/dotdrop/dotdrop.py
@@ -540,8 +540,8 @@ def cmd_importer(opts):
                                       import_as=opts.import_as,
                                       import_link=opts.import_link,
                                       import_mode=opts.import_mode,
-                                      import_trans_install=opts.import_transr,
-                                      import_trans_update=opts.import_transw)
+                                      trans_install=opts.import_trans_install,
+                                      trans_update=opts.import_trans_update)
         if tmpret < 0:
             ret = False
         elif tmpret > 0:
diff --git a/dotdrop/dotfile.py b/dotdrop/dotfile.py
index 440d197..8058cd5 100644
--- a/dotdrop/dotfile.py
+++ b/dotdrop/dotfile.py
@@ -95,13 +95,9 @@ class Dotfile(DictParser):
     def _adjust_yaml_keys(cls, value):
         """patch dict"""
         value['noempty'] = value.get(cls.key_noempty, False)
-        value['trans_install'] = value.get(cls.key_trans_install)
-        value['trans_update'] = value.get(cls.key_trans_update)
         value['template'] = value.get(cls.key_template, True)
         # remove old entries
         value.pop(cls.key_noempty, None)
-        value.pop(cls.key_trans_install, None)
-        value.pop(cls.key_trans_update, None)
         return value
 
     def __eq__(self, other):
diff --git a/dotdrop/importer.py b/dotdrop/importer.py
index c0f8d83..c07879d 100644
--- a/dotdrop/importer.py
+++ b/dotdrop/importer.py
@@ -75,8 +75,8 @@ class Importer:
     def import_path(self, path, import_as=None,
                     import_link=LinkTypes.NOLINK,
                     import_mode=False,
-                    import_trans_install="",
-                    import_trans_update=""):
+                    trans_install="",
+                    trans_update=""):
         """
         import a dotfile pointed by path
         returns:
@@ -93,10 +93,10 @@ class Importer:
         # check trans_update if any
         trans_install = None
         trans_update = None
-        if import_trans_install:
-            trans_install = self.conf.get_trans_install(import_trans_install)
-        if import_trans_update:
-            trans_update = self.conf.get_trans_update(import_trans_update)
+        if trans_install:
+            trans_install = self.conf.get_trans_install(trans_install)
+        if trans_update:
+            trans_update = self.conf.get_trans_update(trans_update)
 
         return self._import(path, import_as=import_as,
                             import_link=import_link,