Do ungrade work dir before upgrade locale, a=chris

diff --git a/bin/fetcher.php b/bin/fetcher.php
index 20f3b4eae..936953d08 100755
--- a/bin/fetcher.php
+++ b/bin/fetcher.php
@@ -343,7 +343,7 @@ class Fetcher implements CrawlConstants

     /**
      *  This is the function that should be called to get the fetcher to start
-     *  fetching. Calls init to handle the command line arguments then enters
+     *  fetching. Calls init to handle the command-line arguments then enters
      *  the fetcher's main loop
      */
     function start()
@@ -370,7 +370,7 @@ class Fetcher implements CrawlConstants
      * Checks for stop message, checks queue server if crawl has changed and
      * for new pages to crawl. Loop gets a group of next pages to crawl if
      * there are pages left to crawl (otherwise sleep 5 seconds). It downloads
-     * these pages, deplicates them, and updates the found site info with the
+     * these pages, deduplicates them, and updates the found site info with the
      * result before looping again.
      */
     function loop()
diff --git a/index.php b/index.php
index 62314d9c9..06392cac4 100755
--- a/index.php
+++ b/index.php
@@ -127,14 +127,14 @@ if(!PROFILE ) {

 $locale_tag = guessLocale();

-if(upgradeLocaleCheck()) {
-    upgradeLocale();
-}
-
 if(upgradeDatabaseWorkDirectoryCheck()) {
     upgradeDatabaseWorkDirectory();
 }

+if(upgradeLocaleCheck()) {
+    upgradeLocale();
+}
+
 $locale = NULL;
 setLocaleObject($locale_tag);