From 746656272a20856e63c5274fae18de6547b41a6c Mon Sep 17 00:00:00 2001 From: Siarzhuk Zharski Date: Tue, 29 Nov 2011 08:52:31 +0100 Subject: [PATCH] Fix non length-aware styling of localized strings. * The about-like screen saver info has bold styling of heading part of the information string string. Localizing this string has provoked partial styling and visual "corruption-looking" glitches. --- data/catalogs/add-ons/screen_savers/ifs/ru.catkeys | 5 +++-- src/add-ons/screen_savers/ifs/IFSSaver.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys b/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys index 93623bc20b..c2f021272f 100644 --- a/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys +++ b/data/catalogs/add-ons/screen_savers/ifs/ru.catkeys @@ -1,4 +1,5 @@ -1 russian x-vnd.Haiku-IFSScreensaver 1843903800 -Iterated Function System\n\n© 1997 Massimino Pascal\n\nxscreensaver port by Stephan Aßmus\n Screensaver IFS Геометрия фрактала\n\nВсе права защищены © 1997 Massimino Pascal\n\nпортировал из xscreensaver Stephan Aßmus\n +1 english x-vnd.Haiku-IFSScreensaver 2018309174 +Iterated Function System Screensaver IFS Геометрия фрактала +%screenSaverName%\n\n© 1997 Massimino Pascal\n\nxscreensaver port by Stephan Aßmus\n Screensaver IFS %screenSaverName%\n\nВсе права защищены © 1997 Massimino Pascal\n\nпортировал из xscreensaver Stephan Aßmus\n Morphing speed: Screensaver IFS Скорость трансформирования: Render dots additive Screensaver IFS Аддитивный рендеринг точек diff --git a/src/add-ons/screen_savers/ifs/IFSSaver.cpp b/src/add-ons/screen_savers/ifs/IFSSaver.cpp index 8996bcb319..106f1274fd 100644 --- a/src/add-ons/screen_savers/ifs/IFSSaver.cpp +++ b/src/add-ons/screen_savers/ifs/IFSSaver.cpp @@ -103,14 +103,18 @@ IFSSaver::StartConfig(BView *view) BTextView* textView = new BTextView(bounds, B_EMPTY_STRING, textRect, B_FOLLOW_ALL, B_WILL_DRAW); textView->SetViewColor(view->ViewColor()); - textView->Insert(B_TRANSLATE("Iterated Function System\n\n" + + BString aboutScreenSaver(B_TRANSLATE("%screenSaverName%\n\n" ""B_UTF8_COPYRIGHT" 1997 Massimino Pascal\n\n" "xscreensaver port by Stephan Aßmus\n" "")); + BString screenSaverName(B_TRANSLATE("Iterated Function System")); + aboutScreenSaver.ReplaceFirst("%screenSaverName%", screenSaverName); + textView->Insert(aboutScreenSaver); textView->SetStylable(true); - textView->SetFontAndColor(0, 24, be_bold_font); + textView->SetFontAndColor(0, screenSaverName.Length(), be_bold_font); // textView->SetFontAndColor(25, 255, be_plain_font); textView->MakeEditable(false);