Ticket #7874: DecorInfo.diff

src/kits/interface/DecorInfo.cpp

@@ -19 +19 @@
 
 #include <DecoratorPrivate.h>
 
+#include <Catalog.h>
+#include <LocaleBackend.h>
+using BPrivate::gLocaleBackend;
+using BPrivate::LocaleBackend;
 
+#undef B_TRANSLATE_CONTEXT
+#define B_TRANSLATE_CONTEXT "DecorInfo"
+
+#undef B_TRANSLATE
+#define B_TRANSLATE(str) \
+    gLocaleBackend->GetString(B_TRANSLATE_MARK(str), "DecorInfo")
+
 namespace BPrivate {
 
 
@@ -258 +269 @@
                 "decorator!?!?!\n");
             return;
         }
+        // we need to translate some strings, and in order to do so, we need
+        // to use the LocaleBackend to reach liblocale.so
+        if (gLocaleBackend == NULL)
+        LocaleBackend::LoadBackend();
 
-        fName = "Default";
+        fName = B_TRANSLATE_MARK("Default");
         fAuthors = "DarkWyrm, Stephan Aßmus, Clemens Zeidler, Ingo Weinhold";
-        fShortDescription = "Default Haiku window decorator.";
+        fShortDescription = B_TRANSLATE_MARK("Default Haiku window decorator.");
         fLongDescription = fShortDescription;
         fLicenseURL = "http://";
         fLicenseName = "MIT";

src/kits/locale/Jamfile

@@ -66 +66 @@
 SEARCH on [ FGristFiles AboutMenuItem.cpp ] += [ FDirName $(HAIKU_TOP) src kits shared ] ;
 SEARCH on [ FGristFiles AboutWindow.cpp ] += [ FDirName $(HAIKU_TOP) src kits shared ] ;
 SEARCH on [ FGristFiles ColorControl.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
-SEARCH on [ FGristFiles StringForSize.cpp ] += [ FDirName $(HAIKU_TOP) src kits shared ] ;
-SEARCH on [ FGristFiles TextView.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
+SEARCH on [ FGristFiles DecorInfo.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
 SEARCH on [ FGristFiles Dragger.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
 SEARCH on [ FGristFiles Menu.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
 SEARCH on [ FGristFiles PrintJob.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
+SEARCH on [ FGristFiles StringForSize.cpp ] += [ FDirName $(HAIKU_TOP) src kits shared ] ;
+SEARCH on [ FGristFiles TextView.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
 SEARCH on [ FGristFiles ZombieReplicantView.cpp ] += [ FDirName $(HAIKU_TOP) src kits interface ] ;
 
 DoCatalogs liblocale.so
@@ -79 +80 @@
     AboutMenuItem.cpp
     AboutWindow.cpp
     ColorControl.cpp
+    DecorInfo.cpp
     Dragger.cpp
     Menu.cpp
     PrintJob.cpp