Skip to content

Commit

Permalink
Merge pull request #376 from Mailaender/constant-l10n
Browse files Browse the repository at this point in the history 
Format externalized strings consistently
  • Loading branch information
@eselmeister
eselmeister authored Nov 17, 2023
2 parents e3c0998 + 7366296 commit 4489587
Show file tree
Hide file tree
Showing 18 changed files with 256 additions and 260 deletions.
4 changes: 0 additions & 4 deletions OpenSourcePlottingTools.txt
View file

This file was deleted.

12 changes: 6 additions & 6 deletions org.eclipse.swtchart.customcharts/src/org/eclipse/swtchart/customcharts/core/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
public class Messages {

private static final String BUNDLE_NAME = "org.eclipse.swtchart.customcharts.core.messages"; //$NON-NLS-1$
//
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
public static String INTENSITY = "INTENSITY";
public static String MINUTES = "MINUTES";
public static String RELATIVE_INTENSITY = "RELATIVE_INTENSITY";
public static String RETENTION_TIME = "RETENTION_TIME";
public static String RESET_CHROMATOGRAM = "RESET_CHROMATOGRAM";;
//
public static final String INTENSITY = "INTENSITY";
public static final String MINUTES = "MINUTES";
public static final String RELATIVE_INTENSITY = "RELATIVE_INTENSITY";
public static final String RETENTION_TIME = "RETENTION_TIME";
public static final String RESET_CHROMATOGRAM = "RESET_CHROMATOGRAM";

private Messages() {

Expand Down
3 changes: 2 additions & 1 deletion ...tchart.export.extended/src/org/eclipse/swtchart/export/extended/menu/vector/Messages.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 SWT Chart Project
* Copyright (c) 2020, 2023 SWT Chart Project
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -19,6 +19,7 @@ public class Messages {

private static final String BUNDLE_NAME = "org.eclipse.swtchart.export.extended.menu.vector.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
//
public static final String EXPORT_TO_SVG = "EXPORT_TO_SVG";
public static final String SAVE_AS_SVG = "SAVE_AS_SVG";
public static final String SVG = "SVG";
Expand Down
3 changes: 2 additions & 1 deletion org.eclipse.swtchart.export/src/org/eclipse/swtchart/export/menu/vector/Messages.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 SWT Chart Project
* Copyright (c) 2020, 2023 SWT Chart Project
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -19,6 +19,7 @@ public class Messages {

private static final String BUNDLE_NAME = "org.eclipse.swtchart.export.menu.vector.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
//
public static final String EXPORT_TO_SVG = "EXPORT_TO_SVG";
public static final String SAVE_AS_SVG = "SAVE_AS_SVG";
public static final String SVG = "SVG";
Expand Down
126 changes: 63 additions & 63 deletions org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/core/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,69 +20,69 @@ public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.swtchart.extensions.core.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
//
public static String ADD_MAPPING = "ADD_MAPPING";
public static String ALL_MAPPINGS_DELETED = "ALL_MAPPINGS_DELETED";
public static String BAR = "BAR";
public static String CANT_SET_SECONDARY_X_AXIS_RANGE = "CANT_SET_SECONDARY_X_AXIS_RANGE";
public static String X_Y_SERIES_LENGTH_DIFFERS = "X_Y_SERIES_LENGTH_DIFFERS";
public static String CHART_TITLE = "CHART_TITLE";
public static String CIRCULAR = "CIRCULAR";
public static String COLOR = "COLOR";
public static String DELETE_ALL_MAPPINGS = "DELETE_ALL_MAPPINGS";
public static String DELETE_SELECTED_MAPPING = "DELETE_SELECTED_MAPPING";
public static String DESCRIPTION = "DESCRIPTION";
public static String DISPLAY_MAPPINGS = "DISPLAY_MAPPINGS";
public static String DOUBLE_CLICK_TO_SHOW_RANGE_INFO = "DOUBLE_CLICK_TO_SHOW_RANGE_INFO";
public static String DRAW = "DRAW";
public static String EXPORT = "EXPORT";
public static String FAILED_TO_APPLY_SETTINGS = "FAILED_TO_APPLY_SETTINGS";
public static String HIDE = "HIDE";
public static String HIDE_RANGE_SELECTOR_UI = "HIDE_RANGE_SELECTOR_UI";
public static String ID = "ID";
public static String IMPORT = "IMPORT";
public static String LABEL = "LABEL";
public static String LABEL_NOT_SET = "LABEL_NOT_SET";
public static String LEGEND_POSITION = "LEGEND_POSITION";
public static String LEGEND_POSITION_X = "LEGEND_POSITION_X";
public static String LEGEND_POSITION_Y = "LEGEND_POSITION_Y";
public static String LINE = "LINE";
public static String MAP_ALL_LISTED_SERIES = "MAP_ALL_LISTED_SERIES";
public static String MAPPED_SERIES_SETTINGS = "MAPPED_SERIES_SETTINGS";
public static String MAPPING_STATUS = "MAPPING_STATUS";
public static String MAPPINGS = "MAPPINGS";
public static String MAPPINGS_EXPORTED = "MAPPINGS_EXPORTED";
public static String MAPPINGS_IMPORTED = "MAPPINGS_IMPORTED";
public static String MAPPINGS_SAVED = "MAPPINGS_SAVED";
public static String MOVE_LEGEND_DOWN = "MOVE_LEGEND_DOWN";
public static String MOVE_LEGEND_LEFT = "MOVE_LEGEND_LEFT";
public static String MOVE_LEGEND_RIGHT = "MOVE_LEGEND_RIGHT";
public static String MOVE_LEGEND_UP = "MOVE_LEGEND_UP";
public static String NEW_MAPPING_ADDED = "NEW_MAPPING_ADDED";
public static String NONE = "NONE";
public static String NOT_SET = "NOT_SET";
public static String OPEN_SETTINGS_PAGE = "OPEN_SETTINGS_PAGE";
public static String POSITION_USING_MOUSE = "POSITION_USING_MOUSE";
public static String REALLY_DELETE_ALL_MAPPINGS = "REALLY_DELETE_ALL_MAPPINGS";
public static String REALLY_DELETE_SELECTED_MAPPING = "REALLY_DELETE_SELECTED_MAPPING";
public static String RESET = "RESET";
public static String RESET_RANGE = "RESET_RANGE";
public static String SAVE_MAPPINGS = "SAVE_MAPPINGS";
public static String SCATTER = "SCATTER";
public static String SELECTED_MAPPING_DELETED = "SELECTED_MAPPING_DELETED";
public static String SERIES_POPUP_MENU = "SERIES_POPUP_MENU";
public static String SET = "SET";
public static String SET_CURRENT_SELECTION = "SET_CURRENT_SELECTION";
public static String SET_LEGEND_POSITION = "SET_LEGEND_POSITION";
public static String SETTINGS = "SETTINGS";
public static String SORT_TABLE = "SORT_TABLE";
public static String TOGGLE_VISIBILITY = "TOGGLE_VISIBILITY";
public static String TOGGLE_VISIBILITY_OF_EMBEDDED_LEGEND = "TOGGLE_VISIBILITY_OF_EMBEDDED_LEGEND";
public static String TRANSFER_MAPPINGS_OF_SELECTED_SERIES = "TRANSFER_MAPPINGS_OF_SELECTED_SERIES";
public static String UNDETERMINED_SERIES_TYPE = "UNDETERMINED_SERIES_TYPE";
public static String VISIBLE = "VISIBLE";
public static String VISIBLE_IN_LEGEND = "VISIBLE_IN_LEGEND";
public static String X_AXIS = "X_AXIS";
public static String Y_AXIS = "Y_AXIS";
public static final String ADD_MAPPING = "ADD_MAPPING";
public static final String ALL_MAPPINGS_DELETED = "ALL_MAPPINGS_DELETED";
public static final String BAR = "BAR";
public static final String CANT_SET_SECONDARY_X_AXIS_RANGE = "CANT_SET_SECONDARY_X_AXIS_RANGE";
public static final String X_Y_SERIES_LENGTH_DIFFERS = "X_Y_SERIES_LENGTH_DIFFERS";
public static final String CHART_TITLE = "CHART_TITLE";
public static final String CIRCULAR = "CIRCULAR";
public static final String COLOR = "COLOR";
public static final String DELETE_ALL_MAPPINGS = "DELETE_ALL_MAPPINGS";
public static final String DELETE_SELECTED_MAPPING = "DELETE_SELECTED_MAPPING";
public static final String DESCRIPTION = "DESCRIPTION";
public static final String DISPLAY_MAPPINGS = "DISPLAY_MAPPINGS";
public static final String DOUBLE_CLICK_TO_SHOW_RANGE_INFO = "DOUBLE_CLICK_TO_SHOW_RANGE_INFO";
public static final String DRAW = "DRAW";
public static final String EXPORT = "EXPORT";
public static final String FAILED_TO_APPLY_SETTINGS = "FAILED_TO_APPLY_SETTINGS";
public static final String HIDE = "HIDE";
public static final String HIDE_RANGE_SELECTOR_UI = "HIDE_RANGE_SELECTOR_UI";
public static final String ID = "ID";
public static final String IMPORT = "IMPORT";
public static final String LABEL = "LABEL";
public static final String LABEL_NOT_SET = "LABEL_NOT_SET";
public static final String LEGEND_POSITION = "LEGEND_POSITION";
public static final String LEGEND_POSITION_X = "LEGEND_POSITION_X";
public static final String LEGEND_POSITION_Y = "LEGEND_POSITION_Y";
public static final String LINE = "LINE";
public static final String MAP_ALL_LISTED_SERIES = "MAP_ALL_LISTED_SERIES";
public static final String MAPPED_SERIES_SETTINGS = "MAPPED_SERIES_SETTINGS";
public static final String MAPPING_STATUS = "MAPPING_STATUS";
public static final String MAPPINGS = "MAPPINGS";
public static final String MAPPINGS_EXPORTED = "MAPPINGS_EXPORTED";
public static final String MAPPINGS_IMPORTED = "MAPPINGS_IMPORTED";
public static final String MAPPINGS_SAVED = "MAPPINGS_SAVED";
public static final String MOVE_LEGEND_DOWN = "MOVE_LEGEND_DOWN";
public static final String MOVE_LEGEND_LEFT = "MOVE_LEGEND_LEFT";
public static final String MOVE_LEGEND_RIGHT = "MOVE_LEGEND_RIGHT";
public static final String MOVE_LEGEND_UP = "MOVE_LEGEND_UP";
public static final String NEW_MAPPING_ADDED = "NEW_MAPPING_ADDED";
public static final String NONE = "NONE";
public static final String NOT_SET = "NOT_SET";
public static final String OPEN_SETTINGS_PAGE = "OPEN_SETTINGS_PAGE";
public static final String POSITION_USING_MOUSE = "POSITION_USING_MOUSE";
public static final String REALLY_DELETE_ALL_MAPPINGS = "REALLY_DELETE_ALL_MAPPINGS";
public static final String REALLY_DELETE_SELECTED_MAPPING = "REALLY_DELETE_SELECTED_MAPPING";
public static final String RESET = "RESET";
public static final String RESET_RANGE = "RESET_RANGE";
public static final String SAVE_MAPPINGS = "SAVE_MAPPINGS";
public static final String SCATTER = "SCATTER";
public static final String SELECTED_MAPPING_DELETED = "SELECTED_MAPPING_DELETED";
public static final String SERIES_POPUP_MENU = "SERIES_POPUP_MENU";
public static final String SET = "SET";
public static final String SET_CURRENT_SELECTION = "SET_CURRENT_SELECTION";
public static final String SET_LEGEND_POSITION = "SET_LEGEND_POSITION";
public static final String SETTINGS = "SETTINGS";
public static final String SORT_TABLE = "SORT_TABLE";
public static final String TOGGLE_VISIBILITY = "TOGGLE_VISIBILITY";
public static final String TOGGLE_VISIBILITY_OF_EMBEDDED_LEGEND = "TOGGLE_VISIBILITY_OF_EMBEDDED_LEGEND";
public static final String TRANSFER_MAPPINGS_OF_SELECTED_SERIES = "TRANSFER_MAPPINGS_OF_SELECTED_SERIES";
public static final String UNDETERMINED_SERIES_TYPE = "UNDETERMINED_SERIES_TYPE";
public static final String VISIBLE = "VISIBLE";
public static final String VISIBLE_IN_LEGEND = "VISIBLE_IN_LEGEND";
public static final String X_AXIS = "X_AXIS";
public static final String Y_AXIS = "Y_AXIS";

private Messages() {

Expand Down
17 changes: 8 additions & 9 deletions org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/linecharts/Messages.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 SWT Chart Project
* Copyright (c) 2020, 2023 SWT Chart Project
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -10,7 +10,6 @@
* Contributors:
* Frank Buloup - initial API and implementation
*******************************************************************************/

package org.eclipse.swtchart.extensions.linecharts;

import java.util.MissingResourceException;
Expand All @@ -20,13 +19,13 @@ public class Messages {

private static final String BUNDLE_NAME = "org.eclipse.swtchart.extensions.linecharts.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);

public static String AUTO = "AUTO";
public static String EXTREME = "EXTREME";
public static String HIGH = "HIGH";
public static String LOW = "LOW";
public static String MEDIUM = "MEDIUM";
public static String NONE = "NONE";
//
public static final String AUTO = "AUTO";
public static final String EXTREME = "EXTREME";
public static final String HIGH = "HIGH";
public static final String LOW = "LOW";
public static final String MEDIUM = "MEDIUM";
public static final String NONE = "NONE";

private Messages() {

Expand Down
24 changes: 12 additions & 12 deletions org.eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/menu/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.swtchart.extensions.menu.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
//
public static String EXPORT_CHART_SELECTION = "EXPORT_CHART_SELECTION";
public static String RANGE_SELECTION = "RANGE_SELECTION";
public static String REDO_SELECTION = "REDO_SELECTION";
public static String RESET_CHART = "RESET_CHART";
public static String RESET_SELECTED_SERIES = "RESET_SELECTED_SERIES";
public static String TOGGLE_VISIBILITY = "TOGGLE_VISIBILITY";
public static String UNDO_SELECTION = "UNDO_SELECTION";
public static String RESET_X_AXIS = "RESET_X_AXIS";
public static String RESET_Y_AXIS = "RESET_Y_AXIS";
public static String SET_CHART_RANGE = "SET_CHART_RANGE";
public static String ZOOM_IN = "ZOOM_IN";
public static String ZOOM_OUT = "ZOOM_OUT";
public static final String EXPORT_CHART_SELECTION = "EXPORT_CHART_SELECTION";
public static final String RANGE_SELECTION = "RANGE_SELECTION";
public static final String REDO_SELECTION = "REDO_SELECTION";
public static final String RESET_CHART = "RESET_CHART";
public static final String RESET_SELECTED_SERIES = "RESET_SELECTED_SERIES";
public static final String TOGGLE_VISIBILITY = "TOGGLE_VISIBILITY";
public static final String UNDO_SELECTION = "UNDO_SELECTION";
public static final String RESET_X_AXIS = "RESET_X_AXIS";
public static final String RESET_Y_AXIS = "RESET_Y_AXIS";
public static final String SET_CHART_RANGE = "SET_CHART_RANGE";
public static final String ZOOM_IN = "ZOOM_IN";
public static final String ZOOM_OUT = "ZOOM_OUT";

private Messages() {

Expand Down
4 changes: 2 additions & 2 deletions ...wtchart.extensions/src/org/eclipse/swtchart/extensions/menu/legend/MapSettingsAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ public void menuAboutToShow(IMenuManager menuManager) {
@Override
public String getText() {

return addMapping ? Messages.getString(Messages.addSeriesMapping) : Messages.getString(Messages.removeSeriesMapping);
return addMapping ? Messages.getString(Messages.ADD_SERIES_MAPPING) : Messages.getString(Messages.REMOVE_SERIES_MAPPING);
}

@Override
public String getToolTipText() {

return Messages.getString(Messages.addRemoveSeriesMapping);
return Messages.getString(Messages.ADD_REMOVE_SERIES_MAPPING);
}

@Override
Expand Down
38 changes: 19 additions & 19 deletions ...eclipse.swtchart.extensions/src/org/eclipse/swtchart/extensions/menu/legend/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ public class Messages {
private static final String BUNDLE_NAME = "org.eclipse.swtchart.extensions.menu.legend.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
//
public static String addSeriesMapping = "addSeriesMapping";
public static String removeSeriesMapping = "removeSeriesMapping";
public static String addRemoveSeriesMapping = "addRemoveSeriesMapping";
public static String adjustColorOfSelectedSeries = "adjustColorOfSelectedSeries";
public static String description = "description";
public static String descriptionMustNotBeEmpty = "descriptionMustNotBeEmpty";
public static String forgotToSetDescription = "forgotToSetDescription";
public static String hideSelectedSeries = "hideSelectedSeries";
public static String hideSelectedSeriesInLegend = "hideSelectedSeriesInLegend";
public static String hideSeries = "hideSeries";
public static String hideSeriesInLegend = "hideSeriesInLegend";
public static String setColor = "setColor";
public static String setDescription = "setDescription";
public static String setDescriptionForSelectedSeries = "setDescriptionForSelectedSeries";
public static String setSeriesColor = "setSeriesColor";
public static String showSelectedSeries = "showSelectedSeries";
public static String showSelectedSeriesInLegend = "showSelectedSeriesInLegend";
public static String showSeries = "showSeries";
public static String showSeriesInLegend = "showSeriesInLegend";
public static final String ADD_SERIES_MAPPING = "ADD_SERIES_MAPPING";
public static final String REMOVE_SERIES_MAPPING = "REMOVE_SERIES_MAPPING";
public static final String ADD_REMOVE_SERIES_MAPPING = "ADD_REMOVE_SERIES_MAPPING";
public static final String ADJUST_COLOR_OF_SELECTED_SERIES = "ADJUST_COLOR_OF_SELECTED_SERIES";
public static final String DESCRIPTION = "DESCRIPTION";
public static final String DESCRIPTION_MUST_NOT_BE_EMPTY = "DESCRIPTION_MUST_NOT_BE_EMPTY";
public static final String FORGOT_TO_SET_DESCRIPTION = "FORGOT_TO_SET_DESCRIPTION";
public static final String HIDE_SELECTED_SERIES = "HIDE_SELECTED_SERIES";
public static final String HIDE_SELECTED_SERIES_IN_LEGEND = "HIDE_SELECTED_SERIES_IN_LEGEND";
public static final String HIDE_SERIES = "HIDE_SERIES";
public static final String HIDE_SERIES_IN_LEGEND = "HIDE_SERIES_IN_LEGEND";
public static final String SET_COLOR = "SET_COLOR";
public static final String SET_DESCRIPTION = "SET_DESCRIPTION";
public static final String SET_DESCRIPTION_FOR_SELECTED_SERIES = "setDescriptionForSelectedSeries";
public static final String SET_SERIES_COLOR = "setSeriesColor";
public static final String SHOW_SELECTED_SERIES = "showSelectedSeries";
public static final String SHOW_SELECTED_SERIES_IN_LEGEND = "showSelectedSeriesInLegend";
public static final String SHOW_SERIES = "SHOW_SERIES";
public static final String SHOW_SERIES_IN_LEGEND = "SHOW_SERIES_IN_LEGEND";

private Messages() {

Expand Down
8 changes: 4 additions & 4 deletions ...rt.extensions/src/org/eclipse/swtchart/extensions/menu/legend/SeriesVisibilityAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ public void menuAboutToShow(IMenuManager menuManager) {
public String getText() {

return setVisible //
? (inLegend ? Messages.getString(Messages.showSeriesInLegend) : Messages.getString(Messages.showSeries)) //
: (inLegend ? Messages.getString(Messages.hideSeriesInLegend) : Messages.getString(Messages.hideSeries));
? (inLegend ? Messages.getString(Messages.SHOW_SERIES_IN_LEGEND) : Messages.getString(Messages.SHOW_SERIES)) //
: (inLegend ? Messages.getString(Messages.HIDE_SERIES_IN_LEGEND) : Messages.getString(Messages.HIDE_SERIES));
}

@Override
public String getToolTipText() {

return setVisible //
? (inLegend ? Messages.getString(Messages.showSelectedSeriesInLegend) : Messages.getString(Messages.showSelectedSeries)) //
: (inLegend ? Messages.getString(Messages.hideSelectedSeriesInLegend) : Messages.getString(Messages.hideSelectedSeries));
? (inLegend ? Messages.getString(Messages.SHOW_SELECTED_SERIES_IN_LEGEND) : Messages.getString(Messages.SHOW_SELECTED_SERIES)) //
: (inLegend ? Messages.getString(Messages.HIDE_SELECTED_SERIES_IN_LEGEND) : Messages.getString(Messages.HIDE_SELECTED_SERIES));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...e.swtchart.extensions/src/org/eclipse/swtchart/extensions/menu/legend/SetColorAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ public void menuAboutToShow(IMenuManager menuManager) {
@Override
public String getText() {

return Messages.getString(Messages.setColor);
return Messages.getString(Messages.SET_COLOR);
}

@Override
public String getToolTipText() {

return Messages.getString(Messages.adjustColorOfSelectedSeries);
return Messages.getString(Messages.ADJUST_COLOR_OF_SELECTED_SERIES);
}

@Override
Expand All @@ -61,7 +61,7 @@ public void run() {
//
if(!selectedSeries.isEmpty()) {
ColorDialog colorDialog = new ColorDialog(table.getShell());
colorDialog.setText(Messages.getString(Messages.setSeriesColor));
colorDialog.setText(Messages.getString(Messages.SET_SERIES_COLOR));
RGB rgbNew = colorDialog.open();
if(rgbNew != null) {
for(ISeries<?> series : selectedSeries) {
Expand Down
Loading

0 comments on commit 4489587

Please sign in to comment.