# HG changeset patch # User Stefano Rivera # Date 1359222074 -7200 # Node ID cb71ad1fb64b7185812b1230bfe2d3b8f0f7d873 # Parent 29c5badeef985501d84cafcabd3cd8f1ae5d314d Support dialects diff -r 29c5badeef98 -r cb71ad1fb64b pyntnclick/main.py --- a/pyntnclick/main.py Sat Jan 26 19:31:03 2013 +0200 +++ b/pyntnclick/main.py Sat Jan 26 19:41:14 2013 +0200 @@ -68,8 +68,6 @@ locale.setlocale(locale.LC_ALL, "") lang = locale.getdefaultlocale(['LANGUAGE', 'LC_ALL', 'LC_CTYPE', 'LANG'])[0] - if lang and '_' in lang: - lang = lang.split('_', 1)[0] self.resource = Resources(self._resource_module, lang) gettext.bindtextdomain(self.constants.i18n_name, self.resource.get_resource_path('locale')) diff -r 29c5badeef98 -r cb71ad1fb64b pyntnclick/resources.py --- a/pyntnclick/resources.py Sat Jan 26 19:31:03 2013 +0200 +++ b/pyntnclick/resources.py Sat Jan 26 19:41:14 2013 +0200 @@ -23,7 +23,10 @@ def __init__(self, resource_module, language=None): self.resource_module = resource_module + self.lang_dialect = language self.language = language + if language: + self.language = language.split('_', 1)[0] self._image_cache = {} self._font_cache = {} self._transformed_image_cache = {} @@ -33,8 +36,10 @@ The following directories are searched, in order: + * /_// * /// * / + * /_// * /// * / @@ -54,6 +59,8 @@ paths = [] for module in [self.resource_module, self.DEFAULT_RESOURCE_MODULE]: if self.language: + fn = os.path.join(self.lang_dialect, resource_path) + paths.append(resource_filename(module, fn)) fn = os.path.join(self.language, resource_path) paths.append(resource_filename(module, fn)) paths.append(resource_filename(module, resource_path))