Permalink
Browse files

freeing product details from the claws of the reporter app.

  • Loading branch information...
1 parent f26df0a commit 6e6fe4c7702961f74f22107b4cf009a329d4d277 @fwenzel fwenzel committed May 31, 2010
Showing with 16 additions and 30 deletions.
  1. +0 −3 .gitmodules
  2. +10 −3 README.md
  3. +2 −2 apps/feedback/utils.py
  4. +0 −19 lib/product_details/__init__.py
  5. +0 −1 lib/product_details/json
  6. +1 −1 manage.py
  7. +2 −1 requirements.txt
  8. +1 −0 settings.py
View
@@ -1,3 +0,0 @@
-[submodule "lib/product_details/json"]
- path = lib/product_details/json
- url = git://github.com/jbalogh/mozilla-product-details.git
View
@@ -1,9 +1,8 @@
Firefox Input
=============
-Firefox Input is a [Django][Django]-based web application to
-gather user feedback from the [Mozilla][Mozilla] Firefox beta
-testing program.
+Firefox Input is a [Django][Django]-based web application to gather user
+feedback from the [Mozilla][Mozilla] Firefox beta testing program.
For project goals, specifications, etc., check out the
[Reporter Wiki Page][wikimo].
@@ -24,6 +23,14 @@ to install the required Python libraries.
[virtualenv]: http://pypi.python.org/pypi/virtualenv
### Django
+To initialize the database, run:
+
+ ./manage.py syncdb
+
+and to fetch the initial product details data, run:
+
+ ./manage.py update_product_details
+
The Internet has plenty of of documentation on setting up a Django application
with any web server. If you need a wsgi entry point, you can find one in
``wsgi/reporter.wsgi``.
View
@@ -2,7 +2,7 @@
from topia.termextract import extract
-from product_details import languages
+import product_details
from . import BROWSERS
from .decorators import cached
@@ -57,7 +57,7 @@ def ua_parse(ua):
info = [ i.strip() for i in info_match.group(1).split(';') ]
locale = None
for i in info:
- if i in languages:
+ if i in product_details.languages:
locale = i
break
detected['locale'] = locale
@@ -1,19 +0,0 @@
-"""
-The /json dir here is a git-svn submodule of
-http://svn.mozilla.org/libs/product-details/json/.
-
-When this module is imported, we load all the .json files and insert them as
-module attributes using locals(). It's a magical and wonderful process.
-"""
-import json
-import os
-
-
-root = os.path.dirname(os.path.realpath(__file__))
-json_dir = os.path.join(root, 'json')
-
-for filename in os.listdir(json_dir):
- if filename.endswith('.json'):
- name = os.path.splitext(filename)[0]
- path = os.path.join(json_dir, filename)
- locals()[name] = json.load(open(path))
Submodule json deleted from 6a04e9
View
@@ -9,7 +9,7 @@
path = lambda *a: os.path.join(ROOT, *a)
site.addsitedir(path('apps'))
-site.addsitedir(path('lib'))
+#site.addsitedir(path('lib'))
try:
import settings_local as settings
View
@@ -1,6 +1,7 @@
# Django stuff
-Django==1.2
+Django==1.2.1
django-annoying==0.7.4
+-e git://github.com/fwenzel/django-mozilla-product-details#egg=django-mozilla-product-details
# DB stuff
MySQL-python==1.2.3c1
View
@@ -108,6 +108,7 @@
'annoying',
'feedback',
+ 'product_details',
)
# Setting this to False allows feedback to be collected from any user agent.

0 comments on commit 6e6fe4c

Please sign in to comment.