From 072423e569f0540de0edc11f4a80afe26a252dd3 Mon Sep 17 00:00:00 2001 From: lathapatil Date: Wed, 13 Mar 2024 12:06:06 +0530 Subject: [PATCH] Externalize the 'difference/s' text #1236 Externalization of text used in "Textmergeviewer.java" related to number of differences shown in toolbar of compare editor using MessageFormat.format Version bump to 3.10.100 Update team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties Co-authored-by: Matthias Becker --- .../eclipse/compare/contentmergeviewer/TextMergeViewer.java | 3 +-- .../compare/org/eclipse/compare/internal/CompareMessages.java | 1 + .../org/eclipse/compare/internal/CompareMessages.properties | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 20a980f78e3..aab04a652d7 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -5413,8 +5413,7 @@ private void updateToolbarLabel() { int differenceCount = fMerger.changesCount(); if (tbm != null) { - String label = differenceCount > 1 ? differenceCount + " Differences" //$NON-NLS-1$ - : differenceCount == 1 ? differenceCount + " Difference" : "No Difference"; //$NON-NLS-1$ //$NON-NLS-2$ + String label = MessageFormat.format(CompareMessages.TextMergeViewer_differences, differenceCount); LabelContributionItem labelContributionItem = new LabelContributionItem(DIFF_COUNT_ID, label); diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java index 09fedb6a744..289d69cc099 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java @@ -96,6 +96,7 @@ private CompareMessages() { public static String TextMergeViewer_atEnd_message; public static String TextMergeViewer_atBeginning_title; public static String TextMergeViewer_atBeginning_message; + public static String TextMergeViewer_differences; public static String CompareNavigator_atEnd_title; public static String CompareNavigator_atEnd_message; public static String CompareNavigator_atBeginning_title; diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties index 8cdcff78bb4..b74810b3511 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties @@ -81,6 +81,8 @@ TextMergeViewer_accessible_right={0} Right: {1} TextMergeViewer_atBeginning_message= Beginning of document reached. Continue from end? TextMergeViewer_accessible_ancestor=Ancestor: {0} +TextMergeViewer_differences={0,choice,0#No Difference|1#1 Difference|1<{0} Differences} + CompareNavigator_atEnd_title= End Reached CompareDialog_commit_button=C&ommit CompareDialog_error_title=Error Saving Changes