X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Faliasing.py;h=1ebf4c945f53054fb566960019ced732452b13aa;hp=b62f7b133bc3ac44083ecedf067fc47b5af3498c;hb=228a823e3e7bf2cbf419fe83cad32d135d6896bb;hpb=69291b6ea410825bc288f4071e4a2bd200bdac2e

diff --git a/src/aliasing.py b/src/aliasing.py
index b62f7b1..1ebf4c9 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -7,10 +7,10 @@ import util.misc as misc_utils
 import handle
 
 
-_moduleLogger = logging.getLogger('aliasing')
+_moduleLogger = logging.getLogger(__name__)
 
 
-def _make_pretty_with_areacodde(phonenumber):
+def _make_pretty_with_areacode(phonenumber):
 	prettynumber = "(%s)" % (phonenumber[0:3], )
 	if 3 < len(phonenumber):
 		prettynumber += " %s" % (phonenumber[3:6], )
@@ -27,13 +27,14 @@ def _make_pretty_local(phonenumber):
 
 
 def _make_pretty_international(phonenumber):
+	prettynumber = phonenumber
 	if phonenumber.startswith("0"):
 		prettynumber = "+%s " % (phonenumber[0:3], )
 		if 3 < len(phonenumber):
-			prettynumber += _make_pretty_with_areacodde(phonenumber[3:])
-	if phonenumber.startswith("1"):
+			prettynumber += _make_pretty_with_areacode(phonenumber[3:])
+	elif phonenumber.startswith("1"):
 		prettynumber = "1 "
-		prettynumber += _make_pretty_with_areacodde(phonenumber[1:])
+		prettynumber += _make_pretty_with_areacode(phonenumber[1:])
 	return prettynumber
 
 
@@ -80,7 +81,7 @@ def make_pretty(phonenumber):
 	elif 8 < len(phonenumber) and phonenumber[0] in ("0", "1"):
 		prettynumber = _make_pretty_international(phonenumber)
 	elif 7 < len(phonenumber):
-		prettynumber = _make_pretty_with_areacodde(phonenumber)
+		prettynumber = _make_pretty_with_areacode(phonenumber)
 	elif 3 < len(phonenumber):
 		prettynumber = _make_pretty_local(phonenumber)
 	else: