Merge lp:~rachidbm/ubuntu-translations-stats/bug-971432 into lp:ubuntu-translations-stats

[Rachid]

 - Added INSTALL containing the deployment instructions
 - Changed settings.py to make it compatible to Django 1.2.5
 - Fixed bug 971432 https://bugs.launchpad.net/ubuntu-translations-stats/+bug/971432

Hi David,

Thanks for the deployment instructions. I missed one line; The first time you need to create the DB tables with manage.py syncdb. I created a file with the instructions to set up this app.

Furthermore I fixed the bug I found. Maybe not the most elegant solution, but I saw "stats/" hardcoded on more places in the code.

Cheers,
Rachid.

FYI: I run this app on Ubuntu 11.04 (Django 1.2.5)

[David Planella (dpm)]

Thanks a lot for your work and sorry for the long delay in coming back to you. My new focus on App Development means that I can only spend some spare time on translations development. I had to find some additional time to fix some infrastructure issues before activating stats for Quantal and to be able to come back to developing this webapp this cycle.

I have merged most of your changes, with some additional modifications (renamed the INSTALL file to README.md). However, regarding the proposed fix:

> {c:[{v:'<a href="/stats/{{release.name}}/{{language.code}}">{{language.name}}</a>'},

I'd rather fix it by a proper combination of Apache config and APPEND_SLASH rather than hardcoding the URL. Alternatively, if you can convince me that that's the only way, I'll be happy to merge the change :)

review: Needs Fixing

[David Planella (dpm)]

I've fixed the bug by using the Django url template tag as:

{c:[{v:'<a href="{% url language_details release.name,language.code %}">{{language.name}}</a>'}

As such, this issue is resolved and I'll mark this merge proposal as Rejected. Thanks for the other fixes and for putting me on the right track for this one!

Unmerged revisions

44. By Rachid on 2012-04-04

Fixed bug 971432 (Incorrect links in translations stats website)
https://bugs.launchpad.net/ubuntu-translations-stats/+bug/971432

=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2012-04-04 22:14:40 +0000
@@ -0,0 +1,101 @@
+A web tool to report Ubuntu Translations statistics
+https://launchpad.net/ubuntu-translations-stats
+
+
+CAVEATS:
+- The translation stats site runs on an Ubuntu 10.04 server
+- It should also run on a 12.04 server, but I haven't widely tested it
+- The big difference between 10.04 and 12.04 regarding this project is
+the Django versions: the latest stable Django version uses a
+configuration file syntax (settings.py) that is not backwards compatible.
+
+Package installation
+--------------------
+
+sudo apt-get install python-django apache2 postgresql python-psycopg2 libapache2-mod-wsgi bzr mailutils
+
+Webapp installation
+-------------------
+
+bzr branch lp:ubuntu-translations-stats ul10nstats
+
+Create a local_settings.py file in the same directory as the settings.py
+file.
+
+NOTES:
+- The DATABASE_PASSWORD should match the password you set up in the
+'Postgresql setup' step below
+- This is the syntax for an Ubuntu 10.04 server. I *think* in this case
+it might work for both 12.04 and 10.04, but if it doesn't, you'll have
+to use the syntax for the newer Django version (have a look at the
+existing settings.py file)
+
+$ cat ul10nstats/local_settings.py
+
+DATABASE_ENGINE = 'postgresql_psycopg2'
+DATABASE_NAME = 'ul10nstats'
+DATABASE_USER = 'postgres'
+DATABASE_PASSWORD = 'supersecretpassword'
+DATABASE_HOST = 'localhost'
+DATABASE_PORT = ''
+
+
+Postgresql setup
+----------------
+
+sudo -u postgres psql postgres
+\password postgres
+(here you set up your password and exit)
+sudo -u postgres createdb ul10nstats
+
+Apache setup
+------------
+
+Disable the default site config
+Create /etc/apache2/sites-available/ul10nstats
+(Change the paths to the path on your machine)
+So change /home/ubuntu/ul10nstats
+to /path/on/your/machine
+
+
+Enable this site
+
+<VirtualHost *:80>
+
+       WSGIScriptAlias / /home/ubuntu/ul10nstats/wsgi.py
+
+       #Alias /admin/ /home/ubuntu/ul10nstats/media/
+
+       AliasMatch /admin/css/([^/]*\.css) /home/ubuntu/ul10nstats/admin-media/css/$1
+       AliasMatch /admin/img/([^/]*) /home/ubuntu/ul10nstats/admin-media/img/$1
+       AliasMatch /admin/js/([^/]*\.js) /home/ubuntu/ul10nstats/admin-media/js/$1
+       AliasMatch /(ui-lightness/)([^/]*\.css) /home/ubuntu/ul10nstats/stats/static/css/$1/$2
+       AliasMatch /([^/]*\.css) /home/ubuntu/ul10nstats/stats/static/css/$1
+       AliasMatch /([^/]*\.js) /home/ubuntu/ul10nstats/stats/static/js/$1
+       AliasMatch /([^/]*\.png) /home/ubuntu/ul10nstats/stats/static/img/$1
+       AliasMatch /([^/]*\.ico) /home/ubuntu/ul10nstats/stats/static/img/$1
+
+       ErrorLog /var/log/apache2/error.log
+
+       # Possible values include: debug, info, notice, warn, error, crit,
+       # alert, emerg.
+       LogLevel warn
+
+       CustomLog /var/log/apache2/access.log combined
+
+</VirtualHost>
+
+Data setup
+----------
+
+To set up the DB (CREATE TABLES etc), run:
+$ python manage.py syncdb
+
+Once all that is set up, you'll need some sample data to test the site.
+
+From the ul10nstats directory just run:
+$ python manage.py importdata
+
+I believe that's all you need. If you've got any questions or notice any
+issues, just let me know.
+

=== modified file 'settings.py'
--- settings.py	2012-03-02 07:10:51 +0000
+++ settings.py	2012-04-04 22:14:40 +0000
@@ -18,7 +18,7 @@
 MANAGERS = ADMINS
 
 major, minor, micro, releaselevel, serial = VERSION
-DJANGO_1_1 = major == 1 and minor == 1
+DJANGO_1_1 = major == 1 and (minor == 1 or minor == 2)  # Django 1.2.x is compatible with 1.1
 DJANGO_1_3 = major == 1 and minor == 3
 
 EXTRA_MODULES = {

=== modified file 'templates/stats/language_list.html'
--- templates/stats/language_list.html	2012-03-02 07:10:51 +0000
+++ templates/stats/language_list.html	2012-04-04 22:14:40 +0000
@@ -10,7 +10,7 @@
     cols:[{id:'language',label:'Language',type:'string'},
         {id:'translated',label:'Translated',type:'number'}], 
     rows:[{% for language, percentage in language_list %}
-        {c:[{v:'<a href="{{release.name}}/{{language.code}}">{{language.name}}</a>'},
+        {c:[{v:'<a href="/stats/{{release.name}}/{{language.code}}">{{language.name}}</a>'},
         {v:{{percentage}},f:'{{percentage}} %'}]},
         {% endfor %}]
 };