Roxen.git/ server/ base_server/ roxen.pike

2000-07-21

2000-07-21 17:37:36 by Andreas Lange <andreas@lange.cx>

• 4ee494715653bb134f87ab4d7404eb61ff18f931 (43 lines) (+23/-20) ^{[ Show | Annotate ]}
  Branch: 5.2

Language select and list fixes

Rev: server/base_server/global_variables.pike:1.38
Rev: server/base_server/roxen.pike:1.511
Rev: server/modules/configuration/config_filesystem.pike:1.41
Rev: server/modules/configuration/config_tags.pike:1.96

4:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.      // ABS and suicide systems contributed freely by Francesco Chemolli - constant cvs_version="$Id: roxen.pike,v 1.510 2000/07/21 04:55:02 lange Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.511 2000/07/21 17:37:35 lange Exp $";      // Used when running threaded to find out which thread is the backend thread,   // for debug purposes only.
383:    set=lang;    else if(   #if constant(Standards.ISO639_2) -  set=Standards.ISO639_2.map_639_1(lang) +  set = Standards.ISO639_2.map_639_1(lang)   #else -  set=RoxenLocale.ISO639_2.map_639_1(lang) +  set = RoxenLocale.ISO639_2.map_639_1(lang)   #endif    )    ;    else -  set=languages[lang]; +  set = languages[lang];       return set;   }
402:    //! codes and the old symbolic names.   {    string set; -  if(!(set=verify_locale(lang))) { -  if(lang!=default_locale) +  if( !(set = verify_locale(lang)) ) { +  if( lang!=default_locale )    // lang not ok, try default_locale -  set_locale(default_locale); +  set_locale( default_locale );    return 0;    } -  -  locale->set(set); +  locale->set( set );    return 1;   }   
2749:   #else /* !Locale.register_project */   #define __REG_PROJ RoxenLocale.register_project   #endif /* Locale.register_project */ -  __REG_PROJ("roxen_start", "translations/%L/roxen_start.xml"); -  __REG_PROJ("roxen_config", "translations/%L/roxen_config.xml"); +  __REG_PROJ("roxen_start", "translations/%L/roxen_start.xml"); +  __REG_PROJ("roxen_config", "translations/%L/roxen_config.xml");    __REG_PROJ("roxen_message", "translations/%L/roxen_message.xml");   #undef __REG_PROJ   
3390:    call_out(update_supports_from_roxen_com,    QUERY(next_supports_update)-time());    -  if(getenv("LANG")) { +  if(QUERY(locale) != "standard") { +  // Default locale from Globals +  default_locale = QUERY(locale); +  set_locale(); +  } +  else if(getenv("LANG")) { +  // Default locale from environment    default_locale = getenv("LANG");    sscanf(default_locale, "%s_%*s", default_locale);    set_locale();    }    -  if(QUERY(locale) != "standard") -  { -  default_locale = QUERY(locale); -  set_locale(); -  } -  +     if(!locale->get()) { -  +  // Failed to set locale, fallback to English    default_locale = "eng";    set_locale();    }
3479:    remove_call_out(restart);    break;    case "locale": -  if(value=verify_locale(value)) { +  if(value = verify_locale(value)) { +  if(value==default_locale) +  break; // No change    default_locale = value; -  set_locale(); +  set_locale(); // Show Globals in the new locale    } else {    return sprintf("No such locale: %O\n", value);    }