i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Changed AboutSystem to only show the translated language names.

Browse Source 
* Added the same hack to ReadOnlyBootPrompt that I put into Locale to
  work-around the missing font overlays in the app_server; IOW we use some
  heuristics to decide which language to show.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36730 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-05-07 18:57:51 +00:00
parent 125183f9e5
commit b588e644ee
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/aboutsystem/AboutSystem.cpp
+3 -3
View File
@@ -169,12 +169,12 @@ TranslationComparator(const void* left, const void* right)
BLanguage* language; BLanguage* language;
be_locale_roster->GetLanguage(leftTranslation->languageCode, &language); be_locale_roster->GetLanguage(leftTranslation->languageCode, &language);
BString leftName; BString leftName;
language->GetName(leftName); language->GetTranslatedName(leftName);
delete language; delete language;
be_locale_roster->GetLanguage(rightTranslation->languageCode, &language); be_locale_roster->GetLanguage(rightTranslation->languageCode, &language);
BString rightName; BString rightName;
language->GetName(rightName); language->GetTranslatedName(rightName);
delete language; delete language;
return be_locale->Collator()->Compare(leftName.String(), return be_locale->Collator()->Compare(leftName.String(),
@@ -1067,7 +1067,7 @@ AboutView::_CreateCreditsView()
be_locale_roster->GetLanguage(translation.languageCode, &lang); be_locale_roster->GetLanguage(translation.languageCode, &lang);
langName.Truncate(0); langName.Truncate(0);
lang->GetName(langName); lang->GetTranslatedName(langName);
delete lang; delete lang;
fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuGreen); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuGreen);
src/apps/readonlybootprompt/BootPromptWindow.cpp
+18 -5
View File
@@ -3,6 +3,7 @@
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#include "BootPromptWindow.h" #include "BootPromptWindow.h"
#include <stdio.h> #include <stdio.h>
@@ -24,6 +25,7 @@
#include <StringItem.h> #include <StringItem.h>
#include <StringView.h> #include <StringView.h>
#include <TextView.h> #include <TextView.h>
#include <UnicodeChar.h>
#include "BootPrompt.h" #include "BootPrompt.h"
#include "Keymap.h" #include "Keymap.h"
@@ -279,14 +281,23 @@ BootPromptWindow::_PopulateLanguages()
// limited to catalogs written for this application, which is on purpose! // limited to catalogs written for this application, which is on purpose!
const char* languageString; const char* languageString;
for (int32 i = 0; for (int32 i = 0; installedCatalogs.FindString("langs", i, &languageString)
installedCatalogs.FindString("langs", i, &languageString) == B_OK; == B_OK; i++) {
i++) {
BLanguage* language; BLanguage* language;
if (be_locale_roster->GetLanguage(languageString, if (be_locale_roster->GetLanguage(languageString, &language) == B_OK) {
&language) == B_OK) {
BString name; BString name;
language->GetName(name); language->GetName(name);
// TODO: as long as the app_server doesn't support font overlays,
// use the translated name if problematic characters are used...
const char* string = name.String();
while (uint32 code = BUnicodeChar::FromUTF8(&string)) {
if (code > 1424) {
language->GetTranslatedName(name);
break;
}
}
LanguageItem* item = new LanguageItem(name.String(), LanguageItem* item = new LanguageItem(name.String(),
languageString); languageString);
fLanguagesListView->AddItem(item); fLanguagesListView->AddItem(item);
@@ -295,6 +306,8 @@ BootPromptWindow::_PopulateLanguages()
fLanguagesListView->Select( fLanguagesListView->Select(
fLanguagesListView->CountItems() - 1); fLanguagesListView->CountItems() - 1);
} }
delete language;
} else } else
printf("failed to get BLanguage for %s\n", languageString); printf("failed to get BLanguage for %s\n", languageString);
} }