changeset 519:931424efdcf0 stable

merge r568 from trunk
author fschwarz
date Sat, 05 Mar 2011 09:57:15 +0000
parents 5ac4af7667a0
children 22ad1d9936e7
files 0.9.x/babel/dates.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/0.9.x/babel/dates.py
+++ b/0.9.x/babel/dates.py
@@ -220,7 +220,7 @@
     """Return a representation of the given timezone using "location format".
     
     The result depends on both the local display name of the country and the
-    city assocaited with the time zone:
+    city associated with the time zone:
     
     >>> from pytz import timezone
     >>> tz = timezone('America/St_Johns')
Copyright (C) 2012-2017 Edgewall Software