Fixed tests.

botshot · Jul 1, 2019 · ff75479 · ff75479
1 parent 0976252
commit ff75479
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/botshot/core/dialog.py b/botshot/core/dialog.py
@@ -36,7 +36,7 @@ def reset_locale(self, locale=None):
         if not locale:
             locale = 'en_US'
             meta = self.conversation.meta
-            if meta and 'locale' in meta:
+            if meta is not None:
                 locale = meta.get('locale', 'en_US')
         strings.set_locale(locale)
 

diff --git a/botshot/core/strings.py b/botshot/core/strings.py
@@ -48,8 +48,9 @@ def __init__(self, locale='en_US'):
         string_files = config.get("STRING_FILES")
         if not string_files:
             logging.debug("STRING_FILES not set. Strings will not be available.")
-        for lang, filename in string_files.items():
-            self.strings[lang] = self._load_strings(filename)
+        else:
+            for lang, filename in string_files.items():
+                self.strings[lang] = self._load_strings(filename)
 
     def _load_strings(self, filename):
         strings = {}