-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Koder: added patch for BMessageFormat renaming
Already fixed in trunk, but next Koder version 0.40 will take a while longer to be released, according to KapiX. Also added lib:libscintilla$secondaryArchSuffix to REQUIRES as haikuporter complains about that.
- Loading branch information
Humdinger
committed
Aug 19, 2018
1 parent
be01854
commit 05dcd07
Showing
2 changed files
with
35 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 591073e00ab79fad579bb3fb5eedb9aebb53cfe9 Mon Sep 17 00:00:00 2001 | ||
From: Humdinger <humdingerb@gmail.com> | ||
Date: Sun, 19 Aug 2018 17:41:55 +0200 | ||
Subject: BMessageFormat -> BStringFormat | ||
|
||
Needed after Haiku API change in hrev52220 | ||
|
||
diff --git a/src/EditorWindow.cpp b/src/EditorWindow.cpp | ||
index 7e1d8bb..b30e824 100644 | ||
--- a/src/EditorWindow.cpp | ||
+++ b/src/EditorWindow.cpp | ||
@@ -18,7 +18,7 @@ | ||
#include <GroupLayout.h> | ||
#include <LayoutBuilder.h> | ||
#include <MenuBar.h> | ||
-#include <MessageFormat.h> | ||
+#include <StringFormat.h> | ||
#include <MimeType.h> | ||
#include <Node.h> | ||
#include <NodeInfo.h> | ||
@@ -804,7 +804,7 @@ EditorWindow::_FindReplace(BMessage* message) | ||
int occurences = fEditor->ReplaceAll(findText, replaceText, | ||
matchCase, matchWord, inSelection, regex); | ||
BString alertMessage; | ||
- static BMessageFormat format(B_TRANSLATE("Replaced " | ||
+ static BStringFormat format(B_TRANSLATE("Replaced " | ||
"{0, plural, one{# occurence} other{# occurences}}.")); | ||
format.Format(alertMessage, occurences); | ||
BAlert* alert = new BAlert(B_TRANSLATE("Replacement finished"), | ||
-- | ||
2.16.4 | ||
|
05dcd07
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Forgot to mention that... I have changed scintilla 4.x to build shared object instead of static lib, so Koder wouldn't start without this. Nice catch!
05dcd07
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, it was haikuporter catching it actually... but I'll send your praise to the old bugger. :)