Author: borisk
Date: Wed Mar 5 10:14:04 2008
New Revision: 633955
URL: http://svn.apache.org/viewvc?rev=633955&view=rev
Log:
Use root instead of en_US as locale for built-in messages in the ICU message
loader
Added:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
- copied, changed from r633808,
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Removed:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp?rev=633955&r1=633954&r2=633955&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp Wed Mar 5
10:14:04 2008
@@ -163,7 +163,7 @@
***/
strcat(locationBuf, BUNDLE_NAME);
UErrorCode err = U_ZERO_ERROR;
- uloc_setDefault("en_US", &err); // in case user-specified locale
unavailable
+ uloc_setDefault("root", &err); // in case user-specified locale
unavailable
err = U_ZERO_ERROR;
fLocaleBundle = ures_open(locationBuf, XMLMsgLoader::getLocale(), &err);
if (!U_SUCCESS(err) || fLocaleBundle == NULL)
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=633955&r1=633954&r2=633955&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in Wed
Mar 5 10:14:04 2008
@@ -57,7 +57,7 @@
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
-RESFILES=en_US.res
+RESFILES=root.res
# list of resource bundles - keep in sync with RESFILES
RESLIST=$(srcdir)/res-file-list.txt
@@ -120,7 +120,7 @@
distdir:
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='res-file-list.txt en_US.txt Makefile.in resources.mak'; \
+ list='res-file-list.txt root.txt Makefile.in resources.mak'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
Modified:
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt?rev=633955&r1=633954&r2=633955&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
Wed Mar 5 10:14:04 2008
@@ -1 +1 @@
-en_US.res
+root.res
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak?rev=633955&r1=633954&r2=633955&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak Wed
Mar 5 10:14:04 2008
@@ -19,7 +19,7 @@
# for VER
include ..\..\..\..\..\..\version.incl
-RESFILES= en_US.res
+RESFILES= root.res
PKGNAME = xercesc_messages_$(VER_UNDERSCORED)
TARGET_DLL = $(PKGNAME).DLL
@@ -39,7 +39,6 @@
#
# Inference rule, for compiling a .txt file into a .res file.
-# -t fools make into thinking there are files such as es.res, etc
#
.txt.res:
$(GENRB) -d . $*.txt
Copied: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt (from
r633808, xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt)
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt?p2=xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt&p1=xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt&r1=633808&r2=633955&rev=633955&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/root.txt Wed Mar
5 10:14:04 2008
@@ -1,4 +1,4 @@
-en_US {
+root {
// an array
XMLErrors {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
