From 10c73bcbb350958e34a1383621f4c7da51042bea Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Mon, 20 Dec 2010 16:25:38 +0000 Subject: [PATCH] Don't returns NULL if the systemCatalog is not localized yet. Instead, fallback to native string. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39895 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/locale/LibbeLocaleBackend.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kits/locale/LibbeLocaleBackend.cpp b/src/kits/locale/LibbeLocaleBackend.cpp index 4fcb54e5e1..9953b4fa5b 100644 --- a/src/kits/locale/LibbeLocaleBackend.cpp +++ b/src/kits/locale/LibbeLocaleBackend.cpp @@ -39,10 +39,12 @@ LibbeLocaleBackend::GetString(const char* string, const char* context, const char* comment) { // The system catalog will not be there for non-localized apps. - if (systemCatalog) - return systemCatalog->GetString(string, context, comment); - else - return string; + if (systemCatalog) { + const char *translated = systemCatalog->GetString(string, context, comment); + if (translated) + return translated; + } + return string; }