From 5398c45c8287b5c03dc6205678cbdbb9b71bbda9 Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 01:59:49 +0200
Subject: [PATCH 1/6] allow empty values

---
 constance/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constance/admin.py b/constance/admin.py
index 4081ca3..09d2bd7 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -20,7 +20,7 @@ from constance import config, settings
 NUMERIC_WIDGET = forms.TextInput(attrs={'size': 10})
 
 INTEGER_LIKE = (fields.IntegerField, {'widget': NUMERIC_WIDGET})
-STRING_LIKE = (fields.CharField, {'widget': forms.Textarea(attrs={'rows': 3})})
+STRING_LIKE = (fields.CharField, {'widget': forms.Textarea(attrs={'rows': 3}), 'required': False})
 
 FIELDS = {
     bool: (fields.BooleanField, {'required': False}),

From 5e14b2946684312bb0554482347f7d3a07edb05f Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 02:11:13 +0200
Subject: [PATCH 2/6] django 1.4 compatibility

---
 constance/templates/admin/constance/change_list.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/constance/templates/admin/constance/change_list.html b/constance/templates/admin/constance/change_list.html
index ef1fa89..77a63e5 100644
--- a/constance/templates/admin/constance/change_list.html
+++ b/constance/templates/admin/constance/change_list.html
@@ -1,11 +1,11 @@
 {% extends "admin/base_site.html" %}
-{% load adminmedia admin_list i18n %}
+{% load admin_static admin_list i18n %}
 
 
 {% block extrastyle %}
   {{ block.super }}
-  <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
-  <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
+  <link rel="stylesheet" type="text/css" href="{% static 'admin/css/changelists.css' %}" />
+  <link rel="stylesheet" type="text/css" href="{% static 'admin/css/forms.css' %}" />
   {{ media.css }}
 <style>
 #result_list .changed {
@@ -55,7 +55,11 @@
                             {{item.form_field}}
                         </td>
                     <td>
-                        <img src="{% admin_media_prefix %}img/icon-{% if item.modified %}yes{% else %}no{% endif %}.gif" alt="{{ item.modified }}" />
+                        {% if item.modified %}
+                            <img src="{% static 'admin/img/icon-yes.gif' %}" alt="{{ item.modified }}" />
+                        {% else %}
+                            <img src="{% static 'admin/img/icon-no.gif' %}" alt="{{ item.modified }}" />
+                        {% endif %}
                     </td>
                     </tr>
                 {% endfor %}

From 6dfbb7e4627511850ec947937fb607b3d2eb6fca Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 02:25:14 +0200
Subject: [PATCH 3/6] remove unused import

---
 constance/backends/database/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/constance/backends/database/__init__.py b/constance/backends/database/__init__.py
index 4d93566..d0e4bb0 100644
--- a/constance/backends/database/__init__.py
+++ b/constance/backends/database/__init__.py
@@ -1,6 +1,5 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models.signals import post_save
-from django.utils.functional import memoize
 from django.core.cache import get_cache
 from django.core.cache.backends.locmem import CacheClass as LocMemCacheClass
 

From 0def9aab18b8db8ff3638474aa0252149cd653f5 Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 02:27:32 +0200
Subject: [PATCH 4/6] django 1.4 depreciation

---
 constance/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constance/admin.py b/constance/admin.py
index 09d2bd7..7091d49 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -6,7 +6,7 @@ from django import forms
 from django.contrib import admin
 from django.contrib.admin import widgets
 from django.contrib.admin.options import csrf_protect_m
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from django.forms import fields
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response

From e7d4d5e860097e53b21b28c8cb38b1f94a886628 Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 02:28:31 +0200
Subject: [PATCH 5/6] option to allow non-superusers to update settings

---
 constance/admin.py    | 8 ++++----
 constance/settings.py | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/constance/admin.py b/constance/admin.py
index 7091d49..1f96865 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -111,11 +111,11 @@ class ConstanceAdmin(admin.ModelAdmin):
     def has_delete_permission(self, *args, **kwargs):
         return False
 
-    def has_change_permission(self, request, obj=None, *args, **kwargs):
-        if request.user.is_superuser:
-            return True
+    def has_change_permission(self, request, obj=None):
+        if settings.SUPERUSER_ONLY:
+            return request.user.is_superuser
         else:
-            return False
+            return super(ConstanceAdmin, self).has_change_permission(request, obj)
 
 
 class Config(object):
diff --git a/constance/settings.py b/constance/settings.py
index 83e4648..86a6354 100644
--- a/constance/settings.py
+++ b/constance/settings.py
@@ -20,3 +20,5 @@ REDIS_CONNECTION = getattr(settings, 'CONSTANCE_REDIS_CONNECTION',
 
 DATABASE_CACHE_BACKEND = getattr(settings, 'CONSTANCE_DATABASE_CACHE_BACKEND',
                                  None)
+
+SUPERUSER_ONLY = getattr(settings, 'CONSTANCE_ACCESS_SUPERUSER_ONLY', True)

From ea8e1eca3ad78f775317243cafb6f4b7731ba202 Mon Sep 17 00:00:00 2001
From: Janusz Harkot <janusz.harkot@gmail.com>
Date: Mon, 3 Sep 2012 02:36:47 +0200
Subject: [PATCH 6/6] add Polish translation

---
 constance/locale/pl/LC_MESSAGES/django.mo | Bin 0 -> 947 bytes
 constance/locale/pl/LC_MESSAGES/django.po |  60 ++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 constance/locale/pl/LC_MESSAGES/django.mo
 create mode 100644 constance/locale/pl/LC_MESSAGES/django.po

diff --git a/constance/locale/pl/LC_MESSAGES/django.mo b/constance/locale/pl/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..350d51c3de9f4142ae6c6c2773eee2904aed10a7
GIT binary patch
literal 947
zcmYL{&rcIU6vs!!Uu#UngC`H8Mgo#4+rj~t7OAvAwWSRf3|!2(ovuT-GtJH{*oKqQ
z7*C$`!o{QhA8_+;@Ne-uOG97s@_BFe``-N6_wWAH4+6Ube+akmY4~5bvwK(I;52v>
zd<;&3&p=nR06qa%#_R9K?10y?F2UQN20d^H{)T^sKS0i|U949?r)z?D!F})%7=f<O
zH}D4d9dx>%;4SdiIR68pWp*~;(%c!HIju8S>-xF7pd{;g6?A9IY+Wm3xe5ghwd%@<
zR797ju_ar&FG$VMzV67b6dh8RM}it*tyGbr>7c`{=une}p)jVK#_=#mwmFL4@FPL?
zc$^A?o)_IGks+-_ABxbjT8Hh4#7M0I>gSfc9Wl^}WepR_4ttqKhP8D-y;if$))T=k
zgsg&116uI&1?E3z{v!1Y!D3<FFZe!$Y)2eP*Kn-cua<XMqsb~|y44ICwfTeQcGatM
zV_7@l%Ea92B%rUjO3jFF@ua6MEgoiR?n9QYMSU*gT&Vl2C{$6(Bf;8&_XAolZ*T6F
zH><Q*udl^2r;})+3Fsj98ns4sa>snm_wd|SC~Q9*;2u_dv<rinOSM8n?1$Ga?Y1}A
z@<iv3*%b+^st`XyMFCxYFRj;#(}c%tLnnO`P&LR>Q(9cXw(d)5R+UP5`hxltpP%Oa
z)lz}Z%w%D)wB*8Bx9k`5K0P_f)}6+mLroqvg*lJB&L#rw!b46k2ZdC0e|UZxD=A1z
zhoiGER`kdL=49BFJ$=j-CoP^}5^OT0BaHz#|Ac_|Y|3LfateV-869(Szz5Qd$XlLR
QeSUiOl?=v(m%)(y2OTr*eE<Le

literal 0
HcmV?d00001

diff --git a/constance/locale/pl/LC_MESSAGES/django.po b/constance/locale/pl/LC_MESSAGES/django.po
new file mode 100644
index 0000000..9f97247
--- /dev/null
+++ b/constance/locale/pl/LC_MESSAGES/django.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-03 02:32+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Janusz Harkot <janusz.harkot@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2)\n"
+
+#: admin.py:79
+msgid "Live settings updated successfully."
+msgstr "Parametry zostały zaktualizowane"
+
+#: admin.py:83
+msgid "Constance config"
+msgstr "Konfiguracja Constance"
+
+#: backends/database/models.py:18
+msgid "constance"
+msgstr "parametr"
+
+#: backends/database/models.py:19
+msgid "constances"
+msgstr "parametry"
+
+#: templates/admin/constance/change_list.html:39
+msgid "Name"
+msgstr "Nazwa"
+
+#: templates/admin/constance/change_list.html:40
+msgid "Default"
+msgstr "Domyślnie"
+
+#: templates/admin/constance/change_list.html:41
+msgid "Value"
+msgstr "Wartość"
+
+#: templates/admin/constance/change_list.html:42
+msgid "Is modified"
+msgstr "Zmodyfikowana"
+
+#: templates/admin/constance/change_list.html:68
+msgid "Save"
+msgstr "Zapisz"
+
+#: templates/admin/constance/change_list.html:78
+msgid "Home"
+msgstr "Początek"