diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-07-05 06:50:51 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-07-05 06:50:51 -0400 |
| commit | a2aadca84da88bd59e46fc1d6c6fe402f7e4cf80 (patch) | |
| tree | 297e0698e7ba202aa9d55b047b7a0049cf34a182 | |
| parent | 773adfdfe62f3772a9f9e7f96b3f57722eb5ba84 (diff) | |
| download | askbot-a2aadca84da88bd59e46fc1d6c6fe402f7e4cf80.tar.gz askbot-a2aadca84da88bd59e46fc1d6c6fe402f7e4cf80.tar.bz2 askbot-a2aadca84da88bd59e46fc1d6c6fe402f7e4cf80.zip | |
improved handling ofreading of the language settings
| -rw-r--r-- | askbot/management/commands/send_email_alerts.py | 2 | ||||
| -rw-r--r-- | askbot/models/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/search/postgresql/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/skins/loaders.py | 2 | ||||
| -rw-r--r-- | askbot/utils/translation.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/askbot/management/commands/send_email_alerts.py b/askbot/management/commands/send_email_alerts.py index f60f140d..1036fa8f 100644 --- a/askbot/management/commands/send_email_alerts.py +++ b/askbot/management/commands/send_email_alerts.py @@ -166,7 +166,7 @@ class Command(NoArgsCommand): Q_set_A = not_seen_qs Q_set_B = seen_before_last_mod_qs - if django_settings.ASKBOT_MULTILINGUAL: + if getattr(django_settings,'ASKBOT_MULTILINGUAL', False): languages = user.languages.split() else: languages = None diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 086da0ef..7f97e50d 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -3199,7 +3199,7 @@ def format_instant_notification_email( 'user_subscriptions_url': site_url(user_subscriptions_url), 'reply_separator': reply_separator, 'reply_address': reply_address, - 'is_multilingual': django_settings.ASKBOT_MULTILINGUAL + 'is_multilingual': getattr(django_settings, 'ASKBOT_MULTILINGUAL', False) } subject_line = _('"%(title)s"') % {'title': origin_post.thread.title} diff --git a/askbot/search/postgresql/__init__.py b/askbot/search/postgresql/__init__.py index 1825a92f..dea7b522 100644 --- a/askbot/search/postgresql/__init__.py +++ b/askbot/search/postgresql/__init__.py @@ -71,7 +71,7 @@ def run_full_text_search(query_set, query_text, text_search_vector_name): query_text = (query_text + ' ')*mul #the table name is a hack, because user does not have the language code - is_multilingual = getattr(django_settings, 'ASKBOT_MULTILINGUAL', True) + is_multilingual = getattr(django_settings, 'ASKBOT_MULTILINGUAL', False) if is_multilingual and table_name == 'askbot_thread': where_clause += " AND " + table_name + \ '.' + "language_code='" + language_code + "'" diff --git a/askbot/skins/loaders.py b/askbot/skins/loaders.py index bf6b5b60..d41cc366 100644 --- a/askbot/skins/loaders.py +++ b/askbot/skins/loaders.py @@ -90,7 +90,7 @@ def load_skins(language_code): #skins[skin_name].filters['media'] = filters.media return skins -if django_settings.ASKBOT_MULTILINGUAL: +if getattr(django_settings, 'ASKBOT_MULTILINGUAL', False): SKINS = dict() for lang in dict(django_settings.LANGUAGES).keys(): SKINS.update(load_skins(lang)) diff --git a/askbot/utils/translation.py b/askbot/utils/translation.py index 6aadd533..86918b27 100644 --- a/askbot/utils/translation.py +++ b/askbot/utils/translation.py @@ -2,7 +2,7 @@ from django.conf import settings as django_settings from django.utils import translation def get_language(): - if django_settings.ASKBOT_MULTILINGUAL: + if getattr(django_settings, 'ASKBOT_MULTILINGUAL', False): return translation.get_language() else: return django_settings.LANGUAGE_CODE |