]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/i18n/dcfmtsym.cpp
ICU-531.30.tar.gz
[apple/icu.git] / icuSources / i18n / dcfmtsym.cpp
index c0eccac381d2d8bc25754d8febbf773ce8e4912a..809e8a19074b1f5aee8bdf4c2d22f5b03cfadd6d 100644 (file)
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
-* Copyright (C) 1997-2008, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 1997-2013, International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 *
 * File DCFMTSYM.CPP
@@ -16,7 +16,7 @@
 *   07/20/98    stephen     Slightly modified initialization of monetarySeparator
 ********************************************************************************
 */
+
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 #include "unicode/decimfmt.h"
 #include "unicode/ucurr.h"
 #include "unicode/choicfmt.h"
+#include "unicode/unistr.h"
+#include "unicode/numsys.h"
+#include "unicode/unum.h"
+#include "unicode/utf16.h"
 #include "ucurrimp.h"
 #include "cstring.h"
 #include "locbased.h"
 #include "uresimp.h"
+#include "ureslocs.h"
+
 // *****************************************************************************
 // class DecimalFormatSymbols
 // *****************************************************************************
+
 U_NAMESPACE_BEGIN
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(DecimalFormatSymbols)
 
 static const char gNumberElements[] = "NumberElements";
+static const char gCurrencySpacingTag[] = "currencySpacing";
+static const char gBeforeCurrencyTag[] = "beforeCurrency";
+static const char gAfterCurrencyTag[] = "afterCurrency";
+static const char gCurrencyMatchTag[] = "currencyMatch";
+static const char gCurrencySudMatchTag[] = "surroundingMatch";
+static const char gCurrencyInsertBtnTag[] = "insertBetween";
+
 
 static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0};
 
 // -------------------------------------
 // Initializes this with the decimal format symbols in the default locale.
+
 DecimalFormatSymbols::DecimalFormatSymbols(UErrorCode& status)
     : UObject(),
     locale()
 {
     initialize(locale, status, TRUE);
 }
+
 // -------------------------------------
 // Initializes this with the decimal format symbols in the desired locale.
+
 DecimalFormatSymbols::DecimalFormatSymbols(const Locale& loc, UErrorCode& status)
     : UObject(),
     locale(loc)
 {
     initialize(locale, status);
 }
+
+DecimalFormatSymbols::DecimalFormatSymbols()
+        : UObject(),
+          locale(Locale::getRoot()),
+          currPattern(NULL) {
+    *validLocale = *actualLocale = 0;
+    initialize();
+}
+
+DecimalFormatSymbols*
+DecimalFormatSymbols::createWithLastResortData(UErrorCode& status) {
+    if (U_FAILURE(status)) { return NULL; }
+    DecimalFormatSymbols* sym = new DecimalFormatSymbols();
+    if (sym == NULL) {
+        status = U_MEMORY_ALLOCATION_ERROR;
+    }
+    return sym;
+}
+
 // -------------------------------------
 
 DecimalFormatSymbols::~DecimalFormatSymbols()
@@ -88,6 +119,10 @@ DecimalFormatSymbols::operator=(const DecimalFormatSymbols& rhs)
             // fastCopyFrom is safe, see docs on fSymbols
             fSymbols[(ENumberFormatSymbol)i].fastCopyFrom(rhs.fSymbols[(ENumberFormatSymbol)i]);
         }
+        for(int32_t i = 0; i < (int32_t)UNUM_CURRENCY_SPACING_COUNT; ++i) {
+            currencySpcBeforeSym[i].fastCopyFrom(rhs.currencySpcBeforeSym[i]);
+            currencySpcAfterSym[i].fastCopyFrom(rhs.currencySpcAfterSym[i]);
+        }
         locale = rhs.locale;
         uprv_strcpy(validLocale, rhs.validLocale);
         uprv_strcpy(actualLocale, rhs.actualLocale);
@@ -108,155 +143,249 @@ DecimalFormatSymbols::operator==(const DecimalFormatSymbols& that) const
             return FALSE;
         }
     }
+    for(int32_t i = 0; i < (int32_t)UNUM_CURRENCY_SPACING_COUNT; ++i) {
+        if(currencySpcBeforeSym[i] != that.currencySpcBeforeSym[i]) {
+            return FALSE;
+        }
+        if(currencySpcAfterSym[i] != that.currencySpcAfterSym[i]) {
+            return FALSE;
+        }
+    }
     return locale == that.locale &&
         uprv_strcmp(validLocale, that.validLocale) == 0 &&
         uprv_strcmp(actualLocale, that.actualLocale) == 0;
 }
+
 // -------------------------------------
+
 void
-DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status,
-                                 UBool useLastResortData)
+DecimalFormatSymbols::initialize(const Locale& loc, UErrorCode& status, UBool useLastResortData)
 {
+    static const char *gNumberElementKeys[kFormatSymbolCount] = {
+        "decimal",
+        "group",
+        "list",
+        "percentSign",
+        NULL, /* Native zero digit is deprecated from CLDR - get it from the numbering system */
+        NULL, /* Pattern digit character is deprecated from CLDR - use # by default always */
+        "minusSign",
+        "plusSign",
+        NULL, /* currency symbol - We don't really try to load this directly from CLDR until we know the currency */
+        NULL, /* intl currency symbol - We don't really try to load this directly from CLDR until we know the currency */
+        "currencyDecimal",
+        "exponential",
+        "perMille",
+        NULL, /* Escape padding character - not in CLDR */
+        "infinity",
+        "nan",
+        NULL, /* Significant digit symbol - not in CLDR */
+        "currencyGroup",
+        NULL, /* one digit - get it from the numbering system */
+        NULL, /* two digit - get it from the numbering system */
+        NULL, /* three digit - get it from the numbering system */
+        NULL, /* four digit - get it from the numbering system */
+        NULL, /* five digit - get it from the numbering system */
+        NULL, /* six digit - get it from the numbering system */
+        NULL, /* seven digit - get it from the numbering system */
+        NULL, /* eight digit - get it from the numbering system */
+        NULL, /* nine digit - get it from the numbering system */
+    };
+
+    static const char *gLatn =  "latn";
+    static const char *gSymbols = "symbols";
+    const char *nsName;
+    const UChar *sym = NULL;
+    int32_t len = 0;
+
     *validLocale = *actualLocale = 0;
     currPattern = NULL;
     if (U_FAILURE(status))
         return;
-    
+
     const char* locStr = loc.getName();
-    UResourceBundle *resource = ures_open((char *)0, locStr, &status);
-    UResourceBundle *numberElementsRes = ures_getByKey(resource, gNumberElements, NULL, &status);
-    if (U_FAILURE(status))
-    {
-        // Initializes with last resort data if necessary.
-        if (useLastResortData)
-        {
-            status = U_USING_FALLBACK_WARNING;
+    LocalUResourceBundlePointer resource(ures_open(NULL, locStr, &status));
+    LocalUResourceBundlePointer numberElementsRes(
+        ures_getByKeyWithFallback(resource.getAlias(), gNumberElements, NULL, &status));
+
+    if (U_FAILURE(status)) {
+        if ( useLastResortData ) {
+            status = U_USING_DEFAULT_WARNING;
             initialize();
         }
+        return;
     }
-    else {
-        // Gets the number element array.
-        int32_t numberElementsLength = ures_getSize(numberElementsRes);
 
-        if (numberElementsLength > (int32_t)kFormatSymbolCount) {
-            /* Warning: Invalid format. Array too large. */
-            numberElementsLength = (int32_t)kFormatSymbolCount;
-        }
-        // If the array size is too small, something is wrong with the resource
-        // bundle, returns the failure error code.
-        if (numberElementsLength != 12 || U_FAILURE(status)) {
-            status = U_INVALID_FORMAT_ERROR;
+    // First initialize all the symbols to the fallbacks for anything we can't find
+    initialize();
+
+    //
+    // Next get the numbering system for this locale and set zero digit
+    // and the digit string based on the numbering system for the locale
+    //
+
+    LocalPointer<NumberingSystem> ns(NumberingSystem::createInstance(loc, status));
+    if (U_SUCCESS(status) && ns->getRadix() == 10 && !ns->isAlgorithmic()) {
+        nsName = ns->getName();
+        UnicodeString digitString(ns->getDescription());
+        int32_t digitIndex = 0;
+        UChar32 digit = digitString.char32At(0);
+        fSymbols[kZeroDigitSymbol].setTo(digit);
+        for (int32_t i = kOneDigitSymbol; i <= kNineDigitSymbol; ++i) {
+            digitIndex += U16_LENGTH(digit);
+            digit = digitString.char32At(digitIndex);
+            fSymbols[i].setTo(digit);
         }
-        else {
-            const UChar *numberElements[kFormatSymbolCount];
-            int32_t numberElementsStrLen[kFormatSymbolCount];
-            int32_t i = 0;
-            for(i = 0; i<numberElementsLength; i++) {
-                numberElements[i] = ures_getStringByIndex(numberElementsRes, i, &numberElementsStrLen[i], &status);
-            }
+    } else {
+        nsName = gLatn;
+    }
 
-            if (U_SUCCESS(status)) {
-                initialize(numberElements, numberElementsStrLen, numberElementsLength);
-
-                // Obtain currency data from the currency API.  This is strictly
-                // for backward compatibility; we don't use DecimalFormatSymbols
-                // for currency data anymore.
-                UErrorCode internalStatus = U_ZERO_ERROR; // don't propagate failures out
-                UChar curriso[4];
-                UnicodeString tempStr;
-                ucurr_forLocale(locStr, curriso, 4, &internalStatus);
-
-                // Reuse numberElements[0] as a temporary buffer
-                uprv_getStaticCurrencyName(curriso, locStr, tempStr, internalStatus);
-                if (U_SUCCESS(internalStatus)) {
-                    fSymbols[kIntlCurrencySymbol] = curriso;
-                    fSymbols[kCurrencySymbol] = tempStr;
+    UBool isLatn = !uprv_strcmp(nsName,gLatn);
+
+    UErrorCode nlStatus = U_ZERO_ERROR;
+    LocalUResourceBundlePointer nonLatnSymbols;
+    if ( !isLatn ) {
+        nonLatnSymbols.adoptInstead(
+            ures_getByKeyWithFallback(numberElementsRes.getAlias(), nsName, NULL, &nlStatus));
+        ures_getByKeyWithFallback(nonLatnSymbols.getAlias(), gSymbols, nonLatnSymbols.getAlias(), &nlStatus);
+    }
+
+    LocalUResourceBundlePointer latnSymbols(
+        ures_getByKeyWithFallback(numberElementsRes.getAlias(), gLatn, NULL, &status));
+    ures_getByKeyWithFallback(latnSymbols.getAlias(), gSymbols, latnSymbols.getAlias(), &status);
+
+    UBool kMonetaryDecimalSet = FALSE;
+    UBool kMonetaryGroupingSet = FALSE;
+    for(int32_t i = 0; i<kFormatSymbolCount; i++) {
+        if ( gNumberElementKeys[i] != NULL ) {
+            UErrorCode localStatus = U_ZERO_ERROR;
+            if ( !isLatn ) {
+                sym = ures_getStringByKeyWithFallback(nonLatnSymbols.getAlias(),
+                                                      gNumberElementKeys[i], &len, &localStatus);
+                // If we can't find the symbol in the numbering system specific resources,
+                // use the "latn" numbering system as the fallback.
+                if ( U_FAILURE(localStatus) ) {
+                    localStatus = U_ZERO_ERROR;
+                    sym = ures_getStringByKeyWithFallback(latnSymbols.getAlias(),
+                                                          gNumberElementKeys[i], &len, &localStatus);
                 }
-                /* else use the default values. */
+            } else {
+                    sym = ures_getStringByKeyWithFallback(latnSymbols.getAlias(),
+                                                          gNumberElementKeys[i], &len, &localStatus);
             }
 
-            U_LOCALE_BASED(locBased, *this);
-            locBased.setLocaleIDs(ures_getLocaleByType(numberElementsRes,
-                                       ULOC_VALID_LOCALE, &status),
-                                  ures_getLocaleByType(numberElementsRes,
-                                       ULOC_ACTUAL_LOCALE, &status));
-        }
-        //load the currency data
-        UChar ucc[4]={0}; //Currency Codes are always 3 chars long 
-        int32_t uccLen = 4;
-        const char* locName = loc.getName();
-        UErrorCode localStatus = U_ZERO_ERROR;
-        uccLen = ucurr_forLocale(locName, ucc, uccLen, &localStatus);
-        if(U_SUCCESS(localStatus) && uccLen > 0) {
-            char cc[4]={0};
-            u_UCharsToChars(ucc, cc, uccLen);
-            /* An explicit currency was requested */
-            UResourceBundle *currency = ures_getByKeyWithFallback(resource, "Currencies", NULL, &localStatus);
-            currency = ures_getByKeyWithFallback(currency, cc, currency, &localStatus);
-            if(U_SUCCESS(localStatus) && ures_getSize(currency)>2) { // the length is 3 if more data is present
-                currency = ures_getByIndex(currency, 2, currency, &localStatus);
-                int32_t currPatternLen = 0;
-                currPattern = ures_getStringByIndex(currency, (int32_t)0, &currPatternLen, &localStatus);
-                UnicodeString decimalSep = ures_getStringByIndex(currency, (int32_t)1, NULL, &localStatus);
-                UnicodeString groupingSep = ures_getStringByIndex(currency, (int32_t)2, NULL, &localStatus);
-                if(U_SUCCESS(localStatus)){
-                    fSymbols[kMonetaryGroupingSeparatorSymbol] = groupingSep;
-                    fSymbols[kMonetarySeparatorSymbol] = decimalSep;
-                    //pattern.setTo(TRUE, currPattern, currPatternLen);
-                    status = localStatus;
+            if ( U_SUCCESS(localStatus) ) {
+                setSymbol((ENumberFormatSymbol)i, UnicodeString(TRUE, sym, len));
+                if ( i == kMonetarySeparatorSymbol ) {
+                    kMonetaryDecimalSet = TRUE;
+                } else if ( i == kMonetaryGroupingSeparatorSymbol ) {
+                    kMonetaryGroupingSet = TRUE;
                 }
             }
-            ures_close(currency);
-            /* else An explicit currency was requested and is unknown or locale data is malformed. */
-            /* ucurr_* API will get the correct value later on. */
         }
-        // else ignore the error if no currency
     }
-    ures_close(resource);
-    ures_close(numberElementsRes);
-}
 
-// Initializes the DecimalFormatSymbol instance with the data obtained
-// from ResourceBundle in the desired locale.
+    // If monetary decimal or grouping were not explicitly set, then set them to be the
+    // same as their non-monetary counterparts.
 
-void
-DecimalFormatSymbols::initialize(const UChar** numberElements, int32_t *numberElementsStrLen, int32_t numberElementsLength)
-{
-    static const int8_t TYPE_MAPPING[][2] = {
-        {kDecimalSeparatorSymbol, 0},
-        {kGroupingSeparatorSymbol, 1},
-        {kPatternSeparatorSymbol, 2},
-        {kPercentSymbol, 3},
-        {kZeroDigitSymbol, 4},
-        {kDigitSymbol, 5},
-        {kMinusSignSymbol, 6},
-        {kExponentialSymbol, 7},
-        {kPerMillSymbol, 8},
-        {kInfinitySymbol, 9},
-        {kNaNSymbol, 10},
-        {kPlusSignSymbol, 11},
-        {kMonetarySeparatorSymbol, 0}
-    };
-    int32_t idx;
+    if ( !kMonetaryDecimalSet ) {
+        setSymbol(kMonetarySeparatorSymbol,fSymbols[kDecimalSeparatorSymbol]);
+    }
+    if ( !kMonetaryGroupingSet ) {
+        setSymbol(kMonetaryGroupingSeparatorSymbol,fSymbols[kGroupingSeparatorSymbol]);
+    }
+
+    // Obtain currency data from the currency API.  This is strictly
+    // for backward compatibility; we don't use DecimalFormatSymbols
+    // for currency data anymore.
+    UErrorCode internalStatus = U_ZERO_ERROR; // don't propagate failures out
+    UChar curriso[4];
+    UnicodeString tempStr;
+    ucurr_forLocale(locStr, curriso, 4, &internalStatus);
+
+    uprv_getStaticCurrencyName(curriso, locStr, tempStr, internalStatus);
+    if (U_SUCCESS(internalStatus)) {
+        fSymbols[kIntlCurrencySymbol].setTo(curriso, -1);
+        fSymbols[kCurrencySymbol] = tempStr;
+    }
+    /* else use the default values. */
+
+    U_LOCALE_BASED(locBased, *this);
+    locBased.setLocaleIDs(ures_getLocaleByType(numberElementsRes.getAlias(),
+                                               ULOC_VALID_LOCALE, &status),
+                          ures_getLocaleByType(numberElementsRes.getAlias(),
+                                               ULOC_ACTUAL_LOCALE, &status));
 
-    for (idx = 0; idx < (int32_t)(sizeof(TYPE_MAPPING)/sizeof(TYPE_MAPPING[0])); idx++) {
-        if (TYPE_MAPPING[idx][1] < numberElementsLength) {
-            fSymbols[TYPE_MAPPING[idx][0]].setTo(TRUE, numberElements[TYPE_MAPPING[idx][1]], numberElementsStrLen[TYPE_MAPPING[idx][1]]);
+    //load the currency data
+    UChar ucc[4]={0}; //Currency Codes are always 3 chars long
+    int32_t uccLen = 4;
+    const char* locName = loc.getName();
+    UErrorCode localStatus = U_ZERO_ERROR;
+    uccLen = ucurr_forLocale(locName, ucc, uccLen, &localStatus);
+
+    if(U_SUCCESS(localStatus) && uccLen > 0) {
+        char cc[4]={0};
+        u_UCharsToChars(ucc, cc, uccLen);
+        /* An explicit currency was requested */
+        LocalUResourceBundlePointer currencyResource(ures_open(U_ICUDATA_CURR, locStr, &localStatus));
+        LocalUResourceBundlePointer currency(
+            ures_getByKeyWithFallback(currencyResource.getAlias(), "Currencies", NULL, &localStatus));
+        ures_getByKeyWithFallback(currency.getAlias(), cc, currency.getAlias(), &localStatus);
+        if(U_SUCCESS(localStatus) && ures_getSize(currency.getAlias())>2) { // the length is 3 if more data is present
+            ures_getByIndex(currency.getAlias(), 2, currency.getAlias(), &localStatus);
+            int32_t currPatternLen = 0;
+            currPattern =
+                ures_getStringByIndex(currency.getAlias(), (int32_t)0, &currPatternLen, &localStatus);
+            UnicodeString decimalSep =
+                ures_getUnicodeStringByIndex(currency.getAlias(), (int32_t)1, &localStatus);
+            UnicodeString groupingSep =
+                ures_getUnicodeStringByIndex(currency.getAlias(), (int32_t)2, &localStatus);
+            if(U_SUCCESS(localStatus)){
+                fSymbols[kMonetaryGroupingSeparatorSymbol] = groupingSep;
+                fSymbols[kMonetarySeparatorSymbol] = decimalSep;
+                //pattern.setTo(TRUE, currPattern, currPatternLen);
+                status = localStatus;
+            }
         }
+        /* else An explicit currency was requested and is unknown or locale data is malformed. */
+        /* ucurr_* API will get the correct value later on. */
     }
+        // else ignore the error if no currency
 
-    // Default values until it's set later on.
-    fSymbols[kCurrencySymbol] = (UChar)0xa4;            // 'OX' currency symbol
-    fSymbols[kIntlCurrencySymbol] = INTL_CURRENCY_SYMBOL_STR;
-    // TODO: read from locale data, if this makes it into CLDR
-    fSymbols[kSignificantDigitSymbol] = (UChar)0x0040;  // '@' significant digit
-    fSymbols[kPadEscapeSymbol] = (UChar)0x002a; // TODO: '*' Hard coded for now; get from resource later
-    fSymbols[kMonetaryGroupingSeparatorSymbol] = fSymbols[kGroupingSeparatorSymbol];
+    // Currency Spacing.
+    localStatus = U_ZERO_ERROR;
+    LocalUResourceBundlePointer currencyResource(ures_open(U_ICUDATA_CURR, locStr, &localStatus));
+    LocalUResourceBundlePointer currencySpcRes(
+        ures_getByKeyWithFallback(currencyResource.getAlias(),
+                                  gCurrencySpacingTag, NULL, &localStatus));
+
+    if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
+        const char* keywords[UNUM_CURRENCY_SPACING_COUNT] = {
+            gCurrencyMatchTag, gCurrencySudMatchTag, gCurrencyInsertBtnTag
+        };
+        localStatus = U_ZERO_ERROR;
+        LocalUResourceBundlePointer dataRes(
+            ures_getByKeyWithFallback(currencySpcRes.getAlias(),
+                                      gBeforeCurrencyTag, NULL, &localStatus));
+        if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
+            localStatus = U_ZERO_ERROR;
+            for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
+                currencySpcBeforeSym[i] =
+                    ures_getUnicodeStringByKey(dataRes.getAlias(), keywords[i], &localStatus);
+            }
+        }
+        dataRes.adoptInstead(
+            ures_getByKeyWithFallback(currencySpcRes.getAlias(),
+                                      gAfterCurrencyTag, NULL, &localStatus));
+        if (localStatus == U_USING_FALLBACK_WARNING || U_SUCCESS(localStatus)) {
+            localStatus = U_ZERO_ERROR;
+            for (int32_t i = 0; i < UNUM_CURRENCY_SPACING_COUNT; i++) {
+                currencySpcAfterSym[i] =
+                    ures_getUnicodeStringByKey(dataRes.getAlias(), keywords[i], &localStatus);
+            }
+        }
+    }
 }
 
-// initialize with default values
 void
 DecimalFormatSymbols::initialize() {
     /*
@@ -269,11 +398,20 @@ DecimalFormatSymbols::initialize() {
     fSymbols[kPatternSeparatorSymbol] = (UChar)0x3b;    // ';' pattern separator
     fSymbols[kPercentSymbol] = (UChar)0x25;             // '%' percent sign
     fSymbols[kZeroDigitSymbol] = (UChar)0x30;           // '0' native 0 digit
+    fSymbols[kOneDigitSymbol] = (UChar)0x31;            // '1' native 1 digit
+    fSymbols[kTwoDigitSymbol] = (UChar)0x32;            // '2' native 2 digit
+    fSymbols[kThreeDigitSymbol] = (UChar)0x33;          // '3' native 3 digit
+    fSymbols[kFourDigitSymbol] = (UChar)0x34;           // '4' native 4 digit
+    fSymbols[kFiveDigitSymbol] = (UChar)0x35;           // '5' native 5 digit
+    fSymbols[kSixDigitSymbol] = (UChar)0x36;            // '6' native 6 digit
+    fSymbols[kSevenDigitSymbol] = (UChar)0x37;          // '7' native 7 digit
+    fSymbols[kEightDigitSymbol] = (UChar)0x38;          // '8' native 8 digit
+    fSymbols[kNineDigitSymbol] = (UChar)0x39;           // '9' native 9 digit
     fSymbols[kDigitSymbol] = (UChar)0x23;               // '#' pattern digit
     fSymbols[kPlusSignSymbol] = (UChar)0x002b;          // '+' plus sign
     fSymbols[kMinusSignSymbol] = (UChar)0x2d;           // '-' minus sign
     fSymbols[kCurrencySymbol] = (UChar)0xa4;            // 'OX' currency symbol
-    fSymbols[kIntlCurrencySymbol] = INTL_CURRENCY_SYMBOL_STR;
+    fSymbols[kIntlCurrencySymbol].setTo(TRUE, INTL_CURRENCY_SYMBOL_STR, 2);
     fSymbols[kMonetarySeparatorSymbol] = (UChar)0x2e;   // '.' monetary decimal separator
     fSymbols[kExponentialSymbol] = (UChar)0x45;         // 'E' exponential
     fSymbols[kPerMillSymbol] = (UChar)0x2030;           // '%o' per mill
@@ -281,14 +419,39 @@ DecimalFormatSymbols::initialize() {
     fSymbols[kInfinitySymbol] = (UChar)0x221e;          // 'oo' infinite
     fSymbols[kNaNSymbol] = (UChar)0xfffd;               // SUB NaN
     fSymbols[kSignificantDigitSymbol] = (UChar)0x0040;  // '@' significant digit
+    fSymbols[kMonetaryGroupingSeparatorSymbol].remove(); // 
 }
 
-Locale 
+Locale
 DecimalFormatSymbols::getLocale(ULocDataLocaleType type, UErrorCode& status) const {
     U_LOCALE_BASED(locBased, *this);
     return locBased.getLocale(type, status);
 }
 
+const UnicodeString&
+DecimalFormatSymbols::getPatternForCurrencySpacing(UCurrencySpacing type,
+                                                 UBool beforeCurrency,
+                                                 UErrorCode& status) const {
+    if (U_FAILURE(status)) {
+      return fNoSymbol;  // always empty.
+    }
+    if (beforeCurrency) {
+      return currencySpcBeforeSym[(int32_t)type];
+    } else {
+      return currencySpcAfterSym[(int32_t)type];
+    }
+}
+
+void
+DecimalFormatSymbols::setPatternForCurrencySpacing(UCurrencySpacing type,
+                                                   UBool beforeCurrency,
+                                             const UnicodeString& pattern) {
+  if (beforeCurrency) {
+    currencySpcBeforeSym[(int32_t)type] = pattern;
+  } else {
+    currencySpcAfterSym[(int32_t)type] =  pattern;
+  }
+}
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */