Paul:

[squirrelmail.git] / src / help.php

diff --git a/src/help.php b/src/help.php
index 68f5643bc43e1ab64ae640ae8ff394e9b4d61026..fd308540f7951156d0b154bd482b4b7f0cc60dae 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -119,38 +119,18 @@ if (isset($HTTP_REFERER)) {
 }
   
 if (!isset($squirrelmail_language)) {
-    $squirrelmail_language = 'en';
-}
-
-/** 
- * This harebrained solution is here because it produces the
- * smallest patchfile.
- * The real solution would be to either:
- * a) move all locales into full-name locale names, like they
- * really should be according to the ISO docs (e.g. en -> en_US, 
- * es -> es_ES, ru -> ru_RU), since it's standard to have a language
- * name + undescore + country name. 
- * b) Provide a $languages['ru_RU']['HELPALIAS'] = 'ru';
- *
- * Konstantin Riabitsev
- */
-global $languages;
-while (list($key, $val) = each($languages)){
-    if ($val['ALIAS'] == $squirrelmail_language){
-        $squirrelmail_language = $key;
-        break;
-    }
+    $squirrelmail_language = 'en_US';
 }
 
 if (file_exists("../help/$squirrelmail_language")) {
     $help_exists = true;
     $user_language = $squirrelmail_language;
-} else if (file_exists('../help/en')) {
+} else if (file_exists('../help/en_US')) {
     $help_exists = true;
     echo "<center><font color=\"$color[2]\">";
     printf (_("The help has not been translated to %s.  It will be displayed in English instead."), $languages[$squirrelmail_language]['NAME']);
     echo '</font></center><br>';
-    $user_language = 'en';
+    $user_language = 'en_US';
 } else {
     $help_exists = false;
     echo "<br><center><font color=\"$color[2]\">";