ICU-531.48.tar.gz

[apple/icu.git] / icuSources / i18n / ulocdata.c

diff --git a/icuSources/i18n/ulocdata.c b/icuSources/i18n/ulocdata.c
index 13979fd767f68dc4c625025547154491b52de2a7..48902f8655cdb6dfe4d842d9312219032a9c5b45 100644 (file)
--- a/icuSources/i18n/ulocdata.c
+++ b/icuSources/i18n/ulocdata.c
@@ -19,7 +19,6 @@
 #include "unicode/ures.h"
 #include "unicode/uloc.h"
 #include "unicode/ulocdata.h"
-#include "umutex.h"
 #include "uresimp.h"
 #include "ureslocs.h"
 
@@ -189,11 +188,11 @@ ulocdata_getDelimiter(ULocaleData *uld, ULocaleDataDelimiterType type,
     return len;
 }
 
-static UResourceBundle * measurementDataBundleForLocale(const char *localeID, UErrorCode *status){
+static UResourceBundle * measurementTypeBundleForLocale(const char *localeID, const char *measurementType, UErrorCode *status){
     char fullLoc[ULOC_FULLNAME_CAPACITY];
     char region[ULOC_COUNTRY_CAPACITY];
     UResourceBundle *rb;
-    UResourceBundle *measDataBundle = NULL;
+    UResourceBundle *measTypeBundle = NULL;
     
     /* The following code is basically copied from Calendar::setWeekData and
      * Calendar::getCalendarTypeForLocale with adjustments for resource name
@@ -203,19 +202,28 @@ static UResourceBundle * measurementDataBundleForLocale(const char *localeID, UE
     
     rb = ures_openDirect(NULL, "supplementalData", status);
     ures_getByKey(rb, "measurementData", rb, status);
-    measDataBundle = ures_getByKey(rb, region, NULL, status);
-    if (*status == U_MISSING_RESOURCE_ERROR && rb != NULL) {
-        *status = U_ZERO_ERROR;
-        measDataBundle = ures_getByKey(rb, "001", NULL, status);
+    if (rb != NULL) {
+        UResourceBundle *measDataBundle = ures_getByKey(rb, region, NULL, status);
+        if (U_SUCCESS(*status)) {
+               measTypeBundle = ures_getByKey(measDataBundle, measurementType, NULL, status);
+        }
+        if (*status == U_MISSING_RESOURCE_ERROR) {
+            *status = U_ZERO_ERROR;
+            if (measDataBundle != NULL) {
+                ures_close(measDataBundle);
+            }
+            measDataBundle = ures_getByKey(rb, "001", NULL, status);
+            measTypeBundle = ures_getByKey(measDataBundle, measurementType, NULL, status);
+        }
+        ures_close(measDataBundle);
     }
     ures_close(rb);
-    return measDataBundle;
+    return measTypeBundle;
 }
 
 U_CAPI UMeasurementSystem U_EXPORT2
 ulocdata_getMeasurementSystem(const char *localeID, UErrorCode *status){
 
-    UResourceBundle* bundle=NULL;
     UResourceBundle* measurement=NULL;
     UMeasurementSystem system = UMS_LIMIT;
 
@@ -223,13 +231,9 @@ ulocdata_getMeasurementSystem(const char *localeID, UErrorCode *status){
         return system;
     }
 
-    bundle = measurementDataBundleForLocale(localeID, status);
-
-    measurement = ures_getByKeyWithFallback(bundle, MEASUREMENT_SYSTEM, NULL, status);
-
+    measurement = measurementTypeBundleForLocale(localeID, MEASUREMENT_SYSTEM, status);
     system = (UMeasurementSystem) ures_getInt(measurement, status);
 
-    ures_close(bundle);
     ures_close(measurement);
 
     return system;
@@ -238,7 +242,6 @@ ulocdata_getMeasurementSystem(const char *localeID, UErrorCode *status){
 
 U_CAPI void U_EXPORT2
 ulocdata_getPaperSize(const char* localeID, int32_t *height, int32_t *width, UErrorCode *status){
-    UResourceBundle* bundle=NULL;
     UResourceBundle* paperSizeBundle = NULL;
     const int32_t* paperSize=NULL;
     int32_t len = 0;
@@ -247,8 +250,7 @@ ulocdata_getPaperSize(const char* localeID, int32_t *height, int32_t *width, UEr
         return;
     }
 
-    bundle = measurementDataBundleForLocale(localeID, status);
-    paperSizeBundle = ures_getByKeyWithFallback(bundle, PAPER_SIZE, NULL, status);
+    paperSizeBundle = measurementTypeBundleForLocale(localeID, PAPER_SIZE, status);
     paperSize = ures_getIntVector(paperSizeBundle, &len,  status);
 
     if(U_SUCCESS(*status)){
@@ -260,7 +262,6 @@ ulocdata_getPaperSize(const char* localeID, int32_t *height, int32_t *width, UEr
         }
     }
 
-    ures_close(bundle);
     ures_close(paperSizeBundle);
 
 }
@@ -330,6 +331,10 @@ ulocdata_getLocaleSeparator(ULocaleData *uld,
     int32_t len = 0;
     const UChar *separator = NULL;
     UErrorCode localStatus = U_ZERO_ERROR;
+    UChar *p0, *p1;
+    static const UChar sub0[4] = { 0x007b, 0x0030, 0x007d , 0x0000 }; /* {0} */
+    static const UChar sub1[4] = { 0x007b, 0x0031, 0x007d , 0x0000 }; /* {1} */
+    static const int32_t subLen = 3;
 
     if (U_FAILURE(*status))
         return 0;
@@ -364,6 +369,20 @@ ulocdata_getLocaleSeparator(ULocaleData *uld,
         return 0;
     }
 
+    /* For backwards compatibility, if we have a pattern, return the portion between {0} and {1} */
+    p0=u_strstr(separator, sub0);
+    p1=u_strstr(separator, sub1);
+    if (p0!=NULL && p1!=NULL && p0<=p1) {
+        separator = (const UChar *)p0 + subLen;
+        len = p1 - separator;
+        /* Desired separator is no longer zero-terminated; handle that if necessary */
+        if (len < resultCapacity) {
+            u_strncpy(result, separator, len);
+            result[len] = 0;
+            return len;
+        }
+    }
+
     u_strncpy(result, separator, resultCapacity);
     return len;
 }