Author: mlandres Date: Wed Oct 22 17:19:35 2008 New Revision: 11454 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11454&view=rev Log: use the right text locale Modified: trunk/libzypp/zypp/Locale.cc trunk/libzypp/zypp/Locale.h trunk/libzypp/zypp/sat/Solvable.h Modified: trunk/libzypp/zypp/Locale.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locale.cc?rev=11454&r1=11453&r2=11454&view=diff ============================================================================== --- trunk/libzypp/zypp/Locale.cc (original) +++ trunk/libzypp/zypp/Locale.cc Wed Oct 22 17:19:35 2008 @@ -230,7 +230,7 @@ { if ( ! avLocales_r.empty() ) { - for ( Locale check( requested_r == noCode ? ZConfig::instance().defaultTextLocale() : requested_r ); + for ( Locale check( requested_r == noCode ? ZConfig::instance().textLocale() : requested_r ); check != noCode; check = check.fallback() ) { if ( avLocales_r.find( check ) != avLocales_r.end() ) Modified: trunk/libzypp/zypp/Locale.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locale.h?rev=11454&r1=11453&r2=11454&view=diff ============================================================================== --- trunk/libzypp/zypp/Locale.h (original) +++ trunk/libzypp/zypp/Locale.h Wed Oct 22 17:19:35 2008 @@ -91,7 +91,7 @@ /** Return the best match for \ref Locale \c requested_r within the available \c avLocales_r. * * If \c requested_r is nor specified or equals \ref Locale::noCode, - * \ref ZConfig::defaultTextLocale is assumed. + * \ref ZConfig::textLocale is assumed. * * If neither \c requested_r nor any of it's \ref fallback locales * are available, \ref Locale::noCode is returned. Modified: trunk/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=11454&r1=11453&r2=11454&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.h (original) +++ trunk/libzypp/zypp/sat/Solvable.h Wed Oct 22 17:19:35 2008 @@ -103,7 +103,7 @@ * Returns the translation for \c lang_r (\b no fallback locales). * * Passing an empty \ref Locale will return the string for the - * current default locale (\see \ref ZConfig::defaultTextLocale), + * current default locale (\see \ref ZConfig::TextLocale), * \b considering all fallback locales. * * Returns an empty string if no translation is available. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org