Merge lp:~timojbo/widelands-website/new-help into lp:widelands-website

[Timo Paulssen]

[lp:~timojbo/widelands-website/new-help]

236. By SirVer on 2010-11-01

One more merge from timo

=== modified file 'online_help/management/commands/update_help.py'
--- online_help/management/commands/update_help.py	2010-11-01 21:19:16 +0000
+++ online_help/management/commands/update_help.py	2010-11-01 21:49:40 +0000
@@ -116,13 +116,13 @@
             workero.image_url = nn
 
             # See if there is help available
-            if worker._conf.has_option("default","help"):
-                helpstr = normalize_name(worker._conf.get("default","help"))
+            if worker._conf.has_option("global","help"):
+                helpstr = normalize_name(worker._conf.get("global","help"))
                 workero.help = helpstr
 
             # Check for experience
-            if worker._conf.has_option("default","experience"):
-                experience = normalize_name(worker._conf.get("default","experience"))
+            if worker._conf.has_option("global","experience"):
+                experience = normalize_name(worker._conf.get("global","experience"))
                 workero.exp = experience
 
             # See what the worker becomes
@@ -147,8 +147,8 @@
 
 
             # See if there is help available
-            if ware._conf.has_option("default","help"):
-                helpstr = normalize_name(ware._conf.get("default","help"))
+            if ware._conf.has_option("global","help"):
+                helpstr = normalize_name(ware._conf.get("global","help"))
                 w.help = helpstr
 
             w.save()