[haiku-commits] r37918 - in haiku/trunk: headers/private/locale src/kits/locale
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 5 Aug 2010 11:27:13 +0200 (CEST)
Author: pulkomandy
Date: 2010-08-05 11:27:13 +0200 (Thu, 05 Aug 2010)
New Revision: 37918
Changeset: http://dev.haiku-os.org/changeset/37918
Modified:
haiku/trunk/headers/private/locale/MutableLocaleRoster.h
haiku/trunk/src/kits/locale/LocaleRoster.cpp
haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp
Log:
* The locale roster keeps its own Language instead of using the locale one, so
that changing the locale doesn't reset the
language.
Modified: haiku/trunk/headers/private/locale/MutableLocaleRoster.h
===================================================================
--- haiku/trunk/headers/private/locale/MutableLocaleRoster.h 2010-08-05
08:48:47 UTC (rev 37917)
+++ haiku/trunk/headers/private/locale/MutableLocaleRoster.h 2010-08-05
09:27:13 UTC (rev 37918)
@@ -109,6 +109,7 @@
BMessage fPreferredLanguages;
BLocale fDefaultLocale;
+ BLanguage fDefaultLanguage;
BTimeZone fDefaultTimeZone;
RosterData();
Modified: haiku/trunk/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/trunk/src/kits/locale/LocaleRoster.cpp 2010-08-05 08:48:47 UTC
(rev 37917)
+++ haiku/trunk/src/kits/locale/LocaleRoster.cpp 2010-08-05 09:27:13 UTC
(rev 37918)
@@ -104,7 +104,7 @@
if (!lock.IsLocked())
return B_ERROR;
- *language = *gRosterData.fDefaultLocale.Language();
+ *language = gRosterData.fDefaultLanguage;
return B_OK;
}
Modified: haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp
===================================================================
--- haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp 2010-08-05 08:48:47 UTC
(rev 37917)
+++ haiku/trunk/src/kits/locale/MutableLocaleRoster.cpp 2010-08-05 09:27:13 UTC
(rev 37918)
@@ -592,7 +592,7 @@
return B_ERROR;
fDefaultLocale.SetCollator(BCollator(langName.String()));
- fDefaultLocale.SetLanguage(langName.String());
+ fDefaultLanguage.SetTo(langName.String());
fPreferredLanguages.RemoveName("language");
for (int i = 0; languages->FindString("language", i, &langName)
== B_OK;
Other related posts:
- » [haiku-commits] r37918 - in haiku/trunk: headers/private/locale src/kits/locale - pulkomandy
