Merge pull request #1773 from MycroftAI/bugfix/bad-walk

Fix path in recent locale support
MycroftAI · Aug 29, 2018 · 5c42ce8 · 5c42ce8
2 parents 979c021 + c13b40f
commit 5c42ce8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mycroft/dialog/__init__.py b/mycroft/dialog/__init__.py
@@ -120,7 +120,7 @@ def load(self, dialog_dir):
                 if f.endswith(".dialog"):
                     self.__renderer.load_template_file(
                         f.replace('.dialog', ''),
-                        join(directory, path, f))
+                        join(path, f))
         return self.__renderer
 
 

diff --git a/mycroft/skills/core.py b/mycroft/skills/core.py
@@ -577,7 +577,7 @@ def find_resource(self, res_name, old_dirname=None):
         root_path = join(self.root_dir, 'locale', self.lang)
         for path, _, files in os.walk(root_path):
             if res_name in files:
-                return join(root_path, path, res_name)
+                return join(path, res_name)
 
         # Not found
         return None

diff --git a/mycroft/skills/skill_data.py b/mycroft/skills/skill_data.py
@@ -82,7 +82,7 @@ def load_vocabulary(basedir, bus, skill_id):
         for f in files:
             if f.endswith(".voc"):
                 vocab_type = to_alnum(skill_id) + splitext(f)[0]
-                load_vocab_from_file(join(basedir, path, f), vocab_type, bus)
+                load_vocab_from_file(join(path, f), vocab_type, bus)
 
 
 def load_regex(basedir, bus, skill_id):
@@ -97,7 +97,7 @@ def load_regex(basedir, bus, skill_id):
     for path, _, files in walk(basedir):
         for f in files:
             if f.endswith(".rx"):
-                load_regex_from_file(join(basedir, path, f), bus, skill_id)
+                load_regex_from_file(join(path, f), bus, skill_id)
 
 
 def to_alnum(skill_id):