Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed fallbackTest

Browse source
This commit is contained in:
maroy 2004-12-20 14:02:48 +00:00
parent 1522d9c053
commit e9f5b6b04c
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
livesupport/modules/core/src/LocalizedObject.cxx
View file

@ -22,7 +22,7 @@
Author : $Author: maroy $ Author : $Author: maroy $
Version : $Revision: 1.5 $ Version : $Revision: 1.6 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/LocalizedObject.cxx,v $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/src/LocalizedObject.cxx,v $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -117,7 +117,7 @@ LocalizedObject :: getBundle(const char * key)
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
Ptr<ResourceBundle>::Ref resourceBundle(new ResourceBundle( Ptr<ResourceBundle>::Ref resourceBundle(new ResourceBundle(
bundle->get(key, status))); bundle->getWithFallback(key, status)));
if (!U_SUCCESS(status)) { if (!U_SUCCESS(status)) {
throw std::invalid_argument("can't get resource bundle"); throw std::invalid_argument("can't get resource bundle");
} }
@ -133,15 +133,18 @@ Ptr<UnicodeString>::Ref
LocalizedObject :: getResourceString(const char * key) LocalizedObject :: getResourceString(const char * key)
throw (std::invalid_argument) throw (std::invalid_argument)
{ {
UErrorCode status = U_ZERO_ERROR; Ptr<ResourceBundle>::Ref rb = getBundle(key);
Ptr<UnicodeString>::Ref unicodeStr; if (rb->getType() == URES_STRING) {
UErrorCode status = U_ZERO_ERROR;
Ptr<UnicodeString>::Ref str(new UnicodeString(rb->getString(status)));
if (!U_SUCCESS(status)) {
throw std::invalid_argument("requested resource not a string");
}
unicodeStr.reset(new UnicodeString(bundle->getStringEx(key, status))); return str;
if (!U_SUCCESS(status)) { } else {
throw std::invalid_argument("can't get string from bundle"); throw std::invalid_argument("requested resource not a string");
} }
return unicodeStr;
} }