summaryrefslogtreecommitdiff
path: root/i18npool/source/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'i18npool/source/localedata')
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx34
-rw-r--r--i18npool/source/localedata/LocaleNode.hxx2
-rw-r--r--i18npool/source/localedata/data/ca_ES.xml7
-rw-r--r--i18npool/source/localedata/data/dz_BT.xml8
-rw-r--r--i18npool/source/localedata/data/et_EE.xml9
-rw-r--r--i18npool/source/localedata/data/fa_IR.xml2
-rw-r--r--i18npool/source/localedata/data/hu_HU.xml4
-rw-r--r--[-rwxr-xr-x]i18npool/source/localedata/data/mr_IN.xml0
-rw-r--r--i18npool/source/localedata/data/zh_TW.xml20
-rw-r--r--i18npool/source/localedata/filewriter.cxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx8
-rw-r--r--i18npool/source/localedata/saxparser.cxx8
12 files changed, 58 insertions, 46 deletions
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 7b8cceb09bd3..77c5acbbce8e 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -258,7 +258,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
pParameterName);
}
// write empty data if error
- of.writeParameter( pParameterName, aVal);
+ of.writeParameter( pParameterName, aVal);
sal_Int32 nLen = aVal.getLength();
if (nLen < nMinLen)
{
@@ -293,7 +293,7 @@ void LocaleNode :: generateCode (const OFileWriter &of) const
++nError;
fprintf( stderr, "Error: node %s not found.\n", pNodeName);
// write empty data if error
- of.writeParameter( pParameterName, aVal);
+ of.writeParameter( pParameterName, aVal);
}
return aVal;
}
@@ -493,7 +493,7 @@ void LCCTYPENode::generateCode (const OFileWriter &of) const
if (aDoubleQuoteStart == aDoubleQuoteEnd)
fprintf( stderr, "Warning: %s\n",
"DoubleQuotationStart equals DoubleQuotationEnd. Not necessarily an error, but unusual.");
- /* TODO: should equalness of single and double quotes be an error? Would
+ /* TODO: should equalness of single and double quotes be an error? Would
* need to adapt quite some locales' data. */
if (aQuoteStart == aDoubleQuoteStart)
fprintf( stderr, "Warning: %s\n",
@@ -569,7 +569,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
OUString aUsage;
OUString aType;
OUString aFormatIndex;
- // currNode -> print();
+ // currNode -> print();
const Attr &currNodeAttr = currNode->getAttr();
//printf ("getLen() = %d\n", currNode->getAttr().getLength());
@@ -651,11 +651,11 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
// Currency formats should be something like [C]###0;-[C]###0
// and not parenthesized [C]###0;([C]###0) if not en_US.
case cssi::NumberFormatIndex::CURRENCY_1000INT :
- case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
- case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
- case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
- case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :
- case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :
+ case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
+ case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
+ case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
+ case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :
+ case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :
if (strcmp( of.getLocale(), "en_US") != 0)
{
OUString aCode( n->getValue());
@@ -1269,10 +1269,10 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
} else {
for(j = 0; j < nbOfDays[i]; j++) {
of.writeAsciiString("\tdayID");
- of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+ of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
of.writeAsciiString("\tdayDefaultAbbrvName");
- of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
- of.writeAsciiString("\tdayDefaultFullName");of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+ of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+ of.writeAsciiString("\tdayDefaultFullName");of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
}
}
if (nbOfMonths[i] == 0) {
@@ -1294,13 +1294,13 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
of.writeInt(i); of.writeAsciiString(",\n");
} else {
for(j = 0; j < nbOfEras[i]; j++) {
- of.writeAsciiString("\teraID"); of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
+ of.writeAsciiString("\teraID"); of.writeInt(i); of.writeInt(j); of.writeAsciiString(",\n");
of.writeAsciiString("\teraDefaultAbbrvName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
of.writeAsciiString("\teraDefaultFullName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
}
}
- of.writeAsciiString("\tstartDayOfWeek");of.writeInt(i); of.writeAsciiString(",\n");
- of.writeAsciiString("\tminimalDaysInFirstWeek");of.writeInt(i); of.writeAsciiString(",\n");
+ of.writeAsciiString("\tstartDayOfWeek");of.writeInt(i); of.writeAsciiString(",\n");
+ of.writeAsciiString("\tminimalDaysInFirstWeek");of.writeInt(i); of.writeAsciiString(",\n");
}
of.writeAsciiString("};\n\n");
@@ -1365,7 +1365,7 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
of.writeParameter("currencySymbol", str, nbOfCurrencies);
str = calNode -> findNode ("BankSymbol") -> getValue();
of.writeParameter("bankSymbol", str, nbOfCurrencies);
- // BankSymbol currently must be ISO 4217. May change later if
+ // BankSymbol currently must be ISO 4217. May change later if
// application always uses CurrencyID instead of BankSymbol.
if (!bLegacy && !isIso4217(str))
incError( "BankSymbol is not ISO 4217");
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index fb3506389ac4..3cacc4163ba8 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/i18npool/source/localedata/data/ca_ES.xml b/i18npool/source/localedata/data/ca_ES.xml
index 42fd55fe779a..b73579ab35cf 100644
--- a/i18npool/source/localedata/data/ca_ES.xml
+++ b/i18npool/source/localedata/data/ca_ES.xml
@@ -176,7 +176,12 @@
<FormatCode>DD/MM/YYYY HH:MM:SS</FormatCode>
</FormatElement>
</LC_FORMAT>
- <LC_COLLATION ref="en_US" />
+ <LC_COLLATION>
+ <Collator unoid="charset" default="true"/>
+ <CollationOptions>
+ <TransliterationModules>IGNORE_CASE</TransliterationModules>
+ </CollationOptions>
+ </LC_COLLATION>
<LC_SEARCH ref="en_US"/>
<LC_INDEX ref="en_US"/>
<LC_CALENDAR>
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index 6bb1d8951064..7b21b633d5fe 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -118,7 +118,7 @@
<FormatCode>[NatNum1]"སྤྱི་ལོ" YYYY "ཟླ་" M "ཚེས་" DD</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
- <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->
+ <!-- Time format was originally "ཆུ་ཚོད་" HH "སྐར་མ་" MM "སྐར་ཆ་་" SS -->
<!-- Replaced with HH:MM:SS until more information is available -->
<FormatElement msgid="TimeFormatskey1" default="false" type="short" usage="TIME" formatindex="39">
<FormatCode>HH:MM</FormatCode>
@@ -249,7 +249,7 @@
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8">
- <!-- Percentage formats other than % sign are not possible in 2.0 0 "བརྒྱ་ཆ་་" is replaced by % -->
+ <!-- Percentage formats other than % sign are not possible in 2.0 0 "བརྒྱ་ཆ་་" is replaced by % -->
<FormatCode>[NatNum1]0%</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
@@ -297,7 +297,7 @@
<DaysOfWeek>
<Day>
<DayID>sun</DayID>
- <DefaultAbbrvName>ཟླ་ </DefaultAbbrvName>
+ <DefaultAbbrvName>ཟླ་ </DefaultAbbrvName>
<DefaultFullName>གཟའ་ཟླ་བ་</DefaultFullName>
</Day>
<Day>
@@ -449,7 +449,7 @@
</LC_NumberingLevel>
<LC_OutLineNumberingLevel>
<OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
+ <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0" />
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0" />
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0" />
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0" />
diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml
index 2509c52840bd..6b215affbfb6 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -311,7 +311,14 @@
</Calendar>
</LC_CALENDAR>
<LC_CURRENCY>
- <Currency default="true" usedInCompatibleFormatCodes="true">
+ <Currency default="true" usedInCompatibleFormatCodes="false">
+ <CurrencyID>EUR</CurrencyID>
+ <CurrencySymbol>€</CurrencySymbol>
+ <BankSymbol>EUR</BankSymbol>
+ <CurrencyName>Euro</CurrencyName>
+ <DecimalPlaces>2</DecimalPlaces>
+ </Currency>
+ <Currency default="false" usedInCompatibleFormatCodes="true">
<CurrencyID>EEK</CurrencyID>
<CurrencySymbol>kr</CurrencySymbol>
<BankSymbol>EEK</BankSymbol>
diff --git a/i18npool/source/localedata/data/fa_IR.xml b/i18npool/source/localedata/data/fa_IR.xml
index 95a64f392c4d..b5e7380e4a34 100644
--- a/i18npool/source/localedata/data/fa_IR.xml
+++ b/i18npool/source/localedata/data/fa_IR.xml
@@ -307,7 +307,7 @@
</StartDayOfWeek>
<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
</Calendar>
-
+
<Calendar unoid="gregorian" default="false">
<DaysOfWeek>
<Day>
diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml
index f8ddd785567d..2f52515cd305 100644
--- a/i18npool/source/localedata/data/hu_HU.xml
+++ b/i18npool/source/localedata/data/hu_HU.xml
@@ -329,8 +329,8 @@
<quarter2Word>II. negyedév</quarter2Word>
<quarter3Word>III. negyedév</quarter3Word>
<quarter4Word>IV. negyedév</quarter4Word>
- <aboveWord>felett</aboveWord>
- <belowWord>alatt</belowWord>
+ <aboveWord>fentebb</aboveWord>
+ <belowWord>alább</belowWord>
<quarter1Abbreviation>N1</quarter1Abbreviation>
<quarter2Abbreviation>N2</quarter2Abbreviation>
<quarter3Abbreviation>N3</quarter3Abbreviation>
diff --git a/i18npool/source/localedata/data/mr_IN.xml b/i18npool/source/localedata/data/mr_IN.xml
index efc238f04a2a..efc238f04a2a 100755..100644
--- a/i18npool/source/localedata/data/mr_IN.xml
+++ b/i18npool/source/localedata/data/mr_IN.xml
diff --git a/i18npool/source/localedata/data/zh_TW.xml b/i18npool/source/localedata/data/zh_TW.xml
index aa53647057f8..3d997136b73c 100644
--- a/i18npool/source/localedata/data/zh_TW.xml
+++ b/i18npool/source/localedata/data/zh_TW.xml
@@ -129,11 +129,11 @@
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="24">
-<FormatCode>GGGE"年"M"月"D"日"</FormatCode>
+<FormatCode>GGGEE"年"M"月"D"日"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey8" default="false" type="long" usage="DATE" formatindex="25">
-<FormatCode>GGGE"年"M"月"D"日"</FormatCode>
+<FormatCode>GGGEE"年"M"月"D"日"</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="DateFormatskey9" default="false" type="long" usage="DATE" formatindex="26">
@@ -149,11 +149,11 @@
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="29">
-<FormatCode>GGE"年"M"月"D"日" NNNN</FormatCode>
+<FormatCode>GGEE"年"M"月"D"日" NNNN</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="30">
-<FormatCode>GGGE"年"M"月"D"日" NNNN</FormatCode>
+<FormatCode>GGGEE"年"M"月"D"日" NNNN</FormatCode>
<DefaultName></DefaultName>
</FormatElement>
<FormatElement msgid="DateFormatskey14" default="true" type="short" usage="DATE" formatindex="31">
@@ -161,11 +161,11 @@
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey15" default="false" type="medium" usage="DATE" formatindex="32">
-<FormatCode>E"年"M"月"D"日"</FormatCode>
+<FormatCode>EE"年"M"月"D"日"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey16" default="false" type="medium" usage="DATE" formatindex="33">
-<FormatCode>GGGE"年"M"月"D"日"</FormatCode>
+<FormatCode>GGGEE"年"M"月"D"日"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey17" default="false" type="short" usage="DATE" formatindex="34">
@@ -181,7 +181,7 @@
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="37">
-<FormatCode>GGE"年度"QQ</FormatCode>
+<FormatCode>GGEE"年度"QQ</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateFormatskey21" default="false" type="short" usage="DATE" formatindex="38">
@@ -251,7 +251,7 @@
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey3" default="true" type="long" usage="DATE_TIME" formatindex="56">
-<FormatCode>E"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
+<FormatCode>EE"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey4" default="false" type="long" usage="DATE_TIME" formatindex="57">
@@ -259,11 +259,11 @@
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey5" default="false" type="long" usage="DATE_TIME" formatindex="58">
-<FormatCode>GGE"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
+<FormatCode>GGEE"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey6" default="false" type="long" usage="DATE_TIME" formatindex="59">
-<FormatCode>GGGE"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
+<FormatCode>GGGEE"年"M"月"D"日" HH"時"MM"分"SS"秒"</FormatCode>
<DefaultName/>
</FormatElement>
<FormatElement msgid="DateTimeFormatskey7" default="false" type="long" usage="DATE_TIME" formatindex="60">
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index abc24d10e857..cd782acfae60 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 9fe8234d48f6..42ebf76cee03 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -432,13 +432,13 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
if ( module->loadRelative(&thisModule, aBuf.makeStringAndClear()) )
{
::osl::MutexGuard aGuard( maMutex );
- LocaleDataLookupTableItem* pNewItem = 0;
+ LocaleDataLookupTableItem* pNewItem = 0;
maLookupTable.push_back(pNewItem = new LocaleDataLookupTableItem(aLibTable[i].pLib, module, aLibTable[i].pLocale ));
OSL_ASSERT( pOutCachedItem );
if( pOutCachedItem )
{
(*pOutCachedItem) = new LocaleDataLookupTableItem( *pNewItem );
- return module->getFunctionSymbol(
+ return module->getFunctionSymbol(
aBuf.appendAscii(pFunction).append(under).
appendAscii((*pOutCachedItem)->localeName).makeStringAndClear());
}
@@ -851,7 +851,7 @@ LocaleData::hasPhonetic( const Locale& rLocale ) throw(RuntimeException)
return sal_False;
}
-sal_Unicode ** SAL_CALL
+sal_Unicode ** SAL_CALL
LocaleData::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm)
{
sal_Int16 indexCount = 0;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index dd6c02225cef..bd7b5e5edcbb 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -145,7 +145,7 @@ class TestDocumentHandler :
{
public:
TestDocumentHandler(const char* locale, const char* outFile ) :
- rootNode(0), nError(0), nbOfCurrencies(0), nbOfCalendars(0), nbOfFormatElements(0),
+ rootNode(0), nError(0), nbOfCurrencies(0), nbOfCalendars(0), nbOfFormatElements(0),
nbOfTransliterations(0), nbOfCollations(0), nbOfDays(50), nbOfMonths(50), nbOfEras(10),
flag(-1), of(outFile, locale), isStartDayOfWeek(false), foundDefaultName(false),
foundVariant(false), openElement(false)
@@ -395,7 +395,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// create and connect the document handler to the parser
TestDocumentHandler *pDocHandler = new TestDocumentHandler( argv[1], argv[3]);
- Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler );
+ Reference < XDocumentHandler > rDocHandler( (XDocumentHandler *) pDocHandler );
Reference< XEntityResolver > rEntityResolver( (XEntityResolver *) pDocHandler );
rParser->setDocumentHandler( rDocHandler );
@@ -404,7 +404,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// create the input stream
InputSource source;
source.aInputStream = createStreamFromFile( argv[2] );
- source.sSystemId = OUString::createFromAscii( argv[2] );
+ source.sSystemId = OUString::createFromAscii( argv[2] );
try
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 07:53:47 +0000