cleanup

mozilla · Oct 12, 2010 · ca560ed · ca560ed
1 parent 13286ed
commit ca560ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 46 deletions.
diff --git a/apps/amo/fixtures/base/licenses.json b/apps/amo/fixtures/base/licenses.json
@@ -3,11 +3,7 @@
         "pk": 1035,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2010-04-13 16:01:36",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2010-04-13 16:01:36",
             "some_rights": false,
             "builtin": 9,
@@ -18,11 +14,7 @@
         "pk": 1034,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2010-04-13 16:01:36",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2010-04-13 16:01:36",
             "some_rights": false,
             "builtin": 8,
@@ -33,11 +25,7 @@
         "pk": 22,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-05-01 17:29:25",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-05-01 17:29:25",
             "some_rights": false,
             "builtin": 6,
@@ -48,11 +36,7 @@
         "pk": 18,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-05-01 08:36:09",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-05-01 08:36:09",
             "some_rights": false,
             "builtin": 7,
@@ -63,11 +47,7 @@
         "pk": 16,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-05-01 08:02:14",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-05-01 08:02:14",
             "some_rights": false,
             "builtin": 4,
@@ -78,11 +58,7 @@
         "pk": 13,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-05-01 05:00:44",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-05-01 05:00:44",
             "some_rights": false,
             "builtin": 2,
@@ -93,11 +69,7 @@
         "pk": 12,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-05-01 04:53:42",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-05-01 04:53:42",
             "some_rights": false,
             "builtin": 5,
@@ -108,11 +80,7 @@
         "pk": 6,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-04-30 23:48:48",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-04-30 23:48:48",
             "some_rights": false,
             "builtin": 3,
@@ -123,11 +91,7 @@
         "pk": 5,
         "model": "versions.license",
         "fields": {
-            "name": null,
             "created": "2009-04-30 22:29:53",
-            "url": null,
-            "text": null,
-            "icons": null,
             "modified": "2009-04-30 22:29:53",
             "some_rights": false,
             "builtin": 1,

diff --git a/apps/devhub/forms.py b/apps/devhub/forms.py
@@ -50,12 +50,12 @@ def LicenseForm(*args, **kw):
 
     class _Form(happyforms.ModelForm):
         builtin = forms.TypedChoiceField(choices=cs, coerce=int,
-                                         widget=forms.RadioSelect(attrs={'class': 'license'}))
+            widget=forms.RadioSelect(attrs={'class': 'license'}))
         name = forms.CharField(widget=TranslationTextInput(),
-                               label="What is your license\'s name?",
+                               label=_("What is your license's name?"),
                                required=False, initial=_('Custom License'))
         text = forms.CharField(widget=TranslationTextarea(), required=False,
-                               label="Provide the text of your license.")
+                               label=_('Provide the text of your license.'))
 
         class Meta:
             model = License
@@ -86,15 +86,14 @@ def save(self, commit=True):
 class PolicyForm(happyforms.ModelForm):
     """Form for editing the add-ons EULA and privacy policy."""
     has_eula = forms.BooleanField(required=False,
-                                  label=_("This add-on has an End User License Agreement"))
-    eula = forms.CharField(widget=TranslationTextarea(),
-                           required=False,
-                           label="Please specify your add-on\'s End User License Agreement:")
+        label=_('This add-on has an End User License Agreement'))
+    eula = forms.CharField(widget=TranslationTextarea(), required=False,
+        label=_("Please specify your add-on's End User License Agreement:"))
     has_priv = forms.BooleanField(required=False,
                                   label=_("This add-on has a Privacy Policy"))
-    privacy_policy = forms.CharField(widget=TranslationTextarea(),
-                                     required=False,
-                                     label=_('Please specify your add-on\'s privacy policy:'))
+    privacy_policy = forms.CharField(
+        widget=TranslationTextarea(), required=False,
+        label=_("Please specify your add-on's privacy policy:"))
 
     class Meta:
         model = Addon