Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Externalize the 'difference/s' text #1236 #1248

Merged
merged 1 commit into from Mar 25, 2024
Merged

Externalize the 'difference/s' text #1236 #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare; singleton:=true
Bundle-Version: 3.10.0.qualifier
Bundle-Version: 3.10.100.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
3 changes: 1 addition & 2 deletions ...s/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
View file
Open in desktop
Expand Up @@ -5421,8 +5421,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);

Expand Down
1 change: 1 addition & 0 deletions team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...ndles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
View file
Open in desktop
Expand Up @@ -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
Expand Down