From: darolmar Date: Fri, 19 Sep 2014 06:03:57 +0000 (+0200) Subject: JAL-1355 X-Git-Tag: Release_2_8_2b1^2~50^2~8 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=58afea88095280d807e5c2ac8b9155de5ba3503c;p=jalview.git JAL-1355 --- diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index 6736791..3827c7d 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -128,11 +128,10 @@ action.deselect_all = Deselect all action.invert_selection = Invert selection action.using_jmol = Using Jmol action.link = Link -action.group_link = Group Links +action.group_link = Group Link action.show_chain = Show Chain action.show_group = Show Group action.fetch_db_references = Fetch DB References -action.edit = Edit action.view_flanking_regions = Show flanking regions label.view_flanking_regions = Show sequence data either side of the subsequences involved in this alignment label.str = Str: @@ -728,13 +727,61 @@ label.invalid_font = Invalid Font label.separate_multiple_accession_ids = Separate multiple accession ids with semi colon ";" label.replace_commas_semicolons = Replace commas with semi-colons label.parsing_failed_syntax_errors_shown_below_param = Parsing failed. Syntax errors shown below {0} -label.parsing_failed_unrecoverable_exception_thrown_param = \nParsing failed. An unrecoverable exception was thrown:\n {0} +label.parsing_failed_unrecoverable_exception_thrown_param = \nParsing failed. An unrecoverable exception was thrown\:\n {0} label.example_query_param = Example query: {0} label.enter_value_increase_conservation_visibility = Enter value to increase conservation visibility label.enter_percentage_identity_above_which_colour_residues = Enter % identity above which to colour residues -label.wswublast_client_credits = To display sequence features an exact Uniprot id with 100% sequence identity match must be entered.\nIn order to display these features, try changing the names of your sequences to the ids suggested below.\n\nRunning WSWUBlast at EBI.\nPlease quote Pillai S., Silventoinen V., Kallio K., Senger M., Sobhany S., Tate J., Velankar S., Golovin A., Henrick K., Rice P., Stoehr P., Lopez R.\nSOAP-based services provided by the European Bioinformatics Institute.\nNucleic Acids Res. 33(1):W25-W28 (2005)); +label.wswublast_client_credits = To display sequence features an exact Uniprot id with 100% sequence identity match must be entered.\nIn order to display these features, try changing the names of your sequences to the ids suggested below.\n\nRunning WSWUBlast at EBI.\nPlease quote Pillai S., Silventoinen V., Kallio K., Senger M., Sobhany S., Tate J., Velankar S., Golovin A., Henrick K., Rice P., Stoehr P., Lopez R.\nSOAP-based services provided by the European Bioinformatics Institute.\nNucleic Acids Res. 33(1)\:W25-W28 (2005)); label.blasting_for_unidentified_sequence = BLASTing for unidentified sequences label.select_columns_containing = Select columns containing label.select_columns_not_containing = Select columns that do not contain option.trim_retrieved_seqs = Trim retrieved sequences label.trim_retrieved_sequences = When the reference sequence is longer than the sequence that you are working with, only keep the relevant subsequences. +label.use_sequence_id_1 = Use $SEQUENCE_ID$ or $SEQUENCE_ID=//=$ +label.use_sequence_id_2 = \nto embed sequence id in URL +label.ws_parameters_for = Parameters for {0} +label.switch_server = Switch server +label.open_jabaws_web_page = Opens the JABAWS server's homepage in web browser +label.choose_jabaws_server = Choose a server for running this service +label.services_at = Services at {0} +label.rest_client_submit = {0} using {1} +label.fetch_retrieve_from =Retrieve from {0} +label.fetch_retrieve_from_all_sources = Retrieve from all {0} sources in {1}
First is :{2} +label.feature_settings_click_drag = Click/drag feature types up or down to change render order.
Double click to select columns containing feature in alignment/current selection
Pressing Alt will select columns outside features rather than inside
Pressing Shift to modify current selection (rather than clear current selection)
Press CTRL or Command/Meta to toggle columns in/outside features
+label.opt_and_params_further_details = see further details by right-clicking +label.opt_and_params_show_brief_desc_image_link = Click to show brief description
Right click for further information. +label.opt_and_params_show_brief_desc = Click to show brief description
+label.adjusts_width_generated_eps_png = Adjusts the width of the generated EPS or PNG file to ensure even the longest sequence ID or annotation label is displayed +label.manually_specify_width_left_column = Manually specify the width of the left hand column where sequence IDs and annotation labels will be rendered in exported alignment figures. This setting will be ignored if 'Automatically set ID width' is set +label.job_created_when_checked = When checked, a job is created for every sequence in the current selection. +label.when_checked_job_visible_region_and_results = When checked, a single job is created for the visible region and results mapped back onto their location in the alignment. Otherwise, a job would be created for every contiguous region visible in the alignment or current selection (e.g. a multiple alignment). +label.flat_file_representation = Flat file representation of this rest service using the Really Simple Bioinformatics Service formalism +label.result_of_parsing_rsbs = Results of parsing the RSBS representation +label.user_preset = User Preset +label.service_preset = Service Preset +label.run_with_preset = Run {0} with preset +label.view_service_doc_url = View {1} +label.submit_sequence = Submit {0} {1} {2} {3} to
{4} +action.by_title_param = by {0} +label.alignment = Alignment +label.secondary_structure_prediction = Secondary Structure Prediction +label.sequence_database_search = Sequence Database Search +label.analysis = Analysis +label.protein_disorder = Protein Disorder +label.source_from_db_source = Sources from {0} +label.from_msname = from '{0}' +label.superpose_with = Superpose with ... +action.do = Do +label.scale_label_to_column = Scale Label to Column +label.add_new_row = Add New Row +label.edit_label_description = Edit Label/Description +label.hide_row = Hide This Row +label.delete_row = Delete This Row +label.show_all_hidden_rows = Show All Hidden Rows +label.export_annotation = Export Annotation +label.copy_consensus_sequence = Copy Consensus Sequence +label.helix = Helix +label.sheet = Sheet +label.rna_helix = RNA Helix +label.remove_annotation = Remove Annotation +label.colour_by = Colour by... diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 58c7703..64fed16 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -836,34 +836,34 @@ public class APopupMenu extends java.awt.PopupMenu implements colourMenu.add(abovePIDColour); colourMenu.add(conservationMenuItem); - noColourmenuItem.setLabel("None"); + noColourmenuItem.setLabel(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(this); - clustalColour.setLabel("Clustalx colours"); + clustalColour.setLabel(MessageManager.getString("label.clustalx_colours")); clustalColour.addActionListener(this); - zappoColour.setLabel("Zappo"); + zappoColour.setLabel(MessageManager.getString("label.zappo")); zappoColour.addActionListener(this); - taylorColour.setLabel("Taylor"); + taylorColour.setLabel(MessageManager.getString("label.taylor")); taylorColour.addActionListener(this); - hydrophobicityColour.setLabel("Hydrophobicity"); + hydrophobicityColour.setLabel(MessageManager.getString("label.hydrophobicity")); hydrophobicityColour.addActionListener(this); - helixColour.setLabel("Helix propensity"); + helixColour.setLabel(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(this); - strandColour.setLabel("Strand propensity"); + strandColour.setLabel(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(this); - turnColour.setLabel("Turn propensity"); + turnColour.setLabel(MessageManager.getString("label.turn_propensity")); turnColour.addActionListener(this); - buriedColour.setLabel("Buried Index"); + buriedColour.setLabel(MessageManager.getString("label.buried_index")); buriedColour.addActionListener(this); - abovePIDColour.setLabel("Above % Identity"); + abovePIDColour.setLabel(MessageManager.getString("label.above_identity_percentage")); - userDefinedColour.setLabel("User Defined"); + userDefinedColour.setLabel(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(this); - PIDColour.setLabel("Percentage Identity"); + PIDColour.setLabel(MessageManager.getString("action.percentage_identity")); PIDColour.addActionListener(this); BLOSUM62Colour.setLabel("BLOSUM62"); BLOSUM62Colour.addActionListener(this); - conservationMenuItem.setLabel("Conservation"); + conservationMenuItem.setLabel(MessageManager.getString("label.conservation")); editMenu.add(copy); copy.addActionListener(this); diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index e6b7af4..0a686d2 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -3888,7 +3888,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, public void addSortByOrderMenuItem(String title, final AlignmentOrder order) { - final JMenuItem item = new JMenuItem("by " + title); + final JMenuItem item = new JMenuItem(MessageManager.formatMessage("action.by_title_param", new String[]{title})); sort.add(item); item.addActionListener(new java.awt.event.ActionListener() { @@ -4331,12 +4331,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, // object broker mechanism. final Vector wsmenu = new Vector(); final IProgressIndicator af = me; - final JMenu msawsmenu = new JMenu("Alignment"); - final JMenu secstrmenu = new JMenu( - "Secondary Structure Prediction"); - final JMenu seqsrchmenu = new JMenu("Sequence Database Search"); - final JMenu analymenu = new JMenu("Analysis"); - final JMenu dismenu = new JMenu("Protein Disorder"); + final JMenu msawsmenu = new JMenu(MessageManager.getString("label.alignment")); + final JMenu secstrmenu = new JMenu(MessageManager.getString("label.secondary_structure_prediction")); + final JMenu seqsrchmenu = new JMenu(MessageManager.getString("label.sequence_database_search")); + final JMenu analymenu = new JMenu(MessageManager.getString("label.analysis")); + final JMenu dismenu = new JMenu(MessageManager.getString("label.protein_disorder")); // JAL-940 - only show secondary structure prediction services from // the legacy server if (// Cache.getDefault("SHOW_JWS1_SERVICES", true) @@ -5417,8 +5416,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, }); fetchr.setToolTipText("" - + JvSwingUtils.wrapTooltip("Retrieve from " - + src.getDbName()) + ""); + + JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.fetch_retrieve_from", new String[]{src.getDbName()}))); dfetch.add(fetchr); comp++; } @@ -5452,14 +5450,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, }); fetchr.setToolTipText("" - + JvSwingUtils.wrapTooltip("Retrieve from all " - + otherdb.size() + " sources in " - + src.getDbSource() + "
First is :" - + src.getDbName()) + ""); + + JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.fetch_retrieve_from_all_sources", new String[]{Integer.valueOf(otherdb.size()).toString(), src.getDbSource(), src.getDbName()}))); dfetch.add(fetchr); comp++; // and then build the rest of the individual menus - ifetch = new JMenu("Sources from " + src.getDbSource()); + ifetch = new JMenu(MessageManager.formatMessage("label.source_from_db_source", new String[]{src.getDbSource()})); icomp = 0; String imname = null; int i = 0; @@ -5472,7 +5467,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, 0, 10) + "..." : dbname; if (imname == null) { - imname = "from '" + sname + "'"; + imname = MessageManager.formatMessage("label.from_msname", new String[]{sname}); } fetchr = new JMenuItem(msname); final DbSourceProxy[] dassrc = @@ -5499,8 +5494,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, }); fetchr.setToolTipText("" - + JvSwingUtils.wrapTooltip("Retrieve from " - + dbname) + ""); + + MessageManager.formatMessage("label.fetch_retrieve_from", new String[]{dbname})); ifetch.add(fetchr); ++i; if (++icomp >= mcomp || i == (otherdb.size())) diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index b553f56..ec7b46e 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -43,21 +43,21 @@ import jalview.util.MessageManager; public class AnnotationLabels extends JPanel implements MouseListener, MouseMotionListener, ActionListener { - static String TOGGLE_LABELSCALE = "Scale Label to Column"; + String TOGGLE_LABELSCALE = MessageManager.getString("label.scale_label_to_column"); - static String ADDNEW = "Add New Row"; + String ADDNEW = MessageManager.getString("label.add_new_row"); - static String EDITNAME = "Edit Label/Description"; + String EDITNAME = MessageManager.getString("label.edit_label_description"); - static String HIDE = "Hide This Row"; + String HIDE = MessageManager.getString("label.hide_row"); - static String DELETE = "Delete This Row"; + String DELETE = MessageManager.getString("label.delete_row"); - static String SHOWALL = "Show All Hidden Rows"; + String SHOWALL = MessageManager.getString("label.show_all_hidden_rows"); - static String OUTPUT_TEXT = "Export Annotation"; + String OUTPUT_TEXT = MessageManager.getString("label.export_annotation"); - static String COPYCONS_SEQ = "Copy Consensus Sequence"; + String COPYCONS_SEQ = MessageManager.getString("label.copy_consensus_sequence"); boolean resizePanel = false; diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 73be63e..4036347 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -42,20 +42,20 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, MouseListener, MouseWheelListener, MouseMotionListener, ActionListener, AdjustmentListener, Scrollable { - final String HELIX = "Helix"; + String HELIX = MessageManager.getString("label.helix"); - final String SHEET = "Sheet"; + String SHEET = MessageManager.getString("label.sheet"); /** * For RNA secondary structure "stems" aka helices */ - final String STEM = "RNA Helix"; + String STEM = MessageManager.getString("label.rna_helix"); - final String LABEL = "Label"; + String LABEL = MessageManager.getString("label.label"); - final String REMOVE = "Remove Annotation"; + String REMOVE = MessageManager.getString("label.remove_annotation"); - final String COLOUR = "Colour"; + String COLOUR = MessageManager.getString("action.colour"); public final Color HELIX_COLOUR = Color.red.darker(); diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index bcdc2de..bab8a2d 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -177,7 +177,7 @@ public class AppJmol extends GStructureViewer implements Runnable, _alignwith = new Vector(); } - seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith, + seqColourBy = new ViewSelectionMenu(MessageManager.getString("label.colour_by"), this, _colourwith, new ItemListener() { @@ -197,7 +197,7 @@ public class AppJmol extends GStructureViewer implements Runnable, }); viewMenu.add(seqColourBy); final ItemListener handler; - JMenu alpanels = new ViewSelectionMenu("Superpose with ..", this, + JMenu alpanels = new ViewSelectionMenu(MessageManager.getString("label.superpose_with"), this, _alignwith, handler = new ItemListener() { diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index 10082eb..cf04ae8 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -154,7 +154,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable, _alignwith = new Vector(); } - seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith, + seqColourBy = new ViewSelectionMenu(MessageManager.getString("label.colour_by"), this, _colourwith, new ItemListener() { @@ -174,7 +174,7 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable, }); viewMenu.add(seqColourBy); final ItemListener handler; - JMenu alpanels = new ViewSelectionMenu("Superpose with ..", this, + JMenu alpanels = new ViewSelectionMenu(MessageManager.getString("label.superpose_with"), this, _alignwith, handler = new ItemListener() { diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 3dae4e5..08c4ef2 100644 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -141,10 +141,8 @@ public class FeatureSettings extends JPanel } } }); - table.setToolTipText("" - + JvSwingUtils - .wrapTooltip("Click/drag feature types up or down to change render order.
Double click to select columns containing feature in alignment/current selection
Pressing Alt will select columns outside features rather than inside
Pressing Shift to modify current selection (rather than clear current selection)
Press CTRL or Command/Meta to toggle columns in/outside features
") - + ""); + table.setToolTipText(JvSwingUtils + .wrapTooltip(MessageManager.getString("label.feature_settings_click_drag"))); scrollPane.setViewportView(table); dassourceBrowser = new DasSourceBrowser(this); diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java index 847c26a..b3ef1ed 100644 --- a/src/jalview/gui/OptsAndParamsPage.java +++ b/src/jalview/gui/OptsAndParamsPage.java @@ -113,7 +113,7 @@ public class OptsAndParamsPage enabled.setToolTipText("" + JvSwingUtils - .wrapTooltip(((desc == null || desc.trim().length() == 0) ? "see further details by right-clicking" + .wrapTooltip(((desc == null || desc.trim().length() == 0) ? MessageManager.getString("label.opt_and_params_further_details ") : desc) + "
") + ""); @@ -391,20 +391,12 @@ public class OptsAndParamsPage // Only create description boxes if there actually is a description. if (finfo != null) { - showDesc.setToolTipText("" - + JvSwingUtils - .wrapTooltip("Click to show brief description
Right click for further information.") - + ""); + showDesc.setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.opt_and_params_show_brief_desc_image_link", new String[]{linkImageURL.toExternalForm()}))); showDesc.addMouseListener(this); } else { - showDesc.setToolTipText("" - + JvSwingUtils - .wrapTooltip("Click to show brief description.") - + ""); + showDesc.setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.opt_and_params_show_brief_desc"))); } showDesc.addActionListener(new ActionListener() { diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index 0c9937d..b09d7a5 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -1091,8 +1091,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } WsJobParameters pgui = new WsJobParameters(lastserv, new JabaPreset(lastserv, pr)); - JFrame jf = new JFrame("Parameters for " - + lastserv.getActionText()); + JFrame jf = new JFrame(MessageManager.formatMessage("label.ws_parameters_for", new String[]{lastserv.getActionText()})); JPanel cont = new JPanel(new BorderLayout()); pgui.validate(); cont.setPreferredSize(pgui.getPreferredSize()); diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 86fe535..eb0e1c7 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -677,10 +677,7 @@ public class GPreferences extends JPanel autoIdWidth.setText(MessageManager .getString("label.automatically_set_id_width")); autoIdWidth - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Adjusts the width of the generated EPS or PNG file to ensure even the longest sequence ID or annotation label is displayed") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.adjusts_width_generated_eps_png"))); autoIdWidth.setBounds(new Rectangle(228, 96, 188, 23)); autoIdWidth.addActionListener(new ActionListener() { @@ -695,15 +692,9 @@ public class GPreferences extends JPanel userIdWidthlabel.setText(MessageManager .getString("label.figure_id_column_width")); userIdWidth - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Manually specify the width of the left hand column where sequence IDs and annotation labels will be rendered in exported alignment figures. This setting will be ignored if 'Automatically set ID width' is set") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.manually_specify_width_left_column"))); userIdWidthlabel - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Manually specify the width of the left hand column where sequence IDs and annotation labels will be rendered in exported alignment figures. This setting will be ignored if 'Automatically set ID width' is set") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.manually_specify_width_left_column"))); userIdWidthlabel.setBounds(new Rectangle(236, 120, 168, 23)); userIdWidth.setFont(JvSwingUtils.getTextAreaFont()); userIdWidth.setText(""); diff --git a/src/jalview/jbgui/GRestServiceEditorPane.java b/src/jalview/jbgui/GRestServiceEditorPane.java index 259824a..5486aac 100644 --- a/src/jalview/jbgui/GRestServiceEditorPane.java +++ b/src/jalview/jbgui/GRestServiceEditorPane.java @@ -147,10 +147,8 @@ public class GRestServiceEditorPane extends JPanel // cpanel.setLayout(new FlowLayout()); hSeparable = new JCheckBox(MessageManager.getString("label.per_seq")); hSeparable - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("When checked, a job is created for every sequence in the current selection.") - + ""); + .setToolTipText(JvSwingUtils + .wrapTooltip(MessageManager.getString("label.job_created_when_checked"))); hSeparable.addActionListener(new ActionListener() { @@ -164,13 +162,7 @@ public class GRestServiceEditorPane extends JPanel vSeparable = new JCheckBox( MessageManager.getString("label.result_vertically_separable")); vSeparable - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("When checked, a single job is created for the visible region and results" - + " mapped back onto their location in the alignment. Otherwise, a job would be" - + " created for every contiguous region visible in the alignment or current" - + " selection (e.g. a multiple alignment).") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.when_checked_job_visible_region_and_results"))); vSeparable.addActionListener(new ActionListener() { @@ -401,9 +393,7 @@ public class GRestServiceEditorPane extends JPanel urldescPane.add(urldescVp, "span"); paste.add(urldescPane, "span"); urldescPane - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Flat file representation of this rest service using the Really Simple Bioinformatics Service formalism")); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.flat_file_representation"))); parseRes = new JTextArea(); parseResVp = new JScrollPane(); @@ -415,10 +405,7 @@ public class GRestServiceEditorPane extends JPanel parseWarnings.setBorder(new TitledBorder(MessageManager .getString("label.parsing_errors"))); parseWarnings - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Results of parsing the RSBS representation") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.getString("label.result_of_parsing_rsbs"))); parseWarnings.add(parseResVp, "center"); parseRes.setEditable(false); paste.add(parseWarnings, "span"); diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index 85088ce..ca0f5ee 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -72,10 +72,10 @@ public class GSequenceLink extends Panel jLabel2.setText(MessageManager.getString("label.url")); jLabel2.setBounds(new Rectangle(17, 37, 54, 27)); jLabel3.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); - jLabel3.setText("Use $SEQUENCE_ID$ or $SEQUENCE_ID=//=$"); + jLabel3.setText(MessageManager.getString("label.use_sequence_id_1")); jLabel3.setBounds(new Rectangle(21, 72, 351, 15)); jLabel4.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); - jLabel4.setText("\nto embed sequence id in URL"); + jLabel4.setText(MessageManager.getString("label.use_sequence_id_2")); jLabel4.setBounds(new Rectangle(21, 93, 351, 15)); jPanel1.setBorder(BorderFactory.createEtchedBorder()); jPanel1.setLayout(null); diff --git a/src/jalview/ws/EnfinEnvision2OneWay.java b/src/jalview/ws/EnfinEnvision2OneWay.java index c048f45..d2e55c4 100644 --- a/src/jalview/ws/EnfinEnvision2OneWay.java +++ b/src/jalview/ws/EnfinEnvision2OneWay.java @@ -28,6 +28,7 @@ import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.JvSwingUtils; import jalview.util.GroupUrlLink; +import jalview.util.MessageManager; import jalview.util.GroupUrlLink.UrlStringTooLongException; import java.awt.Component; @@ -334,12 +335,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements { dbname = ""; } - item.setToolTipText("" - + JvSwingUtils.wrapTooltip("Submit " + i + " " + dbname + " " - + (seqsorids ? "sequence" : "sequence id") - + (i > 1 ? "s" : "") - - + " to
" + descr) + ""); + item.setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.submit_sequence", new String[]{Integer.valueOf(i).toString(), dbname, (seqsorids ? "sequence" : "sequence id"), (i > 1 ? "s" : "")}))); item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -441,7 +437,7 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements // menu appears asap // sequence only URLs // ID/regex match URLs - JMenu groupLinksMenu = new JMenu("Group Link"); + JMenu groupLinksMenu = new JMenu(MessageManager.getString("action.group_link")); String[][] idandseqs = GroupUrlLink.formStrings(seqs); Hashtable commonDbrefs = new Hashtable(); for (int sq = 0; sq < seqs.length; sq++) @@ -540,8 +536,8 @@ public class EnfinEnvision2OneWay extends DefaultHandler implements // three types of url that might be // created. wflinkMenus = new JMenu[] - { null, new JMenu("IDS"), new JMenu("Sequences"), - new JMenu("IDS and Sequences") }; + { null, new JMenu(MessageManager.getString("action.ids")), new JMenu(MessageManager.getString("action.sequences")), + new JMenu(MessageManager.getString("action.ids_sequences")) }; gurlMenus.put(label, wflinkMenus); } diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java index 144a860..69818a9 100644 --- a/src/jalview/ws/jws2/Jws2Discoverer.java +++ b/src/jalview/ws/jws2/Jws2Discoverer.java @@ -24,6 +24,7 @@ import jalview.bin.Cache; import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import jalview.ws.WSMenuEntryProviderI; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.ParamDatastoreI; @@ -387,14 +388,14 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } }); hitm.setToolTipText(JvSwingUtils - .wrapTooltip("Opens the JABAWS server's homepage in web browser")); + .wrapTooltip(MessageManager.getString("label.open_jabaws_web_page "))); service.attachWSMenuEntry(atpoint, alignFrame); if (alternates.containsKey(service.serviceType)) { - atpoint.add(hitm = new JMenu("Switch server")); + atpoint.add(hitm = new JMenu(MessageManager.getString("label.switch_server"))); hitm.setToolTipText(JvSwingUtils - .wrapTooltip("Choose a server for running this service")); + .wrapTooltip(MessageManager.getString("label.choose_jabaws_server"))); for (final Jws2Instance sv : alternates.get(service.serviceType)) { JMenuItem itm; @@ -483,7 +484,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI atpoint = JvSwingUtils.findOrCreateMenu(atpoint, host); if (atpoint.getToolTipText() == null) { - atpoint.setToolTipText("Services at " + host); + atpoint.setToolTipText(MessageManager.formatMessage("label.services_at", new String[]{host})); } } if (bytype) @@ -528,7 +529,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI } }); hitm.setToolTipText(JvSwingUtils - .wrapTooltip("Opens the JABAWS server's homepage in web browser")); + .wrapTooltip(MessageManager.getString("label.open_jabaws_web_page"))); lasthostFor.put(service.action, host); } hostLabels.add(host + service.serviceType diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java index 285dcc0..d1c0a32 100644 --- a/src/jalview/ws/jws2/MsaWSClient.java +++ b/src/jalview/ws/jws2/MsaWSClient.java @@ -281,8 +281,8 @@ public class MsaWSClient extends Jws2Client final JMenuItem methodR = new JMenuItem(preset.getName()); methodR.setToolTipText("

" + JvSwingUtils.wrapTooltip("" - + (preset.isModifiable() ? "User Preset" - : "Service Preset") + "
" + + (preset.isModifiable() ? MessageManager.getString("label.user_preset") + : MessageManager.getString("label.service_preset")) + "
" + preset.getDescription() + "

") + ""); methodR.addActionListener(new ActionListener() { diff --git a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java index 13568ea..77a7a67 100644 --- a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java +++ b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java @@ -209,15 +209,15 @@ public class SequenceAnnotationWSClient extends Jws2Client List presets = service.getParamStore().getPresets(); if (presets != null && presets.size() > 0) { - JMenu presetlist = new JMenu("Run " + calcName + "with preset"); + JMenu presetlist = new JMenu(MessageManager.formatMessage("label.run_with_preset", new String[]{calcName})); for (final WsParamSetI preset : presets) { final JMenuItem methodR = new JMenuItem(preset.getName()); methodR.setToolTipText("

" + JvSwingUtils.wrapTooltip("" - + (preset.isModifiable() ? "User Preset" - : "Service Preset") + "
" + + (preset.isModifiable() ? MessageManager.getString("label.user_preset") + : MessageManager.getString("label.service_preset")) + "
" + preset.getDescription() + "

") + ""); methodR.addActionListener(new ActionListener() { @@ -249,10 +249,7 @@ public class SequenceAnnotationWSClient extends Jws2Client Desktop.instance.showUrl(service.docUrl); } }); - annotservice.setToolTipText("" - + JvSwingUtils.wrapTooltip("View " + service.docUrl + "") - + ""); + annotservice.setToolTipText(JvSwingUtils.wrapTooltip(MessageManager.formatMessage("label.view_service_doc_url", new String[]{service.docUrl,service.docUrl}))); wsmenu.add(annotservice); } } diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java index 5f827a9..470c96f 100644 --- a/src/jalview/ws/rest/RestClient.java +++ b/src/jalview/ws/rest/RestClient.java @@ -39,6 +39,7 @@ import jalview.gui.AlignmentPanel; import jalview.gui.Desktop; import jalview.gui.WebserviceInfo; import jalview.io.packed.DataProvider.JvDataType; +import jalview.util.MessageManager; import jalview.ws.WSClient; import jalview.ws.WSClientI; import jalview.ws.WSMenuEntryProviderI; @@ -140,8 +141,7 @@ public class RestClient extends WSClient implements WSClientI, final AlignFrame alignFrame) { JMenuItem submit = new JMenuItem(service.details.Name); - submit.setToolTipText(service.details.Action + " using " - + service.details.Name); + submit.setToolTipText(MessageManager.formatMessage("label.rest_client_submit", new String[]{service.details.Action,service.details.Name})); submit.addActionListener(new ActionListener() { diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java index 64edf44..1e72fae 100644 --- a/test/jalview/ws/gui/Jws2ParamView.java +++ b/test/jalview/ws/gui/Jws2ParamView.java @@ -22,6 +22,7 @@ package jalview.ws.gui; import static org.junit.Assert.*; import jalview.gui.WsJobParameters; +import jalview.util.MessageManager; import jalview.ws.jabaws.JalviewJabawsTestUtils; import jalview.ws.jws2.JabaPreset; import jalview.ws.jws2.Jws2Discoverer; @@ -205,8 +206,7 @@ public class Jws2ParamView } WsJobParameters pgui = new WsJobParameters(lastserv, new JabaPreset(lastserv, pr)); - JFrame jf = new JFrame("Parameters for " - + lastserv.getActionText()); + JFrame jf = new JFrame(MessageManager.formatMessage("label.ws_parameters_for", new String[]{lastserv.getActionText()})); JPanel cont = new JPanel(new BorderLayout()); pgui.validate(); cont.setPreferredSize(pgui.getPreferredSize());