Merge pull request #11116 from lissyx/bug894338

Bug 894338 - Fix Sao Paulo name, r=kaze
mozilla-b2g · Jul 23, 2013 · d6db2aa · d6db2aa
2 parents 568c067 + 3664b5d
commit d6db2aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/shared/resources/apn/default_timezones.py b/shared/resources/apn/default_timezones.py
@@ -14,7 +14,7 @@
     'CD': 'Africa/Kinshasa',
     'ML': 'Africa/Bamako',
     'AR': 'America/Argentina/Buenos_Aires', # This is weird in tz.json I guess
-    'BR': 'America/Sau_Paulo',
+    'BR': 'America/Sao_Paulo',
     'CA': 'America/Toronto',
     'CL': 'America/Santiago',
     'GL': 'America/Godthab',

diff --git a/shared/resources/apn_tz.json b/shared/resources/apn_tz.json
@@ -157,7 +157,7 @@
   "714": "America/Panama", 
   "716": "America/Lima", 
   "722": "America/Argentina/Buenos_Aires", 
-  "724": "America/Sau_Paulo", 
+  "724": "America/Sao_Paulo", 
   "730": "America/Santiago", 
   "732": "America/Bogota", 
   "734": "America/Caracas",