Ticket #7109: charactermap-localization-update.patch

src/apps/charactermap/CharacterWindow.cpp

@@ -121 +121 @@
 
 
 CharacterWindow::CharacterWindow()
-    : BWindow(BRect(100, 100, 700, 550), "CharacterMap", B_TITLED_WINDOW,
-        B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
+    : BWindow(BRect(100, 100, 700, 550), B_TRANSLATE("CharacterMap"), 
+        B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_QUIT_ON_WINDOW_CLOSE
             | B_AUTO_UPDATE_SIZE_LIMITS)
 {
     BMessage settings;
@@ -216 +216 @@
     // Add menu
 
     // "File" menu
-    BMenu* menu = new BMenu("File");
+    BMenu* menu = new BMenu(B_TRANSLATE("File"));
     BMenuItem* item;
 
     menu->AddItem(item = new BMenuItem(B_TRANSLATE("About CharacterMap"
@@ -230 +230 @@
     item->SetTarget(be_app);
     menuBar->AddItem(menu);
 
-    menu = new BMenu("View");
+    menu = new BMenu(B_TRANSLATE("View"));
     menu->AddItem(item = new BMenuItem(B_TRANSLATE("Show private blocks"),
         new BMessage(kMsgPrivateBlocks)));
     item->SetMarked(fCharacterView->IsShowingPrivateBlocks());
 // TODO: this feature is not yet supported by Haiku!
 #if 0
-    menu->AddItem(item = new BMenuItem("Only show blocks contained in font",
-        new BMessage(kMsgContainedBlocks)));
+    menu->AddItem(item = new BMenuItem(B_TRANSLATE("Only show blocks "
+        "contained in font"), new BMessage(kMsgContainedBlocks)));
     item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly());
 #endif
     menuBar->AddItem(menu);
@@ -310 +310 @@
                 sizeof(utf8Hex));
 
             char text[128];
-            snprintf(text, sizeof(text), "'%s' Code: %#lx (%ld), UTF-8: %s",
+            BString str1("'%s' %1: %#lx (%ld), UTF-8: %s");
+            str1.ReplaceFirst("%1", "Code");
+            snprintf(text, sizeof(text), str1.String(),
                 utf8, character, character, utf8Hex);
 
             fCodeView->SetText(text);
@@ -493 +495 @@
 BMenu*
 CharacterWindow::_CreateFontMenu()
 {
-    BMenu* menu = new BMenu("Font");
+    BMenu* menu = new BMenu(B_TRANSLATE("Font"));
     BMenuItem* item;
 
     font_family currentFamily;

src/apps/charactermap/CharacterMap.cpp

@@ -57 +57 @@
 void
 CharacterMap::AboutRequested()
 {
-    BAlert *alert = new BAlert(B_TRANSLATE("about"), B_TRANSLATE(
+    BAlert *alert = new BAlert("about", B_TRANSLATE(
         "CharacterMap\n"
         "\twritten by Axel Dörfler\n"
-        "\tCopyright 2009, Haiku, Inc.\n"), "OK");
+        "\tCopyright 2009, Haiku, Inc.\n"), B_TRANSLATE("OK"));
     BTextView *view = alert->TextView();
     BFont font;