diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-07 14:33:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-07 18:00:46 +0100 |
| commit | a3c05bc0c6961639100a319cf9a0aa636d7bdbb5 (patch) | |
| tree | b00963419642e615c522c7a7629fe0f750ab70d2 /i18npool | |
| parent | a944363d352122250d167072250fe10df6374ddc (diff) | |
incErrorStrStr always called with two %s
so we don't really need prepareErrorFormat
Change-Id: I3f5ae846ad4ba59468f90eba2f8e0eac2a7da9ae
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/localedata/LocaleNode.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx index 6f72cc2c1601..e1f25f58f520 100644 --- a/i18npool/source/localedata/LocaleNode.cxx +++ b/i18npool/source/localedata/LocaleNode.cxx @@ -331,7 +331,7 @@ void LocaleNode::incErrorStr( const char* pStr, const OUString& rVal ) const void LocaleNode::incErrorStrStr( const char* pStr, const OUString& rVal1, const OUString& rVal2 ) const { ++nError; - fprintf( stderr, prepareErrorFormat( pStr, ": %s %s"), OSTR( rVal1), OSTR( rVal2)); + fprintf(stderr, pStr, OSTR(rVal1), OSTR(rVal2)); } void LCInfoNode::generateCode (const OFileWriter &of) const @@ -370,7 +370,7 @@ void LCInfoNode::generateCode (const OFileWriter &of) const if (!(aVariant.isEmpty() || (aVariant.getLength() >= 7 && aVariant.indexOf('-') >= 2))) incErrorStr( "invalid Variant", aVariant); if (!(aVariant.isEmpty() || aLanguage == "qlt")) - incErrorStrStr( "Variant '%s' given but Language '%s' is not 'qlt'", aVariant, aLanguage); + incErrorStrStr( "Error: Variant '%s' given but Language '%s' is not 'qlt'", aVariant, aLanguage); of.writeParameter("Variant", aVariant); } else @@ -651,7 +651,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const if (!strFrom.isEmpty() && strFrom != "[CURRENCY]") //??? { incErrorStrStr( - "non-empty replaceFrom=\"%s\" with non-empty ref=\"%s\".", + "Error: non-empty replaceFrom=\"%s\" with non-empty ref=\"%s\".", strFrom, useLocale); } useLocale = useLocale.replace( '-', '_'); @@ -1936,7 +1936,7 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const // couldn't had been determined from the current locale (i.e. is // empty), silently assume the referred locale has things right. if (bCompatible && !sTheCompatibleCurrency.isEmpty() && sTheCompatibleCurrency != str) - incErrorStrStr( "CurrencySymbol \"%s\" flagged as usedInCompatibleFormatCodes doesn't match \"%s\" determined from format codes.", str, sTheCompatibleCurrency); + incErrorStrStr( "Error: CurrencySymbol \"%s\" flagged as usedInCompatibleFormatCodes doesn't match \"%s\" determined from format codes.", str, sTheCompatibleCurrency); str = currencyNode -> findNode ("BankSymbol") -> getValue(); of.writeParameter("bankSymbol", str, nbOfCurrencies); // BankSymbol currently must be ISO 4217. May change later if |