--- a/locales/loce32/collation/group/elocl_collation_es.mmp Fri Oct 01 17:44:24 2010 +0800
+++ b/locales/loce32/collation/group/elocl_collation_es.mmp Tue Oct 19 16:42:43 2010 +0800
@@ -26,7 +26,7 @@
SOURCEPATH ../src
SOURCE collation.cpp
SOURCE latin.cpp
-SOURCE unic.cpp
+SOURCE collation_es.cpp
// This is a SYSTEMINCLUDE macro containing the middleware
// layer specific include directories
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locales/loce32/collation/src/collation_es.cpp Tue Oct 19 16:42:43 2010 +0800
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include <kernel/ls_std.h>
+#include <collate.h>
+
+const TUint KUidColspaCollationMethod = 0x100059DD;
+
+static const TUint32 TheColspaKey[] =
+ { // 2 keys
+ 0x7ef3009,0x7ef3021,
+ };
+
+static const TUint16 TheColspaStringElement[] =
+ {
+ 0x2,0x6e,0x303,0x2,0x4e,0x303,
+ };
+
+static const TUint32 TheColspaStringIndex[] =
+ {
+ 0x30001,0x0,
+ };
+
+static const TCollationKeyTable TheColspaTable =
+ { TheColspaKey, 0, 0, TheColspaStringElement, TheColspaStringIndex, 2 };
+
+static const TCollationMethod TheCollationMethod[] =
+ {
+ {
+ KUidColspaCollationMethod, // the method for the locale
+ NULL, // use the standard table as the main table
+ &TheColspaTable, // the locale values override the standard values
+ 0 // the flags are standard
+ },
+ {
+ KUidBasicCollationMethod, // the standard unlocalised method
+ NULL, // null means use the standard table
+ NULL, // there's no override table
+ 0 // the flags are standard
+ }
+ };
+
+static const TCollationDataSet TheCollationDataSet =
+ {
+ TheCollationMethod,
+ 2
+ };
+
+// The one and only locale character set object.
+const LCharSet TheCharSet =
+ {
+ NULL,
+ &TheCollationDataSet
+ };
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/locales/loce32/collation_rules/Spanish/colspa_strings.txt Tue Oct 19 16:42:43 2010 +0800
@@ -0,0 +1,4 @@
+% 004E ; [.07ED.0020.0008.004E] % LATIN CAPITAL LETTER N
+006E 0303 [.07EF.004F.0002.00F1] % LATIN SMALL LETTER N WITH TILDE
+004E 0303 [.07EF.004F.0008.00D1] % LATIN CAPITAL LETTER N WITH TILDE
+
--- a/locales/loce32/collation_rules/Spanish/readme_spanish.txt Fri Oct 01 17:44:24 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Default UNICODE collation used in Spanish
--- a/locales/loce32/region/src/region_gb.cpp Fri Oct 01 17:44:24 2010 +0800
+++ b/locales/loce32/region/src/region_gb.cpp Tue Oct 19 16:42:43 2010 +0800
@@ -28,11 +28,11 @@
const TDateFormat RegionAspect::DateFormat = EDateEuropean;
const TTimeFormat RegionAspect::TimeFormat = ETime12;
const TLocalePos RegionAspect::CurrencySymbolPosition = ELocaleBefore;
-const TBool RegionAspect::CurrencySpaceBetween = ETrue;
+const TBool RegionAspect::CurrencySpaceBetween = EFalse;
const TInt RegionAspect::CurrencyDecimalPlaces = 2;
const TLocale::TNegativeCurrencyFormat RegionAspect::NegativeCurrencyFormat=TLocale::TNegativeCurrencyFormat(TLocale::ELeadingMinusSign); // replacing CurrencyNegativeInBrackets
const TBool RegionAspect::CurrencyTriadsAllowed = ETrue;
-const TText * const RegionAspect::ThousandsSeparator = _S(" ");
+const TText * const RegionAspect::ThousandsSeparator = _S(",");
const TText * const RegionAspect::DecimalSeparator = _S(".");
const TText * const RegionAspect::DateSeparator[KMaxDateSeparators] = {_S(""),_S("/"),_S("/"),_S("")};
const TText * const RegionAspect::TimeSeparator[KMaxTimeSeparators] = {_S(""),_S(":"),_S(":"),_S("")};
@@ -40,9 +40,9 @@
const TBool RegionAspect::AmPmSpaceBetween = ETrue;
const TDaylightSavingZone RegionAspect::HomeDaylightSavingZone = EDstEuropean;
const TUint RegionAspect::WorkDays = 0x1f;
-const TText * const RegionAspect::CurrencySymbol = _S("£");
+const TText * const RegionAspect::CurrencySymbol = _S("£");
const TText* const RegionAspect::ShortDateFormatSpec = _S("%F%/0%D%/1%M%/2%Y%/3"); // no leading zeros
-const TText* const RegionAspect::LongDateFormatSpec = _S("%F%D%X %N %Y"); // leading zeros in day
+const TText* const RegionAspect::LongDateFormatSpec = _S("%F%*D%X %N %Y"); // no leading zeros in day
const TText* const RegionAspect::TimeFormatSpec = _S("%F%:0%*I%:1%*T%:2%*S%:3 %B"); // am/pm -symbol included
const TDay RegionAspect::StartOfWeek = EMonday;
const TClockFormat RegionAspect::ClockFormat = EClockAnalog;
--- a/locales/loce32/region/src/region_id.cpp Fri Oct 01 17:44:24 2010 +0800
+++ b/locales/loce32/region/src/region_id.cpp Tue Oct 19 16:42:43 2010 +0800
@@ -42,7 +42,7 @@
const TUint RegionAspect::WorkDays = 0x1f; // monday to friday
const TText * const RegionAspect::CurrencySymbol = _S("Rp");
const TText* const RegionAspect::ShortDateFormatSpec = _S("%F%/0%*D%/1%*M%/2%Y%/3"); // day-month-year (without leading zeros)
-const TText* const RegionAspect::LongDateFormatSpec = _S("%F%*D. %N %Y"); // day(dot separator) month(name) year (no leading zero in day)
+const TText* const RegionAspect::LongDateFormatSpec = _S("%F%*D %N %Y"); // day(no leading zeros) month(name) year
const TText* const RegionAspect::TimeFormatSpec = _S("%F%:0%*H%:1%T%:2%S%:3"); // hours:minutes:seconds (with leading zeros)
const TDay RegionAspect::StartOfWeek = EMonday;
const TClockFormat RegionAspect::ClockFormat = EClockDigital;
--- a/locales/loce32/region/src/region_my.cpp Fri Oct 01 17:44:24 2010 +0800
+++ b/locales/loce32/region/src/region_my.cpp Tue Oct 19 16:42:43 2010 +0800
@@ -42,7 +42,7 @@
const TUint RegionAspect::WorkDays = 0x1f;
const TText * const RegionAspect::CurrencySymbol = _S("RM");
const TText* const RegionAspect::ShortDateFormatSpec = _S("%F%/0%*D%/1%*M%/2%Y%/3"); // month.day.year (no leading zeros)
-const TText* const RegionAspect::LongDateFormatSpec = _S("%F%*D %N, %Y"); // Month(name) day(no leading zeros), year
+const TText* const RegionAspect::LongDateFormatSpec = _S("%F%*D %N %Y"); // day(no leading zeros) month(name) year
const TText* const RegionAspect::TimeFormatSpec = _S("%F%:0%*I%:1%T%:2%S%:3"); // Hours:Minutes:seconds (without leading zeros)
const TDay RegionAspect::StartOfWeek = EMonday;
const TClockFormat RegionAspect::ClockFormat = EClockDigital;