From 9afba087bd7f0226fbb51707905aac3a42b06708 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 7 Sep 2012 03:36:40 -0400 Subject: [PATCH] Delete old settings app, move translations to new settings app --- apps/old_settings/__init__.py | 7 --- apps/old_settings/api.py | 55 ------------------ apps/old_settings/links.py | 9 --- apps/old_settings/models.py | 3 - apps/old_settings/static/images/icons/cog.png | Bin 2104 -> 0 bytes apps/old_settings/urls.py | 6 -- apps/old_settings/views.py | 55 ------------------ .../locale/bg/LC_MESSAGES/django.mo | Bin .../locale/bg/LC_MESSAGES/django.po | 0 .../locale/de_DE/LC_MESSAGES/django.mo | Bin .../locale/de_DE/LC_MESSAGES/django.po | 0 .../locale/en/LC_MESSAGES/django.mo | Bin .../locale/en/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.mo | Bin .../locale/es/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.mo | Bin .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.mo | Bin .../locale/it/LC_MESSAGES/django.po | 0 .../locale/nl_NL/LC_MESSAGES/django.mo | Bin .../locale/nl_NL/LC_MESSAGES/django.po | 0 .../locale/pl/LC_MESSAGES/django.mo | Bin .../locale/pl/LC_MESSAGES/django.po | 0 .../locale/pt/LC_MESSAGES/django.mo | Bin .../locale/pt/LC_MESSAGES/django.po | 0 .../locale/pt_BR/LC_MESSAGES/django.mo | Bin .../locale/pt_BR/LC_MESSAGES/django.po | 0 .../locale/ru/LC_MESSAGES/django.mo | Bin .../locale/ru/LC_MESSAGES/django.po | 0 29 files changed, 135 deletions(-) delete mode 100644 apps/old_settings/__init__.py delete mode 100644 apps/old_settings/api.py delete mode 100644 apps/old_settings/links.py delete mode 100644 apps/old_settings/models.py delete mode 100644 apps/old_settings/static/images/icons/cog.png delete mode 100644 apps/old_settings/urls.py delete mode 100644 apps/old_settings/views.py rename apps/{old_settings => smart_settings}/locale/bg/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/bg/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/de_DE/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/de_DE/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/en/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/en/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/es/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/es/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/fr/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/fr/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/it/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/it/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/nl_NL/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/nl_NL/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/pl/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/pl/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/pt/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/pt/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/pt_BR/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/pt_BR/LC_MESSAGES/django.po (100%) rename apps/{old_settings => smart_settings}/locale/ru/LC_MESSAGES/django.mo (100%) rename apps/{old_settings => smart_settings}/locale/ru/LC_MESSAGES/django.po (100%) diff --git a/apps/old_settings/__init__.py b/apps/old_settings/__init__.py deleted file mode 100644 index d483e386ff..0000000000 --- a/apps/old_settings/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from __future__ import absolute_import - -from project_setup.api import register_setup - -from .links import check_settings - -register_setup(check_settings) diff --git a/apps/old_settings/api.py b/apps/old_settings/api.py deleted file mode 100644 index 80441df95e..0000000000 --- a/apps/old_settings/api.py +++ /dev/null @@ -1,55 +0,0 @@ -from __future__ import absolute_import - -from django.conf import settings as django_settings -from django.utils.importlib import import_module - -settings = {} -settings_list = [] -namespaces = {} -namespace_list = [] - - -def is_superuser(context): - return context['request'].user.is_staff or context['request'].user.is_superuser - - -class SettingNamespace(object): - def __init__(self, name, label, module, sprite=None): - self.name = name - self.label = label - self.module = module - self.sprite = sprite - namespace_list.append(self) - namespaces[self.name] = self - - def __unicode__(self): - return unicode(self.label) - - def settings(self): - return [setting for setting in settings_list if setting.namespace == self] - - -class Setting(object): - def __init__(self, namespace, name, global_name, default, description=u'', hidden=False, exists=False): - self.namespace = namespace - self.name = name - self.global_name = global_name - self.default = default - self.description = description - self.hidden = hidden - self.exists = exists - - # Get the global value - value = getattr(django_settings, global_name, default) - - # Create the local entity - try: - self.module = namespace.module - setattr(self.module, name, value) - except AttributeError: - self.module = import_module(namespace.module) - setattr(self.module, name, value) - - settings_list.append(self) - settings.setdefault(self.namespace.name, []) - settings[self.namespace.name].append(self) diff --git a/apps/old_settings/links.py b/apps/old_settings/links.py deleted file mode 100644 index 90d87a8987..0000000000 --- a/apps/old_settings/links.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.utils.translation import ugettext_lazy as _ - -from navigation.api import Link - - -def is_superuser(context): - return context['request'].user.is_staff or context['request'].user.is_superuser - -check_settings = Link(text=_(u'settings'), view='setting_list', sprite='cog', icon='cog.png', condition=is_superuser, children_view_regex=[r'^setting_']) diff --git a/apps/old_settings/models.py b/apps/old_settings/models.py deleted file mode 100644 index 71a8362390..0000000000 --- a/apps/old_settings/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/apps/old_settings/static/images/icons/cog.png b/apps/old_settings/static/images/icons/cog.png deleted file mode 100644 index d53ebf1c3d85bd8965ee1a2fe3ff32ad585f53dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2104 zcmV-82*>w{P) z&}fp)ZXg&UgAp=BK-9K6W9#%EEw%Kp(^>=rj#f%Bgb+bwoNBdGky1+!9C1<8Y}$2!)@hS8mmyQqTA@&Y zg3OPe5CkTGZ1a|_mGupcf6B}>J^bh+--ObV(s#CPfBF6Cl$9kj-@ap)!)mqU)GWOh zK09|FY}PV3ak3lEp8X7h!5|bB6+z9id!fhP$Aln@++DQ@22Y>HGb50bGY9l~JuJif z7cV=&QgSD>cYF+=emc~=W%CPT zB*asV4KKYdb%)d}X$C{an^lV{VdUI7@OpjB#D0GO?7e-A5tA61N{PN}*RG>L*KRwb zP{`RkLqlg_QDr4uxNz~excx3tAXN;cd%fP{t!?e7v4ur9JtF#=v?8M4v?enDvNI}` z3f)+WO7x;dJsreH>H>w-|6QHOPua>BEC~dIxr?i+V0>aCk>^sTz(*k?3mU|^L% z8Cpr3o(`6>QZQv?Kqwr7a5$V0gvQ)FGlWB7INH+U-m$&@QM~Rz@=O;46rD~okxVW# zW@pcaGw3@h^Eq>7!@Ri#(AIGrhKGkK1N^wJwOXyP;=WqAgi${+aWfGEPNy3d*vjZP zfz%j(Kbj0gs;%`6<1ry_6fnmrtqKbZAsmT9EE-J+pwsD~upl4)a_~JE92_|C`*-&4 z=Z`6$T>FFXojZU2@gM(iEm|Q0KA(@>q5A=J(ZYol@WP8*E;08o?2x&)ZrRLWTPeb8 z-Lo42M~q|v;)wHCu3Sx+lA=2oQ?0eVgP8vTnZJtnCOA5(aJ~zLh_$wLtXW!J4I}6O zmAH2kEmDOzQM-IOTcaS|{py|sY?At=KAng>>|N(fHma(j>_VJbu8P;4gw5oX)zQO46oswJY|c?EaM)12})lY&LJY5BG05ouEWlQk5ZX zjV2?O?oXhvuRnp1NM30%G9eWqW%9Xd-TJzt&po#h9G4vuCF7vg>OhahsSV+p0umo` zQ+HHeUJff()PmRJ13#spM8o{Ne0cpgZ@|u`#)r83;v5eyh*{v{ldJqrCY=$`Pf`$~ zkIFIOL~ZSIc<{joFfd(4lgY%^Co$Ry2`SH|UqpyNc6K(bTy?*?_1Hi9xd36#m$@J! zX`{%OZ`o|+5Q{`^6M(@bVugzbtxBzeYgh#n0hQuBfvyhwgHlV`lPExov<@WK0_FN= zH#VcRk39D6Z-JZTZv3|LDDnkJ2PPVqSK`$`PnbU1db6$SB!D8FZB8S^UCMj7&6M_acFKn49$N#3|*aFto|3HNk#XNmTI*c+S=RUAQq}#doSF? zRK#W$*V7;!1^VctBiIkvJOBFU13P#>5S^|chz$<(cV}hIp6_zI3un#Bq<$Zp&Eb#t z?fugc>Y>=Q|Idrwc- zyZiU8!{eho`s1kth;zxprw0d4pmrX|m9eGc<2SnT@&;VLNSE(kyyWScWlJS}-&AYf z(a{Ngy*&-Y86JIO3V*z%_bL~B+b{%^Ey`8vz1!*!F#*=&XC{M{)%h4ly0gfEP z-+nGRfkzf$j4DkHaV$2hZXt7;^9*!y69@M1+xrt7wS4UcFIds9@}ChMa`QmB!RG-{ za)Qxq^$mI|sYas-)72$LzE@J1NQn@CKgfRzU*#W@FZ+^VTk5_9yw2ponF^rdos2rg io(QiI_<#ETBftQN\w+)/$', 'setting_list', (), 'setting_list'), - url(r'^list/$', 'setting_list', (), 'setting_list'), -) diff --git a/apps/old_settings/views.py b/apps/old_settings/views.py deleted file mode 100644 index f157752a1c..0000000000 --- a/apps/old_settings/views.py +++ /dev/null @@ -1,55 +0,0 @@ -from __future__ import absolute_import - -from django.shortcuts import render_to_response -from django.template import RequestContext -from django.utils.translation import ugettext_lazy as _ -from django.utils.safestring import mark_safe - -from common.utils import return_type, encapsulate -from common.widgets import exists_with_famfam -from navigation.api import Link - -from .api import settings_list, namespace_list, settings, namespaces -from .links import is_superuser - - -def setting_list(request, namespace_name=None, object_list=None, title=None, extra_context=None): - #TODO: check user is super user - namespace_links = [] - for namespace in namespace_list: - namespace_links.append( - Link(text=namespace.label, view='setting_list', args=[u'"%s"' % namespace.name], sprite=getattr(namespace, 'sprite') or 'cog', condition=is_superuser, children_view_regex=[r'^setting_']) - ) - - if namespace_name: - object_list = [setting for setting in settings[namespace_name] if setting.hidden == False] - title = _(u'settings for the module: %s') % namespaces[namespace_name] - - context = { - 'title': title if title else _(u'settings'), - 'object_list': object_list if not (object_list is None) else [setting for setting in settings_list if setting.hidden == False], - 'hide_link': True, - 'hide_object': True, - 'extra_columns': [ - {'name': _(u'name'), 'attribute': encapsulate(lambda x: mark_safe(u'%s
%s' % (x.global_name, x.description)))}, - {'name': _(u'default'), 'attribute': encapsulate(lambda x: return_type(x.default))}, - {'name': _(u'value'), 'attribute': encapsulate(lambda x: mark_safe(u'
%s %s
' % ( - return_type(getattr(x.module, x.name)), - exists_with_famfam(getattr(x.module, x.name)) if x.exists else '' - ))) - }, - ], - 'temporary_navigation_links': { - 'form_header': { - 'setting_list': { - 'links': namespace_links - }, - } - } - } - - if extra_context: - context.update(extra_context) - - return render_to_response('generic_list.html', context, - context_instance=RequestContext(request)) diff --git a/apps/old_settings/locale/bg/LC_MESSAGES/django.mo b/apps/smart_settings/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/bg/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/bg/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/bg/LC_MESSAGES/django.po b/apps/smart_settings/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/bg/LC_MESSAGES/django.po rename to apps/smart_settings/locale/bg/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/de_DE/LC_MESSAGES/django.mo b/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/de_DE/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/de_DE/LC_MESSAGES/django.po b/apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/de_DE/LC_MESSAGES/django.po rename to apps/smart_settings/locale/de_DE/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/en/LC_MESSAGES/django.mo b/apps/smart_settings/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/en/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/en/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/en/LC_MESSAGES/django.po b/apps/smart_settings/locale/en/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/en/LC_MESSAGES/django.po rename to apps/smart_settings/locale/en/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/es/LC_MESSAGES/django.mo b/apps/smart_settings/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/es/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/es/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/es/LC_MESSAGES/django.po b/apps/smart_settings/locale/es/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/es/LC_MESSAGES/django.po rename to apps/smart_settings/locale/es/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/fr/LC_MESSAGES/django.mo b/apps/smart_settings/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/fr/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/fr/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/fr/LC_MESSAGES/django.po b/apps/smart_settings/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/fr/LC_MESSAGES/django.po rename to apps/smart_settings/locale/fr/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/it/LC_MESSAGES/django.mo b/apps/smart_settings/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/it/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/it/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/it/LC_MESSAGES/django.po b/apps/smart_settings/locale/it/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/it/LC_MESSAGES/django.po rename to apps/smart_settings/locale/it/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/nl_NL/LC_MESSAGES/django.mo b/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/nl_NL/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/nl_NL/LC_MESSAGES/django.po b/apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/nl_NL/LC_MESSAGES/django.po rename to apps/smart_settings/locale/nl_NL/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/pl/LC_MESSAGES/django.mo b/apps/smart_settings/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/pl/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/pl/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/pl/LC_MESSAGES/django.po b/apps/smart_settings/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/pl/LC_MESSAGES/django.po rename to apps/smart_settings/locale/pl/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/pt/LC_MESSAGES/django.mo b/apps/smart_settings/locale/pt/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/pt/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/pt/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/pt/LC_MESSAGES/django.po b/apps/smart_settings/locale/pt/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/pt/LC_MESSAGES/django.po rename to apps/smart_settings/locale/pt/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/pt_BR/LC_MESSAGES/django.mo b/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/pt_BR/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/pt_BR/LC_MESSAGES/django.po b/apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/pt_BR/LC_MESSAGES/django.po rename to apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po diff --git a/apps/old_settings/locale/ru/LC_MESSAGES/django.mo b/apps/smart_settings/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from apps/old_settings/locale/ru/LC_MESSAGES/django.mo rename to apps/smart_settings/locale/ru/LC_MESSAGES/django.mo diff --git a/apps/old_settings/locale/ru/LC_MESSAGES/django.po b/apps/smart_settings/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from apps/old_settings/locale/ru/LC_MESSAGES/django.po rename to apps/smart_settings/locale/ru/LC_MESSAGES/django.po