X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/48b980fed3435926e0b3a8d72ecb58be703a1c7a..729e4ab9bc6618bc3d8a898e575df7f4019e29ca:/icuSources/i18n/ulocdata.c

diff --git a/icuSources/i18n/ulocdata.c b/icuSources/i18n/ulocdata.c
index f39975ec..20d02462 100644
--- a/icuSources/i18n/ulocdata.c
+++ b/icuSources/i18n/ulocdata.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *                                                                            *
-* Copyright (C) 2003-2007, International Business Machines                   *
+* Copyright (C) 2003-2009, International Business Machines                   *
 *                Corporation and others. All Rights Reserved.                *
 *                                                                            *
 ******************************************************************************
@@ -17,6 +17,9 @@
 #include "cmemory.h"
 #include "unicode/ustring.h"
 #include "unicode/ulocdata.h"
+#include "umutex.h"
+#include "uresimp.h"
+#include "ureslocs.h"
 
 #define MEASUREMENT_SYSTEM  "MeasurementSystem"
 #define PAPER_SIZE          "PaperSize"
@@ -35,13 +38,18 @@ struct ULocaleData {
      * Pointer to the resource bundle associated with this locale data object
      */
     UResourceBundle *bundle;
+
+    /**
+     * Pointer to the lang resource bundle associated with this locale data object
+     */
+    UResourceBundle *langBundle;
 };
 
 U_CAPI ULocaleData* U_EXPORT2
 ulocdata_open(const char *localeID, UErrorCode *status)
 {
    ULocaleData *uld;
- 
+
    if (U_FAILURE(*status)) {
        return NULL;
    }
@@ -52,9 +60,11 @@ ulocdata_open(const char *localeID, UErrorCode *status)
       return(NULL);
    }
 
-    
+   uld->langBundle = NULL;
+
    uld->noSubstitute = FALSE;
    uld->bundle = ures_open(NULL, localeID, status);
+   uld->langBundle = ures_open(U_ICUDATA_LANG, localeID, status);
 
    if (U_FAILURE(*status)) {
       uprv_free(uld);
@@ -68,9 +78,10 @@ U_CAPI void U_EXPORT2
 ulocdata_close(ULocaleData *uld)
 {
     if ( uld != NULL ) {
+       ures_close(uld->langBundle);
        ures_close(uld->bundle);
        uprv_free(uld);
-    } 
+    }
 }
 
 U_CAPI void U_EXPORT2
@@ -86,9 +97,9 @@ ulocdata_getNoSubstitute(ULocaleData *uld)
 }
 
 U_CAPI USet* U_EXPORT2
-ulocdata_getExemplarSet(ULocaleData *uld, USet *fillIn, 
+ulocdata_getExemplarSet(ULocaleData *uld, USet *fillIn,
                         uint32_t options, ULocaleDataExemplarSetType extype, UErrorCode *status){
-    
+
     static const char* const exemplarSetTypes[] = { "ExemplarCharacters", "AuxExemplarCharacters" };
     const UChar *exemplarChars = NULL;
     int32_t len = 0;
@@ -96,32 +107,32 @@ ulocdata_getExemplarSet(ULocaleData *uld, USet *fillIn,
 
     if (U_FAILURE(*status))
         return NULL;
-    
+
     exemplarChars = ures_getStringByKey(uld->bundle, exemplarSetTypes[extype], &len, &localStatus);
     if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) {
         localStatus = U_MISSING_RESOURCE_ERROR;
     }
-       
+
     if (localStatus != U_ZERO_ERROR) {
         *status = localStatus;
     }
-    
+
     if (U_FAILURE(*status))
         return NULL;
-    
+
     if(fillIn != NULL)
-        uset_applyPattern(fillIn, exemplarChars, len, 
+        uset_applyPattern(fillIn, exemplarChars, len,
                           USET_IGNORE_SPACE | options, status);
     else
         fillIn = uset_openPatternOptions(exemplarChars, len,
                                          USET_IGNORE_SPACE | options, status);
-    
+
     return fillIn;
 
 }
 
 U_CAPI int32_t U_EXPORT2
-ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type, 
+ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type,
                       UChar *result, int32_t resultLength, UErrorCode *status){
 
     static const char* const delimiterKeys[] =  {
@@ -130,7 +141,7 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type,
         "alternateQuotationStart",
         "alternateQuotationEnd"
     };
- 
+
     UResourceBundle *delimiterBundle;
     int32_t len = 0;
     const UChar *delimiter = NULL;
@@ -164,29 +175,29 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type,
     if (localStatus != U_ZERO_ERROR) {
         *status = localStatus;
     }
-    
+
     if (U_FAILURE(*status)){
         return 0;
     }
-        
-    u_strncpy(result,delimiter,resultLength);
+
+    u_strncpy(result,delimiter, resultLength);
     return len;
 }
 
 U_CAPI UMeasurementSystem U_EXPORT2
 ulocdata_getMeasurementSystem(const char *localeID, UErrorCode *status){
-    
+
     UResourceBundle* bundle=NULL;
     UResourceBundle* measurement=NULL;
-    UMeasurementSystem system = UMS_LIMIT; 
-    
+    UMeasurementSystem system = UMS_LIMIT;
+
     if(status == NULL || U_FAILURE(*status)){
         return system;
     }
-    
+
     bundle = ures_open(NULL, localeID, status);
 
-    measurement = ures_getByKey(bundle, MEASUREMENT_SYSTEM, NULL, status);
+    measurement = ures_getByKeyWithFallback(bundle, MEASUREMENT_SYSTEM, NULL, status);
 
     system = (UMeasurementSystem) ures_getInt(measurement, status);
 
@@ -207,11 +218,11 @@ ulocdata_getPaperSize(const char* localeID, int32_t *height, int32_t *width, UEr
     if(status == NULL || U_FAILURE(*status)){
         return;
     }
-    
+
     bundle = ures_open(NULL, localeID, status);
-    paperSizeBundle = ures_getByKey(bundle, PAPER_SIZE, NULL, status);
+    paperSizeBundle = ures_getByKeyWithFallback(bundle, PAPER_SIZE, NULL, status);
     paperSize = ures_getIntVector(paperSizeBundle, &len,  status);
-    
+
     if(U_SUCCESS(*status)){
         if(len < 2){
             *status = U_INTERNAL_PROGRAM_ERROR;
@@ -220,8 +231,111 @@ ulocdata_getPaperSize(const char* localeID, int32_t *height, int32_t *width, UEr
             *width  = paperSize[1];
         }
     }
-    
+
     ures_close(bundle);
     ures_close(paperSizeBundle);
-    
+
+}
+
+U_DRAFT void U_EXPORT2
+ulocdata_getCLDRVersion(UVersionInfo versionArray, UErrorCode *status) {
+    UResourceBundle *rb = NULL;
+    rb = ures_openDirect(NULL, "supplementalData", status);
+    ures_getVersionByKey(rb, "cldrVersion", versionArray, status);
+    ures_close(rb);
+}
+
+U_DRAFT int32_t U_EXPORT2
+ulocdata_getLocaleDisplayPattern(ULocaleData *uld,
+                                 UChar *result,
+                                 int32_t resultCapacity,
+                                 UErrorCode *status) {
+    UResourceBundle *patternBundle;
+    int32_t len = 0;
+    const UChar *pattern = NULL;
+    UErrorCode localStatus = U_ZERO_ERROR;
+
+    if (U_FAILURE(*status))
+        return 0;
+
+    patternBundle = ures_getByKey(uld->langBundle, "localeDisplayPattern", NULL, &localStatus);
+
+    if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) {
+        localStatus = U_MISSING_RESOURCE_ERROR;
+    }
+
+    if (localStatus != U_ZERO_ERROR) {
+        *status = localStatus;
+    }
+
+    if (U_FAILURE(*status)){
+        ures_close(patternBundle);
+        return 0;
+    }
+
+    pattern = ures_getStringByKey(patternBundle, "pattern", &len, &localStatus);
+    ures_close(patternBundle);
+
+    if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) {
+        localStatus = U_MISSING_RESOURCE_ERROR;
+    }
+
+    if (localStatus != U_ZERO_ERROR) {
+        *status = localStatus;
+    }
+
+    if (U_FAILURE(*status)){
+        return 0;
+    }
+
+    u_strncpy(result, pattern, resultCapacity);
+    return len;
+}
+
+
+U_DRAFT int32_t U_EXPORT2
+ulocdata_getLocaleSeparator(ULocaleData *uld,
+                            UChar *result,
+                            int32_t resultCapacity,
+                            UErrorCode *status)  {
+    UResourceBundle *separatorBundle;
+    int32_t len = 0;
+    const UChar *separator = NULL;
+    UErrorCode localStatus = U_ZERO_ERROR;
+
+    if (U_FAILURE(*status))
+        return 0;
+
+    separatorBundle = ures_getByKey(uld->langBundle, "localeDisplayPattern", NULL, &localStatus);
+
+    if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) {
+        localStatus = U_MISSING_RESOURCE_ERROR;
+    }
+
+    if (localStatus != U_ZERO_ERROR) {
+        *status = localStatus;
+    }
+
+    if (U_FAILURE(*status)){
+        ures_close(separatorBundle);
+        return 0;
+    }
+
+    separator = ures_getStringByKey(separatorBundle, "separator", &len, &localStatus);
+    ures_close(separatorBundle);
+
+    if ( (localStatus == U_USING_DEFAULT_WARNING) && uld->noSubstitute ) {
+        localStatus = U_MISSING_RESOURCE_ERROR;
+    }
+
+    if (localStatus != U_ZERO_ERROR) {
+        *status = localStatus;
+    }
+
+    if (U_FAILURE(*status)){
+        return 0;
+    }
+
+    u_strncpy(result, separator, resultCapacity);
+    return len;
 }