Merge branch 'Beta' into preferences-refactoring

2020-05-03 23:19:40 +01:00
parent 81018b886f a9688016ad
commit 20c4c12f17
41 changed files with 13360 additions and 11390 deletions
--- a/FlatCAMTranslation.py
+++ b/FlatCAMTranslation.py
@@ -49,7 +49,7 @@ def load_languages():
        available_translations = next(os.walk(languages_path_search))[1]
    except StopIteration:
        if not available_translations:
-            languages_path_search = os.path.join(Path(__file__).parents[1], 'locale')
+            languages_path_search = os.path.join(str(Path(__file__).parents[1]), 'locale')
            try:
                available_translations = next(os.walk(languages_path_search))[1]
            except StopIteration: