I18N for HTMLTextAreaSearchUtils

Author: jisedlac

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/Bundle.properties

@@ -60,3 +60,17 @@ HTMLTextArea_CopyString=Copy
 HTMLTextArea_PasteString=Paste
 HTMLTextArea_DeleteString=Delete
 HTMLTextArea_SelectAllString=Select All
+
+HTMLTextAreaSearchUtils_MatchesPattern={0} of {1} matches
+HTMLTextAreaSearchUtils_NoMatches=no matches
+HTMLTextAreaSearchUtils_MatchesTooltip=Highlight matches
+HTMLTextAreaSearchUtils_SidebarCaption=Find\:
+HTMLTextAreaSearchUtils_BtnPrevious=Previous
+#Tooltip, {0} stands for action accelerator
+HTMLTextAreaSearchUtils_BtnPreviousTooltip=Find previous occurence ({0})
+HTMLTextAreaSearchUtils_BtnNext=Next
+#Tooltip, {0} stands for action accelerator
+HTMLTextAreaSearchUtils_BtnNextTooltip=Find next occurence ({0})
+HTMLTextAreaSearchUtils_BtnMatchCaseTooltip=Match case
+#Tooltip, {0} stands for action accelerator
+HTMLTextAreaSearchUtils_BtnCloseTooltip=Close Find sidebar ({0})

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/components/HTMLTextAreaSearchUtils.java

@@ -94,17 +94,17 @@ public final class HTMLTextAreaSearchUtils {
 
     // -----
     // I18N String constants
-    private static final ResourceBundle messages = ResourceBundle.getBundle("org.graalvm.visualvm.lib.ui.swing.Bundle"); // NOI18N
-//    public static final String ACTION_FIND = messages.getString("SearchUtils_ActionFind"); // NOI18N
-//    private static final String MSG_NODATA = messages.getString("SearchUtils_MsgNoData"); // NOI18N
-//    private static final String MSG_NOTFOUND = messages.getString("SearchUtils_MsgNotFound"); // NOI18N
-    private static final String SIDEBAR_CAPTION = messages.getString("SearchUtils_SidebarCaption"); // NOI18N
-    private static final String BTN_PREVIOUS = messages.getString("SearchUtils_BtnPrevious"); // NOI18N
-    private static final String BTN_PREVIOUS_TOOLTIP = messages.getString("SearchUtils_BtnPreviousTooltip"); // NOI18N
-    private static final String BTN_NEXT = messages.getString("SearchUtils_BtnNext"); // NOI18N
-    private static final String BTN_NEXT_TOOLTIP = messages.getString("SearchUtils_BtnNextTooltip"); // NOI18N
-    private static final String BTN_MATCH_CASE_TOOLTIP = messages.getString("SearchUtils_BtnMatchCaseTooltip"); // NOI18N
-    private static final String BTN_CLOSE_TOOLTIP = messages.getString("SearchUtils_BtnCloseTooltip"); // NOI18N
+    private static final ResourceBundle messages = ResourceBundle.getBundle("org.graalvm.visualvm.lib.ui.components.Bundle"); // NOI18N
+    private static final String MATCHES_PATTERN = messages.getString("HTMLTextAreaSearchUtils_MatchesPattern"); // NOI18N
+    private static final String NO_MATCHES = messages.getString("HTMLTextAreaSearchUtils_NoMatches"); // NOI18N
+    private static final String MATCHES_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_MatchesTooltip"); // NOI18N
+    private static final String SIDEBAR_CAPTION = messages.getString("HTMLTextAreaSearchUtils_SidebarCaption"); // NOI18N
+    private static final String BTN_PREVIOUS = messages.getString("HTMLTextAreaSearchUtils_BtnPrevious"); // NOI18N
+    private static final String BTN_PREVIOUS_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_BtnPreviousTooltip"); // NOI18N
+    private static final String BTN_NEXT = messages.getString("HTMLTextAreaSearchUtils_BtnNext"); // NOI18N
+    private static final String BTN_NEXT_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_BtnNextTooltip"); // NOI18N
+    private static final String BTN_MATCH_CASE_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_BtnMatchCaseTooltip"); // NOI18N
+    private static final String BTN_CLOSE_TOOLTIP = messages.getString("HTMLTextAreaSearchUtils_BtnCloseTooltip"); // NOI18N
     // -----
 
     public static final String FIND_ACTION_KEY = "find-action-key"; // NOI18N
@@ -424,7 +424,7 @@ public void run() {
                     });
                 }
             };
-            highlightResults.setToolTipText("Highlight matches");
+            highlightResults.setToolTipText(MATCHES_TOOLTIP);
             // NOTE: added below
 
             final JButton prev = new JButton(BTN_PREVIOUS, Icons.getIcon(GeneralIcons.FIND_PREVIOUS)) {
@@ -446,7 +446,7 @@ public void run() {
                                 int offset = result.getOffset(index);
                                 area.select(offset, offset + search.length());
                             } else {
-                                feedback.setText("no matches");
+                                feedback.setText(NO_MATCHES);
                                 area.select(area.getSelectionStart(), area.getSelectionStart());
                             }
                         }
@@ -481,7 +481,7 @@ public void run() {
                                 int offset = result.getOffset(index);
                                 area.select(offset, offset + search.length());
                             } else {
-                                feedback.setText("no matches");
+                                feedback.setText(NO_MATCHES);
                                 area.select(area.getSelectionStart(), area.getSelectionStart());
                             }
                         }
@@ -593,7 +593,7 @@ private String getSearchString() {
 
         private void setResultsFeedback(int index, int count, DocumentSearchResult result) {
             NumberFormat format = NumberFormat.getInstance();
-            feedback.setText(format.format(index + 1) + " of " + format.format(count) + " matches");
+            feedback.setText(MessageFormat.format(MATCHES_PATTERN, format.format(index + 1), format.format(count)));
 
             if (result != null) {
                 if (highlightResults.isSelected()) result.highlightResults(area.getHighlighter());