[SCM] UNNAMED PROJECT branch, master, updated. 76a82bc182f48f35b3b943cd6ec6031171ae87c4

[Michal Cihar]

The following commit has been merged in the master branch:
commit 76a82bc182f48f35b3b943cd6ec6031171ae87c4
Author: Michal Čihař <***@cihar.com>
Date: Tue Dec 13 13:52:25 2011 +0100

Replacement should be done here

diff --git a/phonedb/models.py b/phonedb/models.py
index b025a19..7b47260 100644
--- a/phonedb/models.py
+++ b/phonedb/models.py
@@ -110,7 +110,7 @@ class Phone(models.Model):

def get_related_sites(self):
result = []
- name = self.__unicode__().replace(' ', '_')
+ name = self.__unicode__().replace(' ', '_').replace('-', '_')
result.append({
'url': 'http://wikipedia.org/wiki/%s' % name,
'name': 'Wikipedia',
@@ -128,7 +128,7 @@ class Phone(models.Model):
'name': 'Mobilemedia',
})
if self.vendor.slug == 'nokia':
- name = self.name.replace(' ', '_').replace('-', '_')
+ name = self.name.replace(' ', '_')
if name[-1:] == 'c' and name[-2:-1] in '0123456789':
name = name[:-1] + '_classic'
elif name[-1:] == 's' and name[-2:-1] in '0123456789':