src/solaris/native/java/lang/java_props_macosx.c

rev 5615 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o Jigsaw. by Naoto Sato and Masayoshi Okutsu)

*** 42,80 ****
         jrsFwk = dlopen("/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/JavaRuntimeSupport", RTLD_LAZY | RTLD_LOCAL);
      }
      return jrsFwk;
  }
  
! static char *getPosixLocale(int cat) {
      char *lc = setlocale(cat, NULL);
      if ((lc == NULL) || (strcmp(lc, "C") == 0)) {
          lc = getenv("LANG");
      }
      if (lc == NULL) return NULL;
      return strdup(lc);
  }
  
  #define LOCALEIDLENGTH  128
! char *setupMacOSXLocale(int cat) {
      switch (cat) {
      case LC_MESSAGES:
          {
              void *jrsFwk = getJRSFramework();
!             if (jrsFwk == NULL) return getPosixLocale(cat);
  
              char *(*JRSCopyPrimaryLanguage)() = dlsym(jrsFwk, "JRSCopyPrimaryLanguage");
              char *primaryLanguage = JRSCopyPrimaryLanguage ? JRSCopyPrimaryLanguage() : NULL;
!             if (primaryLanguage == NULL) return getPosixLocale(cat);
  
              char *(*JRSCopyCanonicalLanguageForPrimaryLanguage)(char *) = dlsym(jrsFwk, "JRSCopyCanonicalLanguageForPrimaryLanguage");
              char *canonicalLanguage = JRSCopyCanonicalLanguageForPrimaryLanguage ?  JRSCopyCanonicalLanguageForPrimaryLanguage(primaryLanguage) : NULL;
              free (primaryLanguage);
-             if (canonicalLanguage == NULL) return getPosixLocale(cat);
  
-             void (*JRSSetDefaultLocalization)(char *) = dlsym(jrsFwk, "JRSSetDefaultLocalization");
-             if (JRSSetDefaultLocalization) JRSSetDefaultLocalization(canonicalLanguage);
- 
              return canonicalLanguage;
          }
          break;
      default:
          {
--- 42,76 ----
         jrsFwk = dlopen("/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/JavaRuntimeSupport", RTLD_LAZY | RTLD_LOCAL);
      }
      return jrsFwk;
  }
  
! char *getPosixLocale(int cat) {
      char *lc = setlocale(cat, NULL);
      if ((lc == NULL) || (strcmp(lc, "C") == 0)) {
          lc = getenv("LANG");
      }
      if (lc == NULL) return NULL;
      return strdup(lc);
  }
  
  #define LOCALEIDLENGTH  128
! char *getMacOSXLocale(int cat) {
      switch (cat) {
      case LC_MESSAGES:
          {
              void *jrsFwk = getJRSFramework();
!             if (jrsFwk == NULL) return NULL;
  
              char *(*JRSCopyPrimaryLanguage)() = dlsym(jrsFwk, "JRSCopyPrimaryLanguage");
              char *primaryLanguage = JRSCopyPrimaryLanguage ? JRSCopyPrimaryLanguage() : NULL;
!             if (primaryLanguage == NULL) return NULL;
  
              char *(*JRSCopyCanonicalLanguageForPrimaryLanguage)(char *) = dlsym(jrsFwk, "JRSCopyCanonicalLanguageForPrimaryLanguage");
              char *canonicalLanguage = JRSCopyCanonicalLanguageForPrimaryLanguage ?  JRSCopyCanonicalLanguageForPrimaryLanguage(primaryLanguage) : NULL;
              free (primaryLanguage);
  
              return canonicalLanguage;
          }
          break;
      default:
          {
*** 88,97 ****
--- 84,111 ----
      }
  
      return NULL;
  }
  
+ char *setupMacOSXLocale(int cat) {
+     char * ret = getMacOSXLocale(cat);
+ 
+     if (cat == LC_MESSAGES && ret != NULL) {
+         void *jrsFwk = getJRSFramework();
+         if (jrsFwk != NULL) {
+             void (*JRSSetDefaultLocalization)(char *) = dlsym(jrsFwk, "JRSSetDefaultLocalization");
+             if (JRSSetDefaultLocalization) JRSSetDefaultLocalization(ret);
+         }
+     }
+ 
+     if (ret == NULL) {
+         return getPosixLocale(cat);
+     } else {
+         return ret;
+     }
+ }
+ 
  /* There are several toolkit options on Mac OS X, so we should try to
   * pick the "best" one, given what we know about the environment Java
   * is running under
   */