From: Ed Page <eopage@byu.net>
Date: Wed, 24 Feb 2010 04:03:40 +0000 (-0600)
Subject: Minor code cleanup
X-Git-Url: http://git.maemo.org/git/?p=theonering;a=commitdiff_plain;h=f5790d1585812687c2bf2e5922827b29eee4a670;hp=cf6bbc96c0e4b3bb240c61df09e0e71afdd602a8

Minor code cleanup
---

diff --git a/src/aliasing.py b/src/aliasing.py
index c34fdcb..1ebf4c9 100644
--- a/src/aliasing.py
+++ b/src/aliasing.py
@@ -10,7 +10,7 @@ import handle
 _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], )
@@ -31,10 +31,10 @@ def _make_pretty_international(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
 
 
@@ -81,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: