From a52b9419e73a4decf648ef73008676d2f16dbe50 Mon Sep 17 00:00:00 2001 From: threedeyes <3dEyes@gmail.com> Date: Sun, 30 Dec 2012 04:32:44 +0000 Subject: [PATCH] Apply patch by dsjonny from ticket #9339: Localization for ICNS Translator --- src/add-ons/translators/icns/ConfigView.cpp | 8 ++++++-- src/add-ons/translators/icns/ICNSTranslator.cpp | 9 +++++++-- src/add-ons/translators/icns/Jamfile | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/add-ons/translators/icns/ConfigView.cpp b/src/add-ons/translators/icns/ConfigView.cpp index 69c3f5336a..289d2d82c0 100644 --- a/src/add-ons/translators/icns/ConfigView.cpp +++ b/src/add-ons/translators/icns/ConfigView.cpp @@ -6,12 +6,16 @@ #include "ConfigView.h" #include "ICNSTranslator.h" +#include #include #include #include #include +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "ICNSConfig" + extern "C" { #include }; @@ -23,7 +27,7 @@ ConfigView::ConfigView(TranslatorSettings *settings) fSettings = settings; BAlignment leftAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET); - BStringView *stringView = new BStringView("title", "Apple icon translator"); + BStringView *stringView = new BStringView("title", B_TRANSLATE("Apple icon translator")); stringView->SetFont(be_bold_font); stringView->SetExplicitAlignment(leftAlignment); AddChild(stringView); @@ -32,7 +36,7 @@ ConfigView::ConfigView(TranslatorSettings *settings) AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); char version[256]; - sprintf(version, "Version %d.%d.%d, %s", + sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"), int(B_TRANSLATION_MAJOR_VERSION(ICNS_TRANSLATOR_VERSION)), int(B_TRANSLATION_MINOR_VERSION(ICNS_TRANSLATOR_VERSION)), int(B_TRANSLATION_REVISION_VERSION(ICNS_TRANSLATOR_VERSION)), diff --git a/src/add-ons/translators/icns/ICNSTranslator.cpp b/src/add-ons/translators/icns/ICNSTranslator.cpp index c4cf42d868..c70b5bdb33 100644 --- a/src/add-ons/translators/icns/ICNSTranslator.cpp +++ b/src/add-ons/translators/icns/ICNSTranslator.cpp @@ -13,6 +13,11 @@ #include "ConfigView.h" #include "ICNSLoader.h" +#include + +#undef B_TRANSLATION_CONTEXT +#define B_TRANSLATION_CONTEXT "ICNSTranslator" + extern "C" { #include "icns.h" } @@ -78,8 +83,8 @@ const uint32 kNumDefaultSettings = sizeof(sDefaultSettings) ICNSTranslator::ICNSTranslator() - : BaseTranslator("Apple icons", - "Apple icon translator", + : BaseTranslator(B_TRANSLATE("Apple icons"), + B_TRANSLATE("Apple icon translator"), ICNS_TRANSLATOR_VERSION, sInputFormats, kNumInputFormats, sOutputFormats, kNumOutputFormats, diff --git a/src/add-ons/translators/icns/Jamfile b/src/add-ons/translators/icns/Jamfile index 23b3e44942..68ab239ba9 100644 --- a/src/add-ons/translators/icns/Jamfile +++ b/src/add-ons/translators/icns/Jamfile @@ -80,6 +80,7 @@ Translator ICNSTranslator : DoCatalogs ICNSTranslator : x-vnd.Haiku-ICNSTranslator : + ConfigView.cpp ICNSTranslator.h ICNSTranslator.cpp ;