Branch: Tag:

2000-11-20

2000-11-20 13:36:37 by Per Hedbor <ph@opera.com>

Misc locale fixes

Rev: server/base_server/basic_defvar.pike:1.21
Rev: server/base_server/config_userdb.pike:1.10
Rev: server/base_server/configuration.pike:1.397
Rev: server/base_server/global_variables.pike:1.50
Rev: server/base_server/module.pike:1.101
Rev: server/base_server/module_support.pike:1.80
Rev: server/base_server/roxen.pike:1.576
Rev: server/config_interface/standard/sites/drop_site.pike:1.12
Rev: server/config_interface/standard/sites/site_content.pike:1.102
Rev: server/etc/include/module.h:1.44
Rev: server/etc/include/roxen.h:1.19
Rev: server/etc/modules/Variable.pmod/Date.pike:1.3
Rev: server/etc/modules/Variable.pmod/Email.pike:1.7
Rev: server/etc/modules/Variable.pmod/Image.pike:1.3
Rev: server/etc/modules/Variable.pmod/Upload.pike:1.3
Rev: server/etc/modules/Variable.pmod/VerifiedString.pike:1.4
Rev: server/etc/modules/Variable.pmod/module.pmod:1.36
Rev: server/modules/configuration/config_filesystem.pike:1.64
Rev: server/modules/configuration/config_userdb.pike:1.58
Rev: server/modules/configuration/update.pike:1.26
Rev: server/modules/tags/obox.pike:1.31
Rev: server/protocols/prot_hilfe.pike:2.2

1: - // $Id: roxen.h,v 1.18 2000/09/24 13:35:51 nilsson Exp $ + // $Id: roxen.h,v 1.19 2000/11/20 13:36:35 per Exp $   // -*- Pike -*-      #ifndef _ROXEN_H_
14: Inside #if undefined(__LOCALEOBJECT)
     #ifndef __LOCALEOBJECT   #ifdef IN_ROXEN - #define __LOCALEOBJECT locale + #define __LOCALEOBJECT roxenp()["locale"]   #else /* !IN_ROXEN */   #define __LOCALEOBJECT roxen.locale   #endif /* IN_ROXEN */
26:   #endif /* !_STR_LOCALE */      #ifndef _DEF_LOCALE - #define _DEF_LOCALE(X, Y, Z) \ -  ([string](mixed)Locale.DeferredLocale(X, GETLOCLANG, Y, Z)) + # ifndef GETLOCLANG + # ifdef IN_ROXEN + # define GETLOCLANG (this_object()->locale->get) + # else + # define GETLOCLANG roxen.get_locale + # endif + # endif + # define _DEF_LOCALE(X, Y, Z) Locale.DeferredLocale(X, GETLOCLANG, Y, Z)   #endif /* !_DEF_LOCALE */    - #ifndef USE_DEFERRED_LOCALE - #define USE_DEFERRED_LOCALE \ -  static local inline string GETLOCLANG() { \ -  return __LOCALEOBJECT->get(); \ -  } - #endif /* !USE_DEFERRED_LOCALE */ -  +    #ifndef _LOCALE_FUN   #define _LOCALE_FUN(X, Y, Z) \    (Locale.call(X, __LOCALEOBJECT->get(), Y, Z))