From: Jim Procter Date: Mon, 3 Feb 2014 17:46:31 +0000 (+0000) Subject: Merge branch 'Release_2_8_1_Branch_i18n' into try_r20b1_merge X-Git-Tag: Jalview_2_9~204^2~4^2 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=cb5d856b1304448cae13a333cbd9017f81520d90;hp=614dd230a4b09099ab125bd97d14b0a9b59f0337 Merge branch 'Release_2_8_1_Branch_i18n' into try_r20b1_merge Conflicts: src/jalview/gui/AlignFrame.java src/jalview/gui/AppJmol.java src/jalview/gui/PopupMenu.java src/jalview/gui/UserDefinedColours.java JAL-1354 merge in with some exceptions for non i18n bare strings and fix compilation errors from missing import of MessageManager --- diff --git a/doc/i18n.html b/doc/i18n.html index d2a7420..0be5673 100644 --- a/doc/i18n.html +++ b/doc/i18n.html @@ -36,6 +36,35 @@

To use it within your code, you only have to invoke MessageManager with the text key in Messages_xx.properties:

JButton ok = new JButton(MessageManager.getString("button.ok"));

This will set JButton text to the one included at button.ok key. In English JButton text will be OK, while in Spanish will be Aceptar. This is the big thing of i18n. :)

+

Don't rely comparisons on labels

+

Don't use this type of coding: + threshold.addItem("No Threshold");
+ threshold.addItem("Above Threshold");
+ threshold.addItem("Below Threshold");
+ [...]
+ if (threshold.getSelectedItem().equals("Above Threshold"))
+ {
+ aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD;
+ }
+ else if (threshold.getSelectedItem().equals("Below Threshold"))
+ {
+ aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD;
+ }
+

+

Once text has been translated, these equals will fail as the label won't be the English ones. It should be used getSelectedIndex() instead of getSelectedItem(). If you do the proper way, the code will look like this:
+ threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold"));
+ threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold"));
+ threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold"));
+ [...]
+ if (threshold.getSelectedIndex()==1)
+ {
+ aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD;
+ }
+ else if (threshold.getSelectedIndex()==2)
+ {
+ aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD;
+ }
+

How to translate Jalview

Anyone interested in localizing/translating Jalview is strongly encouraged to join the Jalview Development List list. We would recommend that you read this entire page before proceeding.

If you are planning on working on a Jalview translation, please send us an email (Jalview Development List). There may be someone else already working on translating Jalview to your target language.

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties index f9356ce..5ae545f 100644 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@ -1,3 +1,39 @@ +action.refresh_services = Refresh Services +action.reset_services = Reset Services +action.merge_results = Merge Results +action.load_scheme = Load scheme +action.save_scheme = Save scheme +action.save_image = Save Image +action.paste = Paste +action.show_html_source = Show HTML Source +action.print = Print +action.web_service = Web Service +action.cancel_job = Cancel Job +action.start_job = Start Job +action.revert = Revert +action.move_down = Move Down +action.move_up = Move Up +action.remove_return_datatype = Remove return datatype +action.add_return_datatype = Add return datatype +action.remove_input_parameter = Remove selected input parameter +action.add_input_parameter = Add input parameter +action.edit = Edit +action.new = New +action.open_file = Open file +action.show_unconserved = Show Unconserved +action.open_new_aligmnent = Open new alignment +action.raise_associated_windows = Raise Associated Windows +action.minimize_associated_windows = Minimize Associated Windows +action.close_all = Close all +action.load_project = Load Project +action.save_project = Save Project +action.quit = Quit +action.expand_views = Expand Views +action.gather_views = Gather Views +action.page_setup = Page Setup +action.reload = Reload +action.load = Load +action.open = Open action.cancel = Cancel action.create = Create action.update = Update @@ -13,12 +49,15 @@ action.remove_left = Remove left action.remove_right = Remove right action.remove_empty_columns = Remove Empty Columns action.remove_all_gaps = Remove All Gaps +action.left_justify_alignment = Left Justify Alignment +action.right_justify_alignment = Right Justify Alignment action.boxes = Boxes action.text = Text action.by_pairwise_id = by Pairwise Identity action.by_id = by Id action.by_length = by Length action.by_group = by Group +action.remove = Remove action.remove_redundancy = Remove Redundancy... action.pairwise_alignment = Pairwise Alignments... action.by_rna_helixes = by RNA Helices @@ -26,12 +65,13 @@ action.user_defined = User Defined... action.by_conservation = By Conservation action.wrap = Wrap action.show_gaps = Show Gaps -action.find = Find... +action.show_hidden_markers = Show Hidden Markers +action.find = Find action.undefine_groups = Undefine Groups +action.create_groups = Create Groups action.make_groups_selection = Make Groups For Selection action.copy = Copy action.cut = Cut -action.paste = Paste action.font = Font... action.scale_above = Scale Above action.scale_left = Scale Left @@ -50,8 +90,12 @@ action.set_defaults = Defaults action.create_group = Create Group action.remove_group = Remove Group action.edit_group = Edit Group +action.border_colour = Border colour action.edit_new_group = Edit New Group action.hide_sequences = Hide Sequences +action.sequences = Sequences +action.ids = IDS +action.ids_sequences = IDS and sequences action.reveal_all = Reveal All action.reveal_sequences = Reveal Sequences action.find_all = Find all @@ -71,9 +115,12 @@ action.new_view = New View action.close = Close action.add = Add action.save_as_default = Save as default +action.save_as = Save as +action.save = Save action.cancel_fetch = Cancel Fetch action.save_omit_hidden_columns = Save / Omit Hidden Columns action.change_font = Change Font +action.change_font_tree_panel = Change Font (Tree Panel) action.colour = Colour action.calculate = Calculate action.select_all = Select all @@ -81,7 +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.show_chain = Show Chain +action.show_group = Show Group +action.fetch_db_references = Fetch DB References label.str = Str: label.seq = Seq: label.structures_manager = Structures Manager @@ -89,9 +139,12 @@ label.nickname = Nickname: label.url = URL: label.input_file_url = Enter URL or Input File label.select_feature = Select feature: -label.name = Name: +label.name = Name label.name_param = Name: {0} -label.group = Group: +label.group = Group +label.group_name = Group Name +label.group_description = Group Description +label.edit_group_name_description = Edit Group Name/Description label.colour = Colour: label.description = Description: label.start = Start: @@ -112,8 +165,15 @@ label.neighbour_joining_identity = Neighbour Joining Using % Identity label.status_bar = Status bar label.out_to_textbox = Output to Textbox label.clustalx = Clustalx +label.clustal = Clustal label.zappo = Zappo label.taylor = Taylor +label.blc = BLC +label.fasta = Fasta +label.msf = MSF +label.pfam = PFAM +label.pileup = Pileup +label.pir = PIR label.hydrophobicity = Hydrophobicity label.helix_propensity = Helix Propensity label.strand_propensity = Strand Propensity @@ -121,6 +181,7 @@ label.turn_propensity = Turn Propensity label.buried_index = Buried Index label.purine_pyrimidine = Purine/Pyrimidine label.percentage_identity = Percentage Identity +label.blosum62 = BLOSUM62 label.blosum62_score = BLOSUM62 Score label.tcoffee_scores = T-Coffee Scores label.average_distance_bloslum62 = Average Distance Using BLOSUM62 @@ -131,6 +192,7 @@ label.show_non_conversed = Show nonconserved label.overview_window = Overview Window label.none = None label.above_identity_threshold = Above Identity Threshold +label.show_sequence_features = Show Sequence Features label.nucleotide = Nucleotide label.to_new_alignment = To New Alignment label.to_this_alignment = Add To This Alignment @@ -159,11 +221,11 @@ label.show_consensus_logo = Show Consensus Logo label.norm_consensus_logo = Normalise Consensus Logo label.apply_all_groups = Apply to all groups label.autocalculated_annotation = Autocalculated Annotation -label.min_colour = Min Colour -label.max_colour = Max Colour +label.min_colour = Minimum Colour +label.max_colour = Maximum Colour label.use_original_colours = Use Original Colours label.threshold_minmax = Threshold is min/max -label.represent_group_with = Represent Group with +label.represent_group_with = Represent Group with {0} label.selection = Selection label.group_colour = Group Colour label.sequence = Sequence @@ -176,6 +238,8 @@ label.match_case = Match Case label.view_alignment_editor = View in alignment editor label.labels = Labels label.output_values = Output Values... +label.output_points = Output points... +label.output_transformed_points = Output transformed points label.input_data = Input Data... label.nucleotide_matrix = Nucleotide matrix label.protein_matrix = Protein matrix @@ -184,6 +248,7 @@ label.show_distances = Show distances label.mark_unassociated_leaves = Mark Unassociated Leaves label.fit_to_window = Fit To Window label.newick_format = Newick Format +label.select_newick_like_tree_file = Select a newick-like tree file label.colours = Colours label.view_mapping = View Mapping label.wireframe = Wireframe @@ -205,6 +270,7 @@ label.could_not_parse_newick_file = Could not parse Newick file\!\n {0} label.successfully_pasted_tcoffee_scores_to_alignment= Successfully pasted T-Coffee scores to alignment. label.failed_add_tcoffee_scores = Failed to add T-Coffee scores: label.successfully_pasted_annotation_to_alignment= Successfully pasted annotation to alignment. +label.couldnt_parse_pasted_text_as_valid_annotation_feature_GFF_tcoffee_file = Couldn't parse pasted text as a valid annotation, feature, GFF, or T-Coffee score file label.successfully_pasted_alignment_file = Successfully pasted alignment file label.paste_your_alignment_file = Paste your alignment file here label.paste_your = Paste your @@ -238,6 +304,10 @@ label.blog_item_published_on_date = {0} {1} label.select_das_service_from_table = Select a DAS service from the table to read a full description here. label.session_update = Session Update label.new_vamsas_session = New Vamsas Session +label.load_vamsas_session = Load Vamsas Session +label.save_vamsas_session = Save Vamsas Session +label.select_vamsas_session_opened_as_new_vamsas_session= Select a vamsas session to be opened as a new vamsas session. +label.open_saved_vamsas_session = Open a saved VAMSAS session label.groovy_console = Groovy Console... label.lineart = Lineart label.dont_ask_me_again = Don't ask me again @@ -250,6 +320,7 @@ label.save_colours = Save Colours label.fetch_das_features = Fetch DAS Features label.selected_database_to_fetch_from = Selected {0} database {1} to fetch from {2} label.database_param = Database: {0} +label.example = Example label.example_param = Example: {0} label.select_file_format_before_saving = You must select a file format before saving! label.file_format_not_specified = File format not specified @@ -295,6 +366,7 @@ label.enter_local_das_source = Enter Nickname & URL of Local DAS Source label.you_can_only_edit_or_remove_local_das_sources = You can only edit or remove local DAS Sources! label.public_das_source = Public DAS source - not editable label.input_alignment_from_url = Input Alignment From URL +label.input_alignment = Input Alignment label.couldnt_import_as_vamsas_session = Couldn't import '{0}' as a new vamsas session. label.vamsas_document_import_failed = Vamsas Document Import Failed label.couldnt_locate = Couldn't locate {0} @@ -319,6 +391,7 @@ label.jalview_user_survey = Jalview User Survey label.alignment_properties = Alignment Properties: {0} label.alignment_props = Alignment Properties label.input_cut_paste = Cut & Paste Input +label.input_cut_paste_params = Cut & Paste Input - {0} label.alignment_output_command = Alignment output - {0} label.annotations = Annotations label.features = Features @@ -365,7 +438,7 @@ label.state_job_error = job error! label.server_error_try_later = Server Error! (try later) label.error_loading_pdb_data = Error loading PDB data!! label.fetching_pdb_data = Fetching PDB data... -label.structure_type = Structure_type +label.structure_type = Structure type label.settings_for_type = Settings for {0} label.view_full_application = View in Full Application label.load_associated_tree = Load Associated Tree ... @@ -380,10 +453,270 @@ label.toggle_case = Toggle Case label.edit_name_description = Edit Name/Description label.create_sequence_feature = Create Sequence Feature label.edit_sequence = Edit Sequence +label.edit_sequences = Edit Sequences label.sequence_details = Sequence Details label.jmol_help = Jmol Help label.all = All +label.sort_by = Sort by label.sort_by_score = Sort by Score label.sort_by_density = Sort by Density +label.sequence_sort_by_density = Sequence sort by Density label.reveal = Reveal label.hide_columns = Hide Columns +label.load_jalview_annotations = Load Jalview Annotations or Features File +label.load_tree_file = Load a tree file +label.retrieve_parse_sequence_database_records_alignment_or_selected_sequences = Retrieve and parse sequence database records for the alignment or the currently selected sequences +label.standard_databases = Standard Databases +label.fetch_embl_uniprot = Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources +label.reset_min_max_colours_to_defaults = Reset min and max colours to defaults from user preferences. +label.align_structures_using_linked_alignment_views = Align structures using {0} linked alignment views +label.connect_to_session = Connect to session {0} +label.threshold_feature_display_by_score = Threshold the feature display by score. +label.threshold_feature_no_thereshold = No Threshold +label.threshold_feature_above_thereshold = Above Threshold +label.threshold_feature_below_thereshold = Below Threshold +label.adjust_thereshold = Adjust threshold +label.toggle_absolute_relative_display_threshold = Toggle between absolute and relative display threshold. +label.display_features_same_type_different_label_using_different_colour = Display features of the same type with a different label using a different colour. (e.g. domain features) +label.select_colour_minimum_value = Select Colour for Minimum Value +label.select_colour_maximum_value = Select Colour for Maximum Value +label.open_new_jmol_view_with_all_structures_associated_current_selection_superimpose_using_alignment = Open a new Jmol view with all structures associated with the current selection and superimpose them using the alignment. +label.open_url_param = Open URL {0} +label.open_url_seqs_param = Open URL ({0}..) ({1} seqs) +label.load_pdb_file_associate_with_sequence = Load a PDB file and associate it with sequence '{0}' +label.reveal_hidden_columns = Reveal Hidden Columns with Right Mouse Button +label.dark_colour = Dark Colour +label.light_colour = Light Colour +label.highlightnode = Left click to select leaves.
Double-click to invert leaves.
Right click to change colour. +label.load_colour_scheme = Load colour scheme +label.toggle_enabled_views = When enabled, allows many views to be selected. +label.edit_notes_parameter_set = Click to edit the notes for this parameter set. +label.open_local_file = Open local file +label.enable_automatically_sort_alignment_when_open_new_tree = Enable this to automatically sort
the alignment when you open
a new tree. +label.listen_for_selections = Listen for selections +label.selections_mirror_selections_made_same_sequences_other_views = When selected, selections in this view will mirror
selections made on the same sequences in other views. +label.toggle_sequence_visibility = Shift+H toggles sequence visiblity +label.toggle_columns_visibility = Ctrl+H toggles column visiblity. +label.toggles_visibility_hidden_selected_regions = H toggles visibility of hidden or selected regions +label.rename_tab_eXpand_reGroup= Right-click to rename tab
Press X to eXpand tabs, G to reGroup. +label.right_align_sequence_id = Right Align Sequence Id +label.sequence_id_tooltip = Sequence ID Tooltip +label.no_services = +label.select_copy_raw_html = Select this if you want to copy raw html +label.share_data_vamsas_applications = Share data with other vamsas applications +label.connect_to = Connect to +label.join_existing_vamsas_session = Join an existing vamsas session +label.from_url = from URL +label.any_trees_calculated_or_loaded_alignment_automatically_sort = When selected, any trees calculated or loaded onto the alignment will automatically sort the alignment +label.sort_with_new_tree = Sort With New Tree +label.from_textbox = from Textbox +label.window = Window +label.preferences = Preferences +label.tools = Tools +label.fetch_sequences = Fetch Sequence(s) +label.stop_vamsas_session = Stop Vamsas Session +label.collect_garbage = Collect Garbage +label.show_memory_usage = Show Memory Usage +label.show_java_console = Show Java Console +label.show_jalview_news = Show Jalview News +label.monospaced_fonts_faster_to_render = Monospaced fonts are faster to render +label.anti_alias_fonts = Anti-alias Fonts (Slower to render) +label.monospaced_font= Monospaced +label.quality = Quality +label.maximize_window = Maximize Window +label.conservation = Conservation +label.consensus = Consensus +label.histogram = Histogram +label.logo = Logo +label.non_positional_features = Non-positional Features +label.database_references = Database References +label.share_selection_across_views = Share selection across views +label.scroll_highlighted_regions = Scroll to highlighted regions +label.gap_symbol = Gap Symbol +label.alignment_colour = Alignment Colour +label.address = Address +label.port = Port +label.default_browser_unix = Default Browser (Unix) +label.send_usage_statistics = Send usage statistics +label.check_for_questionnaires = Check for questionnaires +label.check_for_latest_version = Check for latest version +label.url_linkfrom_sequence_id = URL link from Sequence ID +label.use_proxy_server = Use a proxy server +label.eps_rendering_style = EPS rendering style +label.append_start_end = Append /start-end (/15-380) +label.full_sequence_id = Full Sequence Id +label.smooth_font = Smooth Font +label.autocalculate_consensus = AutoCalculate Consensus +label.pad_gaps = Pad Gaps +label.pad_gaps_when_editing = Pad Gaps When Editing +label.automatically_set_id_width = Automatically set ID width +label.figure_id_column_width = Figure ID column width +label.use_modeller_output = Use Modeller Output +label.wrap_alignment = Wrap Alignment +label.right_align_ids = Right Align Ids +label.sequence_name_italics = Sequence Name Italics +label.open_overview = Open Overview +label.default_colour_scheme_for_alignment = Default Colour Scheme for alignment +label.annotation_shading_default = Annotation Shading Default +label.default_minimum_colour_annotation_shading = Default Minimum Colour for annotation shading +label.default_maximum_colour_annotation_shading = Default Maximum Colour for annotation shading +label.visual = Visual +label.connections = Connections +label.output = Output +label.editing = Editing +label.das_settings = DAS Settings +label.web_services = Web Services +label.right_click_to_edit_currently_selected_parameter = Right click to edit currently selected parameter. +label.let_jmol_manage_structure_colours = Let Jmol manage structure colours +label.marks_leaves_tree_not_associated_with_sequence = Marks leaves of tree not associated with a sequence +label.index_web_services_menu_by_host_site = Index web services in menu by the host site +label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up = Check this option if you want to be informed
when a web service URL cannot be accessed by Jalview
when it starts up +label.new_service_url = New Service URL +label.edit_service_url = Edit Service URL +label.delete_service_url = Delete Service URL +label.details = Details +label.options = Options +label.parameters = Parameters +label.available_das_sources = Available DAS Sources +label.full_details = Full Details +label.authority = Authority +label.type = Type +label.proxy_server = Proxy Server +label.file_output = File Output +label.select_input_type = Select input type +label.set_options_for_type = Set options for type +label.data_input_parameters = Data input parameters +label.data_returned_by_service = Data returned by service +label.rsbs_encoded_service = RSBS Encoded Service +label.parsing_errors = Parsing errors +label.simple_bioinformatics_rest_services = Simple Bioinformatics Rest Services +label.web_service_discovery_urls = Web Service Discovery URLS +label.input_parameter_name = Input Parameter name +label.short_descriptive_name_for_service = Short descriptive name for service +label.function_service_performs = What kind of function the service performs (e.g. alignment, analysis, search, etc). +label.brief_description_service = Brief description of service +label.url_post_data_service = URL to post data to service. Include any special parameters needed here +label.optional_suffix = Optional suffix added to URL when retrieving results from service +label.preferred_gap_character = Which gap character does this service prefer? +label.gap_character = Gap character +label.move_return_type_up_order= Move return type up order +label.move_return_type_down_order= Move return type down order +label.update_user_parameter_set = Update this existing user parameter set +label.delete_user_parameter_set = Delete the currently selected user parameter set +label.create_user_parameter_set = Create a new parameter set with the current settings. +label.revert_changes_user_parameter_set = Undo all changes to the current parameter set +label.start_job_current_settings = Start Job with current settings +label.cancel_job_close_dialog = Close this dialog and cancel job +label.input_output = Input/Output +label.cut_paste = Cut'n'Paste +label.adjusting_parameters_for_calculation = Adjusting parameters for existing Calculation +label.2d_rna_structure_line = 2D RNA {0} +label.2d_rna_sequence_name = 2D RNA - {0} +label.edit_name_and_description_current_group = Edit name and description of current group. +label.view_structure_for = View structure for {0} +label.view_all_structures = View all {0} structures. +label.associate_structure_with_sequence = Associate Structure with Sequence +label.from_file = from file +label.enter_pdb_id = Enter PDB Id +label.discover_pdb_ids = Discover PDB ids +label.text_colour = Text Colour +label.structure = Structure +label.view_structure = View Structure +label.clustalx_colours = Clustalx colours +label.above_identity_percentage = Above % Identity +label.create_sequence_details_report_annotation_for = Annotation for {0} +label.sequece_details_for = Sequece Details for {0} +label.sequence_name = Sequence Name +label.sequence_description = Sequence Description +label.edit_sequence_name_description = Edit Sequence Name/Description +label.spaces_converted_to_backslashes = Spaces have been converted to _ +label.no_spaces_allowed_sequence_name = No spaces allowed in Sequence Name +label.select_outline_colour = Select Outline Colour +label.web_browser_not_found_unix = Unixers\: Couldn't find default web browser.\nAdd the full path to your browser in Preferences." +label.web_browser_not_found = Web browser not found +label.select_pdb_file_for = Select a PDB file for {0} +label.html = HTML +label.wrap = Wrap +label.show_database_refs = Show Database Refs +label.show_non_positional_features = Show Non-Positional Features +label.save_png_image = Save As PNG Image +label.load_tree_for_sequence_set = Load a tree for this sequence set +label.export_image = Export Image +label.vamsas_store = VAMSAS store +label.translate_cDNA = Translate cDNA +label.extract_scores = Extract Scores +label.get_cross_refs = Get Cross References +label.sort_alignment_new_tree = Sort Alignment With New Tree +label.add_sequences = Add Sequences +label.new_window = New Window +label.refresh_available_sources = Refresh Available Sources +label.use_registry = Use Registry +label.add_local_source = Add Local Source +label.set_as_default = Set as Default +label.show_labels = Show labels +label.background_colour = Background Colour +label.associate_nodes_with = Associate Nodes With +label.jalview_pca_calculation = Jalview PCA Calculation +label.link_name = Link Name +label.pdb_file = PDB file +label.colour_with_jmol = Colour with Jmol +label.align_structures = Align structures +label.jmol = Jmol +label.sort_alignment_by_tree = Sort Alignment By Tree +label.mark_unlinked_leaves = Mark Unlinked Leaves +label.associate_leaves_with = Associate Leaves With +label.save_colour_scheme_with_unique_name_added_to_colour_menu = Save your colour scheme with a unique name and it will be added to the Colour menu +label.case_sensitive = Case Sensitive +label.lower_case_colour = Lower Case Colour +label.index_by_host = Index by host +label.index_by_type = Index by type +label.enable_enfin_services = Enable Enfin Services +label.enable_jabaws_services = Enable JABAWS Services +label.display_warnings = Display warnings +label.move_url_up = Move URL up +label.move_url_down = Move URL down +label.add_sbrs_definition = Add a SBRS definition +label.edit_sbrs_definition = Edit SBRS definition +label.delete_sbrs_definition = Delete SBRS definition +label.your_sequences_have_been_verified = Your sequences have been verified against known sequence databases. Some of the ids have been\n altered, most likely the start/end residue will have been updated.\n Save your alignment to maintain the updated id.\n\n +label.sequence_names_updated = Sequence names updated +label.dbref_search_completed = DBRef search completed +label.show_all_chains = Show all chains +label.fetch_all_param = Fetch all '{0}' +label.paste_new_window = Paste To New Window +label.settings_for_param = Settings for {0} +label.view_params = View {0} +label.select_all_views = Select all views +label.align_sequences_to_existing_alignment = Align sequences to an existing alignment +label.realign_with_params = Realign with {0} +label.calcname_with_default_settings = {0} with Defaults +label.action_with_default_settings = {0} with default settings +label.edit_settings_and_run = Edit settings and run... +label.view_and_change_parameters_before_alignment = View and change the parameters before alignment +label.run_with_preset_params = Run {0} with preset +label.view_and_change_parameters_before_running_calculation = View and change parameters before running calculation +label.view_documentation = View documentation +label.select_return_type = Select return type +label.translation_of_params = Translation of {0} +label.features_for_params = Features for - {0} +label.annotations_for_params = Annotations for - {0} +label.generating_features_for_params = Generating features for - {0} +label.generating_annotations_for_params = Generating annotations for - {0} +label.varna_params = VARNA - {0} +label.sequence_feature_settings = Sequence Feature Settings +label.pairwise_aligned_sequences = Pairwise Aligned Sequences +label.original_data_for_params = Original Data for {0} +label.points_for_params = Points for {0} +label.transformed_points_for_params = Transformed points for {0} +label.graduated_color_for_params = Graduated Feature Colour for {0} +label.select_backgroud_colour = Select Background Colour +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.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.blasting_for_unidentified_sequence = BLASTing for unidentified sequences diff --git a/src/MCview/PDBViewer.java b/src/MCview/PDBViewer.java index 48f016f..fc52c08 100755 --- a/src/MCview/PDBViewer.java +++ b/src/MCview/PDBViewer.java @@ -141,10 +141,10 @@ public class PDBViewer extends JInternalFrame implements Runnable }); this.setJMenuBar(jMenuBar1); - fileMenu.setText("File"); - coloursMenu.setText("Colours"); - saveMenu.setActionCommand("Save Image"); - saveMenu.setText("Save As"); + fileMenu.setText(MessageManager.getString("action.file")); + coloursMenu.setText(MessageManager.getString("label.colours")); + saveMenu.setActionCommand(MessageManager.getString("action.save_image")); + saveMenu.setText(MessageManager.getString("action.save_as")); png.setText("PNG"); png.addActionListener(new ActionListener() { @@ -161,7 +161,7 @@ public class PDBViewer extends JInternalFrame implements Runnable eps_actionPerformed(e); } }); - mapping.setText("View Mapping"); + mapping.setText(MessageManager.getString("label.view_mapping")); mapping.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -169,7 +169,7 @@ public class PDBViewer extends JInternalFrame implements Runnable mapping_actionPerformed(e); } }); - wire.setText("Wireframe"); + wire.setText(MessageManager.getString("label.wireframe")); wire.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -178,7 +178,7 @@ public class PDBViewer extends JInternalFrame implements Runnable } }); depth.setSelected(true); - depth.setText("Depthcue"); + depth.setText(MessageManager.getString("label.depthcue")); depth.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -187,7 +187,7 @@ public class PDBViewer extends JInternalFrame implements Runnable } }); zbuffer.setSelected(true); - zbuffer.setText("Z Buffering"); + zbuffer.setText(MessageManager.getString("label.z_buffering")); zbuffer.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -195,7 +195,7 @@ public class PDBViewer extends JInternalFrame implements Runnable zbuffer_actionPerformed(e); } }); - charge.setText("Charge & Cysteine"); + charge.setText(MessageManager.getString("label.charge_cysteine")); charge.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -203,7 +203,7 @@ public class PDBViewer extends JInternalFrame implements Runnable charge_actionPerformed(e); } }); - chain.setText("By Chain"); + chain.setText(MessageManager.getString("action.by_chain")); chain.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -212,7 +212,7 @@ public class PDBViewer extends JInternalFrame implements Runnable } }); seqButton.setSelected(true); - seqButton.setText("By Sequence"); + seqButton.setText(MessageManager.getString("action.by_sequence")); seqButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -221,7 +221,7 @@ public class PDBViewer extends JInternalFrame implements Runnable } }); allchains.setSelected(true); - allchains.setText("Show All Chains"); + allchains.setText(MessageManager.getString("label.show_all_chains")); allchains.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) @@ -229,7 +229,7 @@ public class PDBViewer extends JInternalFrame implements Runnable allchains_itemStateChanged(e); } }); - zappo.setText("Zappo"); + zappo.setText(MessageManager.getString("label.zappo")); zappo.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -237,7 +237,7 @@ public class PDBViewer extends JInternalFrame implements Runnable zappo_actionPerformed(e); } }); - taylor.setText("Taylor"); + taylor.setText(MessageManager.getString("label.taylor")); taylor.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -245,7 +245,7 @@ public class PDBViewer extends JInternalFrame implements Runnable taylor_actionPerformed(e); } }); - hydro.setText("Hydro"); + hydro.setText(MessageManager.getString("label.hydrophobicity")); hydro.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -253,7 +253,7 @@ public class PDBViewer extends JInternalFrame implements Runnable hydro_actionPerformed(e); } }); - helix.setText("Helix"); + helix.setText(MessageManager.getString("label.helix_propensity")); helix.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -261,7 +261,7 @@ public class PDBViewer extends JInternalFrame implements Runnable helix_actionPerformed(e); } }); - strand.setText("Strand"); + strand.setText(MessageManager.getString("label.strand_propensity")); strand.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -269,7 +269,7 @@ public class PDBViewer extends JInternalFrame implements Runnable strand_actionPerformed(e); } }); - turn.setText("Turn"); + turn.setText(MessageManager.getString("label.turn_propensity")); turn.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -277,7 +277,7 @@ public class PDBViewer extends JInternalFrame implements Runnable turn_actionPerformed(e); } }); - buried.setText("Buried"); + buried.setText(MessageManager.getString("label.buried_index")); buried.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -285,7 +285,7 @@ public class PDBViewer extends JInternalFrame implements Runnable buried_actionPerformed(e); } }); - user.setText("User Defined..."); + user.setText(MessageManager.getString("action.user_defined")); user.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -293,8 +293,8 @@ public class PDBViewer extends JInternalFrame implements Runnable user_actionPerformed(e); } }); - viewMenu.setText("View"); - background.setText("Background Colour..."); + viewMenu.setText(MessageManager.getString("action.view")); + background.setText(MessageManager.getString("label.background_colour") + "..."); background.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -302,7 +302,7 @@ public class PDBViewer extends JInternalFrame implements Runnable background_actionPerformed(e); } }); - savePDB.setText("PDB File"); + savePDB.setText(MessageManager.getString("label.pdb_file")); savePDB.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -566,7 +566,7 @@ public class PDBViewer extends JInternalFrame implements Runnable try { cap.setText(pdbcanvas.mappingDetails.toString()); - Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", 550, 600); + Desktop.addInternalFrame(cap, MessageManager.getString("label.pdb_sequence_mapping"), 550, 600); } catch (OutOfMemoryError oom) { new OOMWarning("Opening sequence to structure mapping report", oom); @@ -629,7 +629,7 @@ public class PDBViewer extends JInternalFrame implements Runnable public void user_actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("User Defined...")) + if (e.getActionCommand().equals(MessageManager.getString("action.user_defined"))) { // new UserDefinedColours(pdbcanvas, null); } @@ -647,7 +647,7 @@ public class PDBViewer extends JInternalFrame implements Runnable public void background_actionPerformed(ActionEvent e) { java.awt.Color col = JColorChooser.showDialog(this, - "Select Background Colour", pdbcanvas.backgroundColour); + MessageManager.getString("label.select_backgroud_colour"), pdbcanvas.backgroundColour); if (col != null) { @@ -664,7 +664,7 @@ public class PDBViewer extends JInternalFrame implements Runnable chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save PDB File"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 1bb4049..13dcd05 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -774,10 +774,10 @@ public class APopupMenu extends java.awt.PopupMenu implements seqMenu.setLabel(MessageManager.getString("label.sequence")); pdb.setLabel(MessageManager.getString("label.view_pdb_structure")); hideSeqs.setLabel(MessageManager.getString("action.hide_sequences")); - repGroup.setLabel(MessageManager.getString("label.represent_group_with")); + repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{""})); revealAll.setLabel(MessageManager.getString("action.reveal_all")); revealSeq.setLabel(MessageManager.getString("action.reveal_sequences")); - menu1.setLabel(MessageManager.getString("label.group")); + menu1.setLabel(MessageManager.getString("label.group")+":"); add(groupMenu); this.add(seqMenu); this.add(hideSeqs); diff --git a/src/jalview/appletgui/AnnotationColourChooser.java b/src/jalview/appletgui/AnnotationColourChooser.java index 27d5497..db928b7 100644 --- a/src/jalview/appletgui/AnnotationColourChooser.java +++ b/src/jalview/appletgui/AnnotationColourChooser.java @@ -112,9 +112,9 @@ public class AnnotationColourChooser extends Panel implements annotations.addItem(list.elementAt(i).toString()); } - threshold.addItem("No Threshold"); - threshold.addItem("Above Threshold"); - threshold.addItem("Below Threshold"); + threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold")); if (oldcs instanceof AnnotationColourGradient) { @@ -123,13 +123,13 @@ public class AnnotationColourChooser extends Panel implements switch (acg.getAboveThreshold()) { case AnnotationColourGradient.NO_THRESHOLD: - threshold.select("No Threshold"); + threshold.select(0); break; case AnnotationColourGradient.ABOVE_THRESHOLD: - threshold.select("Above Threshold"); + threshold.select(1); break; case AnnotationColourGradient.BELOW_THRESHOLD: - threshold.select("Below Threshold"); + threshold.select(1); break; default: throw new Error( @@ -402,11 +402,11 @@ public class AnnotationColourChooser extends Panel implements .getSelectedIndex()]; int aboveThreshold = -1; - if (threshold.getSelectedItem().equals("Above Threshold")) + if (threshold.getSelectedIndex()==1) { aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; } - else if (threshold.getSelectedItem().equals("Below Threshold")) + else if (threshold.getSelectedIndex()==2) { aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; } diff --git a/src/jalview/appletgui/CutAndPasteTransfer.java b/src/jalview/appletgui/CutAndPasteTransfer.java index 6bfe6b0..756fa81 100644 --- a/src/jalview/appletgui/CutAndPasteTransfer.java +++ b/src/jalview/appletgui/CutAndPasteTransfer.java @@ -201,7 +201,7 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, alignFrame.alignPanel.fontChanged(); alignFrame.alignPanel.setScrollValues(0, 0); alignFrame.statusBar - .setText("Successfully pasted annotation to alignment."); + .setText(MessageManager.getString("label.successfully_pasted_annotation_to_alignment")); } else @@ -210,7 +210,7 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, jalview.io.AppletFormatAdapter.PASTE)) { alignFrame.statusBar - .setText("Couldn't parse pasted text as a valid annotation, feature, GFF, or T-Coffee score file."); + .setText(MessageManager.getString("label.couldnt_parse_pasted_text_as_valid_annotation_feature_GFF_tcoffee_file")); } } } diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java index 0672318..4968688 100644 --- a/src/jalview/appletgui/FeatureColourChooser.java +++ b/src/jalview/appletgui/FeatureColourChooser.java @@ -114,7 +114,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, slider.addAdjustmentListener(this); slider.addMouseListener(this); owner = (af != null) ? af : fs.frame; - frame = new JVDialog(owner, "Graduated Feature Colour for " + type, + frame = new JVDialog(owner, MessageManager.formatMessage("label.graduated_color_for_params", new String[]{type}), true, 480, 248); frame.setMainPanel(this); validate(); @@ -169,9 +169,9 @@ public class FeatureColourChooser extends Panel implements ActionListener, jPanel2.setBackground(Color.white); jPanel4.setBackground(Color.white); threshold.addItemListener(this); - threshold.addItem("No Threshold"); - threshold.addItem("Above Threshold"); - threshold.addItem("Below Threshold"); + threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold")); thresholdValue.addActionListener(this); slider.setBackground(Color.white); slider.setEnabled(false); @@ -290,7 +290,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, { UserDefinedColours udc = new UserDefinedColours(this, minColour.getBackground(), owner, - "Select Colour for Minimum Value"); // frame.owner, + MessageManager.getString("label.select_colour_minimum_value")); // frame.owner, } else { @@ -311,7 +311,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, // "Select Colour for Maximum Value",maxColour.getBackground(),true); UserDefinedColours udc = new UserDefinedColours(this, maxColour.getBackground(), owner, - "Select Colour for Maximum Value"); + MessageManager.getString("label.select_colour_maximum_value")); } else { @@ -331,11 +331,11 @@ public class FeatureColourChooser extends Panel implements ActionListener, } int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD; - if (threshold.getSelectedItem().equals("Above Threshold")) + if (threshold.getSelectedIndex()==1) { aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; } - else if (threshold.getSelectedItem().equals("Below Threshold")) + else if (threshold.getSelectedIndex()==2) { aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; } diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java index 34b014c..d3351e7 100644 --- a/src/jalview/appletgui/FontChooser.java +++ b/src/jalview/appletgui/FontChooser.java @@ -187,7 +187,7 @@ public class FontChooser extends Panel implements ActionListener, fontName.select(lastSelected.getName()); fontStyle.select(lastSelStyle); fontSize.select("" + lastSelSize); - JVDialog d = new JVDialog(this.frame, "Invalid Font", true, 350, 200); + JVDialog d = new JVDialog(this.frame, MessageManager.getString("label.invalid_font"), true, 350, 200); Panel mp = new Panel(); d.cancel.setVisible(false); mp.setLayout(new FlowLayout()); diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 57ff660..4a06fdd 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -985,7 +985,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save Alignment to file"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -1154,7 +1154,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, viewport.getAlignment(), omitHidden, viewport.getColumnSelection())); Desktop.addInternalFrame(cap, - "Alignment output - " + e.getActionCommand(), 600, 500); + MessageManager.formatMessage("label.alignment_output_command", new String[]{e.getActionCommand()}), 600, 500); } catch (OutOfMemoryError oom) { new OOMWarning("Outputting alignment as " + e.getActionCommand(), oom); @@ -1250,8 +1250,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, JalviewFileChooser chooser = new JalviewFileChooser( jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Load Jalview Annotations or Features File"); - chooser.setToolTipText("Load Jalview Annotations / Features file"); + chooser.setDialogTitle(MessageManager.getString("label.load_jalview_annotations")); + chooser.setToolTipText(MessageManager.getString("label.load_jalview_annotations")); int value = chooser.showOpenDialog(null); @@ -2958,8 +2958,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, JInternalFrame frame = new JInternalFrame(); frame.getContentPane().add(new JScrollPane(editPane)); - Desktop.instance.addInternalFrame(frame, "Alignment Properties: " - + getTitle(), 500, 400); + Desktop.instance.addInternalFrame(frame, MessageManager.formatMessage("label.alignment_properties", new String[]{getTitle()}), 500, 400); } /** @@ -2979,7 +2978,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, JInternalFrame frame = new JInternalFrame(); OverviewPanel overview = new OverviewPanel(alignPanel); frame.setContentPane(overview); - Desktop.addInternalFrame(frame, "Overview " + this.getTitle(), + Desktop.addInternalFrame(frame, MessageManager.formatMessage("label.overview_params", new String[]{this.getTitle()}), frame.getWidth(), frame.getHeight()); frame.pack(); frame.setLayer(JLayeredPane.PALETTE_LAYER); @@ -3365,7 +3364,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, @Override public void userDefinedColour_actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("User Defined...")) + if (e.getActionCommand().equals(MessageManager.getString("action.user_defined"))) { new UserDefinedColours(alignPanel, null); } @@ -3574,7 +3573,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, { JInternalFrame frame = new JInternalFrame(); frame.setContentPane(new PairwiseAlignPanel(viewport)); - Desktop.addInternalFrame(frame, "Pairwise Alignment", 600, 500); + Desktop.addInternalFrame(frame, MessageManager.getString("action.pairwise_alignment"), 600, 500); } } @@ -4028,8 +4027,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, JalviewFileChooser chooser = new JalviewFileChooser( jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Select a newick-like tree file"); - chooser.setToolTipText("Load a tree file"); + chooser.setDialogTitle(MessageManager.getString("label.select_newick_like_tree_file")); + chooser.setToolTipText(MessageManager.getString("label.load_tree_file")); int value = chooser.showOpenDialog(null); @@ -4558,7 +4557,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, else { AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT); - Desktop.addInternalFrame(af, "Translation of " + this.getTitle(), + Desktop.addInternalFrame(af, MessageManager.formatMessage("label.translation_of_params", new String[]{this.getTitle()}), DEFAULT_WIDTH, DEFAULT_HEIGHT); } } @@ -4601,7 +4600,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, else { AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT); - Desktop.addInternalFrame(af, "Translation of " + this.getTitle(), + Desktop.addInternalFrame(af, MessageManager.formatMessage("label.translation_of_params", new String[]{this.getTitle()}), DEFAULT_WIDTH, DEFAULT_HEIGHT); } } @@ -5114,12 +5113,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, // TODO We probably want to store a sequence database checklist in // preferences and have checkboxes.. rather than individual sources selected // here - final JMenu rfetch = new JMenu("Fetch DB References"); - rfetch.setToolTipText("Retrieve and parse sequence database records for the alignment or the currently selected sequences"); + final JMenu rfetch = new JMenu(MessageManager.getString("action.fetch_db_references")); + rfetch.setToolTipText(MessageManager.getString("label.retrieve_parse_sequence_database_records_alignment_or_selected_sequences")); webService.add(rfetch); - JMenuItem fetchr = new JMenuItem("Standard Databases"); - fetchr.setToolTipText("Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources"); + JMenuItem fetchr = new JMenuItem(MessageManager.getString("label.standard_databases")); + fetchr.setToolTipText(MessageManager.getString("label.fetch_embl_uniprot")); fetchr.addActionListener(new ActionListener() { @@ -5223,8 +5222,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, .toArray(new DbSourceProxy[0]); // fetch all entry DbSourceProxy src = otherdb.get(0); - fetchr = new JMenuItem("Fetch All '" + src.getDbSource() - + "'"); + fetchr = new JMenuItem(MessageManager.formatMessage("label.fetch_all_param", new String[]{src.getDbSource()})); fetchr.addActionListener(new ActionListener() { @Override diff --git a/src/jalview/gui/AnnotationColourChooser.java b/src/jalview/gui/AnnotationColourChooser.java index 69b54ea..da7a176 100644 --- a/src/jalview/gui/AnnotationColourChooser.java +++ b/src/jalview/gui/AnnotationColourChooser.java @@ -74,7 +74,7 @@ public class AnnotationColourChooser extends JPanel frame = new JInternalFrame(); frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); - Desktop.addInternalFrame(frame, "Colour by Annotation", 520, 215); + Desktop.addInternalFrame(frame, MessageManager.getString("label.colour_by_annotation"), 520, 215); slider.addChangeListener(new ChangeListener() { @@ -137,9 +137,9 @@ public class AnnotationColourChooser extends JPanel annotations = new JComboBox( getAnnotationItems(seqAssociated.isSelected())); - threshold.addItem("No Threshold"); - threshold.addItem("Above Threshold"); - threshold.addItem("Below Threshold"); + threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold")); + threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold")); if (oldcs instanceof AnnotationColourGradient) { @@ -148,13 +148,13 @@ public class AnnotationColourChooser extends JPanel switch (acg.getAboveThreshold()) { case AnnotationColourGradient.NO_THRESHOLD: - threshold.setSelectedItem("No Threshold"); + threshold.setSelectedIndex(0); break; case AnnotationColourGradient.ABOVE_THRESHOLD: - threshold.setSelectedItem("Above Threshold"); + threshold.setSelectedIndex(1); break; case AnnotationColourGradient.BELOW_THRESHOLD: - threshold.setSelectedItem("Below Threshold"); + threshold.setSelectedIndex(2); break; default: throw new Error( @@ -243,7 +243,7 @@ public class AnnotationColourChooser extends JPanel minColour.setFont(JvSwingUtils.getLabelFont()); minColour.setBorder(BorderFactory.createEtchedBorder()); minColour.setPreferredSize(new Dimension(40, 20)); - minColour.setToolTipText("Minimum Colour"); + minColour.setToolTipText(MessageManager.getString("label.min_colour")); minColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -257,7 +257,7 @@ public class AnnotationColourChooser extends JPanel maxColour.setFont(JvSwingUtils.getLabelFont()); maxColour.setBorder(BorderFactory.createEtchedBorder()); maxColour.setPreferredSize(new Dimension(40, 20)); - maxColour.setToolTipText("Maximum Colour"); + maxColour.setToolTipText(MessageManager.getString("label.max_colour")); maxColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -289,7 +289,7 @@ public class AnnotationColourChooser extends JPanel defColours.setOpaque(false); defColours.setText(MessageManager.getString("action.set_defaults")); defColours - .setToolTipText("Reset min and max colours to defaults from user preferences."); + .setToolTipText(MessageManager.getString("label.reset_min_max_colours_to_defaults")); defColours.addActionListener(new ActionListener() { @@ -490,11 +490,11 @@ public class AnnotationColourChooser extends JPanel .getSelectedIndex()]]; int aboveThreshold = -1; - if (threshold.getSelectedItem().equals("Above Threshold")) + if (threshold.getSelectedIndex()==1) { aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; } - else if (threshold.getSelectedItem().equals("Below Threshold")) + else if (threshold.getSelectedIndex()==2) { aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; } diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java index bcf29cd..56c6e2d 100644 --- a/src/jalview/gui/AnnotationExporter.java +++ b/src/jalview/gui/AnnotationExporter.java @@ -98,7 +98,7 @@ public class AnnotationExporter extends JPanel chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle(features ? "Save Features to File" : "Save Annotation to File"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -184,13 +184,12 @@ public class AnnotationExporter extends JPanel try { cap.setText(text); - Desktop.addInternalFrame(cap, (features ? "Features for - " - : "Annotations for - ") + ap.alignFrame.getTitle(), 600, 500); + Desktop.addInternalFrame(cap, (features ? MessageManager.formatMessage("label.features_for_params", new String[]{ap.alignFrame.getTitle()}) + : MessageManager.formatMessage("label.annotations_for_params", new String[]{ap.alignFrame.getTitle()})), 600, 500); } catch (OutOfMemoryError oom) { - new OOMWarning("generating " - + (features ? "Features for - " : "Annotations for - ") - + ap.alignFrame.getTitle(), oom); + new OOMWarning((features ? MessageManager.formatMessage("label.generating_features_for_params", new String[]{ap.alignFrame.getTitle()}) : MessageManager.formatMessage("label.generating_annotations_for_params", new String[]{ap.alignFrame.getTitle()})) + , oom); cap.dispose(); } diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 932b333..ae7596d 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -532,7 +532,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, return; } - JPopupMenu pop = new JPopupMenu("Annotations"); + JPopupMenu pop = new JPopupMenu(MessageManager.getString("label.annotations")); JMenuItem item = new JMenuItem(ADDNEW); item.addActionListener(this); pop.add(item); diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 3750605..e587586 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -484,7 +484,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, return; } - JPopupMenu pop = new JPopupMenu("Structure type"); + JPopupMenu pop = new JPopupMenu(MessageManager.getString("label.structure_type")); JMenuItem item; /* * Just display the needed structure options diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index d9512d0..cc37b66 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -200,8 +200,7 @@ public class AppJmol extends GStructureViewer implements Runnable, public void itemStateChanged(ItemEvent e) { alignStructs.setEnabled(_alignwith.size() > 0); - alignStructs.setToolTipText("Align structures using " - + _alignwith.size() + " linked alignment views"); + alignStructs.setToolTipText(MessageManager.formatMessage("label.align_structures_using_linked_alignment_views", new String[] {new Integer(_alignwith.size()).toString()})); } }); handler.itemStateChanged(null); @@ -618,7 +617,7 @@ public class AppJmol extends GStructureViewer implements Runnable, { return; } - JMenuItem menuItem = new JMenuItem("All"); + JMenuItem menuItem = new JMenuItem(MessageManager.getString("label.all")); menuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -872,7 +871,7 @@ public class AppJmol extends GStructureViewer implements Runnable, chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save PDB File"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -920,7 +919,7 @@ public class AppJmol extends GStructureViewer implements Runnable, cap.dispose(); return; } - jalview.gui.Desktop.addInternalFrame(cap, "PDB - Sequence Mapping", + jalview.gui.Desktop.addInternalFrame(cap, MessageManager.getString("label.pdb_sequence_mapping"), 550, 600); } diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java index e8f4666..1de0cf2 100644 --- a/src/jalview/gui/AppVarna.java +++ b/src/jalview/gui/AppVarna.java @@ -28,6 +28,7 @@ import javax.swing.*; import jalview.bin.Cache; import jalview.datamodel.*; import jalview.structure.*; +import jalview.util.MessageManager; import jalview.util.ShiftList; import fr.orsay.lri.varna.VARNAPanel; import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax; @@ -118,7 +119,7 @@ public class AppVarna extends JInternalFrame implements // getContentPane().add(vab.getTools(), BorderLayout.NORTH); varnaPanel.addVARNAListener(this); varnaPanel.addSelectionListener(this); - jalview.gui.Desktop.addInternalFrame(this, "VARNA -" + name, + jalview.gui.Desktop.addInternalFrame(this, MessageManager.formatMessage("label.varna_params", new String[]{name}), getBounds().width, getBounds().height); this.pack(); showPanel(true); diff --git a/src/jalview/gui/CutAndPasteHtmlTransfer.java b/src/jalview/gui/CutAndPasteHtmlTransfer.java index 974c0d5..ca554a0 100644 --- a/src/jalview/gui/CutAndPasteHtmlTransfer.java +++ b/src/jalview/gui/CutAndPasteHtmlTransfer.java @@ -140,7 +140,7 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer chooser.setAcceptAllFileFilterUsed(false); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save Text to File"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -212,8 +212,8 @@ public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer { if (SwingUtilities.isRightMouseButton(e)) { - JPopupMenu popup = new JPopupMenu("Edit"); - JMenuItem item = new JMenuItem("Copy"); + JPopupMenu popup = new JPopupMenu(MessageManager.getString("action.edit")); + JMenuItem item = new JMenuItem(MessageManager.getString("action.copy")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index 5c397f4..6ccc5ff 100644 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -99,7 +99,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer chooser.setAcceptAllFileFilterUsed(false); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save Text to File"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -200,7 +200,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer AlignFrame af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); af.currentFileFormat = format; - Desktop.addInternalFrame(af, "Cut & Paste input - " + format, + Desktop.addInternalFrame(af, MessageManager.formatMessage("label.input_cut_paste_params", new String[]{format}), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); af.statusBar.setText(MessageManager.getString("label.successfully_pasted_alignment_file")); @@ -235,8 +235,8 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer { if (SwingUtilities.isRightMouseButton(e)) { - JPopupMenu popup = new JPopupMenu("Edit"); - JMenuItem item = new JMenuItem("Copy"); + JPopupMenu popup = new JPopupMenu(MessageManager.getString("action.edit")); + JMenuItem item = new JMenuItem(MessageManager.getString("action.copy")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -245,7 +245,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } }); popup.add(item); - item = new JMenuItem("Paste"); + item = new JMenuItem(MessageManager.getString("action.paste")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 5967f5f..6715537 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -559,7 +559,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements void showPasteMenu(int x, int y) { JPopupMenu popup = new JPopupMenu(); - JMenuItem item = new JMenuItem("Paste To New Window"); + JMenuItem item = new JMenuItem(MessageManager.getString("label.paste_new_window")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -902,8 +902,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT")); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Open local file"); - chooser.setToolTipText("Open"); + chooser.setDialogTitle(MessageManager.getString("label.open_local_file")); + chooser.setToolTipText(MessageManager.getString("action.open")); int value = chooser.showOpenDialog(this); @@ -1713,7 +1713,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Open a saved VAMSAS session"); - chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session."); + chooser.setToolTipText(MessageManager.getString("label.select_vamsas_session_opened_as_new_vamsas_session")); int value = chooser.showOpenDialog(this); @@ -1915,7 +1915,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { JMenuItem sessit = new JMenuItem(); sessit.setText(sess[i]); - sessit.setToolTipText("Connect to session " + sess[i]); + sessit.setToolTipText(MessageManager.formatMessage("label.connect_to_session", new String[]{sess[i]})); final Desktop dsktp = this; final String mysesid = sess[i]; sessit.addActionListener(new ActionListener() diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java index 9e2cfcb..d6ddd16 100644 --- a/src/jalview/gui/FeatureColourChooser.java +++ b/src/jalview/gui/FeatureColourChooser.java @@ -184,7 +184,7 @@ public class FeatureColourChooser extends JalviewDialog minColour.setFont(JvSwingUtils.getLabelFont()); minColour.setBorder(BorderFactory.createLineBorder(Color.black)); minColour.setPreferredSize(new Dimension(40, 20)); - minColour.setToolTipText("Minimum Colour"); + minColour.setToolTipText(MessageManager.getString("label.min_colour")); minColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -198,7 +198,7 @@ public class FeatureColourChooser extends JalviewDialog maxColour.setFont(JvSwingUtils.getLabelFont()); maxColour.setBorder(BorderFactory.createLineBorder(Color.black)); maxColour.setPreferredSize(new Dimension(40, 20)); - maxColour.setToolTipText("Maximum Colour"); + maxColour.setToolTipText(MessageManager.getString("label.max_colour")); maxColour.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) @@ -225,10 +225,10 @@ public class FeatureColourChooser extends JalviewDialog threshold_actionPerformed(e); } }); - threshold.setToolTipText("Threshold the feature display by score."); - threshold.addItem("No Threshold"); // index 0 - threshold.addItem("Above Threshold"); // index 1 - threshold.addItem("Below Threshold"); // index 2 + threshold.setToolTipText(MessageManager.getString("label.threshold_feature_display_by_score")); + threshold.addItem(MessageManager.getString("label.threshold_feature_no_thereshold")); // index 0 + threshold.addItem(MessageManager.getString("label.threshold_feature_above_thereshold")); // index 1 + threshold.addItem(MessageManager.getString("label.threshold_feature_below_thereshold")); // index 2 jPanel3.setLayout(flowLayout2); thresholdValue.addActionListener(new ActionListener() { @@ -243,14 +243,14 @@ public class FeatureColourChooser extends JalviewDialog slider.setEnabled(false); slider.setOpaque(false); slider.setPreferredSize(new Dimension(100, 32)); - slider.setToolTipText("Adjust threshold"); + slider.setToolTipText(MessageManager.getString("label.adjust_thereshold")); thresholdValue.setEnabled(false); thresholdValue.setColumns(7); jPanel3.setBackground(Color.white); thresholdIsMin.setBackground(Color.white); thresholdIsMin.setText(MessageManager.getString("label.threshold_minmax")); thresholdIsMin - .setToolTipText("Toggle between absolute and relative display threshold."); + .setToolTipText(MessageManager.getString("label.toggle_absolute_relative_display_threshold")); thresholdIsMin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -261,7 +261,7 @@ public class FeatureColourChooser extends JalviewDialog colourByLabel.setBackground(Color.white); colourByLabel.setText(MessageManager.getString("label.colour_by_label")); colourByLabel - .setToolTipText("Display features of the same type with a different label using a different colour. (e.g. domain features)"); + .setToolTipText(MessageManager.getString("label.display_features_same_type_different_label_using_different_colour")); colourByLabel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -331,7 +331,7 @@ public class FeatureColourChooser extends JalviewDialog public void minColour_actionPerformed() { Color col = JColorChooser.showDialog(this, - "Select Colour for Minimum Value", minColour.getBackground()); + MessageManager.getString("label.select_colour_minimum_value"), minColour.getBackground()); if (col != null) { minColour.setBackground(col); @@ -344,7 +344,7 @@ public class FeatureColourChooser extends JalviewDialog public void maxColour_actionPerformed() { Color col = JColorChooser.showDialog(this, - "Select Colour for Maximum Value", maxColour.getBackground()); + MessageManager.getString("label.select_colour_maximum_value"), maxColour.getBackground()); if (col != null) { maxColour.setBackground(col); @@ -363,11 +363,11 @@ public class FeatureColourChooser extends JalviewDialog } int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD; - if (threshold.getSelectedItem().equals("Above Threshold")) + if (threshold.getSelectedIndex()==1) { aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD; } - else if (threshold.getSelectedItem().equals("Below Threshold")) + else if (threshold.getSelectedIndex()==2) { aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD; } diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java index 84d2284..c07fdcf 100644 --- a/src/jalview/gui/FeatureRenderer.java +++ b/src/jalview/gui/FeatureRenderer.java @@ -1118,7 +1118,7 @@ public class FeatureRenderer implements jalview.api.FeatureRenderer tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel(MessageManager.getString("label.group"), JLabel.RIGHT)); + tmp.add(new JLabel(MessageManager.getString("label.group")+":", JLabel.RIGHT)); tmp.add(source); tmp = new JPanel(); diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 4e9db60..689a402 100644 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -167,11 +167,11 @@ public class FeatureSettings extends JPanel frame.setContentPane(this); if (new jalview.util.Platform().isAMac()) { - Desktop.addInternalFrame(frame, "Sequence Feature Settings", 475, 480); + Desktop.addInternalFrame(frame, MessageManager.getString("label.sequence_feature_settings"), 475, 480); } else { - Desktop.addInternalFrame(frame, "Sequence Feature Settings", 400, 450); + Desktop.addInternalFrame(frame, MessageManager.getString("label.sequence_feature_settings"), 400, 450); } frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() @@ -189,8 +189,8 @@ public class FeatureSettings extends JPanel protected void popupSort(final int selectedRow, final String type, final Object typeCol, final Hashtable minmax, int x, int y) { - JPopupMenu men = new JPopupMenu("Settings for " + type); - JMenuItem scr = new JMenuItem("Sort by Score"); + JPopupMenu men = new JPopupMenu(MessageManager.formatMessage("label.settings_for_param", new String[]{type})); + JMenuItem scr = new JMenuItem(MessageManager.getString("label.sort_by_score")); men.add(scr); final FeatureSettings me = this; scr.addActionListener(new ActionListener() @@ -203,7 +203,7 @@ public class FeatureSettings extends JPanel } }); - JMenuItem dens = new JMenuItem("Sort by Density"); + JMenuItem dens = new JMenuItem(MessageManager.getString("label.sort_by_density")); dens.addActionListener(new ActionListener() { @@ -604,7 +604,7 @@ public class FeatureSettings extends JPanel { "Sequence Feature Colours" }, "Sequence Feature Colours"); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Load Feature Colours"); - chooser.setToolTipText("Load"); + chooser.setToolTipText(MessageManager.getString("action.load")); int value = chooser.showOpenDialog(this); @@ -702,7 +702,7 @@ public class FeatureSettings extends JPanel { "Sequence Feature Colours" }, "Sequence Feature Colours"); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Save Feature Colour Scheme"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -934,7 +934,7 @@ public class FeatureSettings extends JPanel } }); sortByDens.setFont(JvSwingUtils.getLabelFont()); - sortByDens.setText("Seq Sort by density"); + sortByDens.setText(MessageManager.getString("label.sequence_sort_by_density")); sortByDens.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 1149591..5e1897d 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -24,6 +24,7 @@ import javax.swing.*; import jalview.bin.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -81,12 +82,12 @@ public class FontChooser extends GFontChooser if (tp != null) { - Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 340, 170, + Desktop.addInternalFrame(frame, MessageManager.getString("action.change_font_tree_panel"), 340, 170, false); } else { - Desktop.addInternalFrame(frame, "Change Font", 340, 170, false); + Desktop.addInternalFrame(frame, MessageManager.getString("action.change_font"), 340, 170, false); } frame.setLayer(JLayeredPane.PALETTE_LAYER); diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index a6880c7..641ac62 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -59,8 +59,7 @@ public final class JvSwingUtils return "
" + ttext + "
"; } - } - + } public static JButton makeButton(String label, String tooltip, ActionListener action) { diff --git a/src/jalview/gui/OptsAndParamsPage.java b/src/jalview/gui/OptsAndParamsPage.java index 5186fc0..3bc99dd 100644 --- a/src/jalview/gui/OptsAndParamsPage.java +++ b/src/jalview/gui/OptsAndParamsPage.java @@ -18,6 +18,7 @@ */ package jalview.gui; +import jalview.util.MessageManager; import jalview.ws.params.ArgumentI; import jalview.ws.params.OptionI; import jalview.ws.params.ParameterI; @@ -768,7 +769,7 @@ public class OptsAndParamsPage { JPopupMenu mnu = new JPopupMenu(); - JMenuItem mitem = new JMenuItem("View " + finfo); + JMenuItem mitem = new JMenuItem(MessageManager.formatMessage("label.view_params", new String[]{finfo})); mitem.addActionListener(new ActionListener() { diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java index 538b245..5c8d08b 100644 --- a/src/jalview/gui/PCAPanel.java +++ b/src/jalview/gui/PCAPanel.java @@ -165,7 +165,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, if (getParent() == null) { addKeyListener(rc); - Desktop.addInternalFrame(this, "Principal component analysis", 475, + Desktop.addInternalFrame(this, MessageManager.getString("label.principal_component_analysis"), 475, 450); } } @@ -261,7 +261,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, try { cap.setText(pcaModel.getDetails()); - Desktop.addInternalFrame(cap, "PCA details", 500, 500); + Desktop.addInternalFrame(cap, MessageManager.getString("label.pca_details"), 500, 500); } catch (OutOfMemoryError oom) { new OOMWarning("opening PCA details", oom); @@ -335,7 +335,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, // af.addSortByOrderMenuItem(ServiceName + " Ordering", // msaorder); - Desktop.addInternalFrame(af, "Original Data for " + this.title, + Desktop.addInternalFrame(af, MessageManager.formatMessage("label.original_data_for_params", new String[]{this.title}), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } } @@ -524,7 +524,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, cap.setText(pcaModel.getPointsasCsv(false, xCombobox.getSelectedIndex(), yCombobox.getSelectedIndex(), zCombobox.getSelectedIndex())); - Desktop.addInternalFrame(cap, "Points for " + getTitle(), 500, 500); + Desktop.addInternalFrame(cap, MessageManager.formatMessage("label.points_for_params", new String[]{this.getTitle()}), 500, 500); } catch (OutOfMemoryError oom) { new OOMWarning("exporting PCA points", oom); @@ -547,7 +547,7 @@ public class PCAPanel extends GPCAPanel implements Runnable, cap.setText(pcaModel.getPointsasCsv(true, xCombobox.getSelectedIndex(), yCombobox.getSelectedIndex(), zCombobox.getSelectedIndex())); - Desktop.addInternalFrame(cap, "Transformed points for " + getTitle(), + Desktop.addInternalFrame(cap, MessageManager.formatMessage("label.transformed_points_for_params", new String[]{this.getTitle()}), 500, 500); } catch (OutOfMemoryError oom) { diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java index 5d3a1b0..6738556 100755 --- a/src/jalview/gui/PairwiseAlignPanel.java +++ b/src/jalview/gui/PairwiseAlignPanel.java @@ -19,12 +19,12 @@ package jalview.gui; import java.util.*; - import java.awt.event.*; import jalview.analysis.*; import jalview.datamodel.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -149,7 +149,7 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel AlignFrame af = new AlignFrame(new Alignment(seq), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - Desktop.addInternalFrame(af, "Pairwise Aligned Sequences", + Desktop.addInternalFrame(af, MessageManager.getString("label.pairwise_aligned_sequences"), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } } diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java index 7e8c573..0e39f34 100644 --- a/src/jalview/gui/PopupMenu.java +++ b/src/jalview/gui/PopupMenu.java @@ -32,6 +32,7 @@ import jalview.io.*; import jalview.schemes.*; import jalview.util.GroupUrlLink; import jalview.util.GroupUrlLink.UrlStringTooLongException; +import jalview.util.MessageManager; import jalview.util.UrlLink; /** @@ -279,7 +280,7 @@ public class PopupMenu extends JPopupMenu final String rnastruc = aa[i].getRNAStruc(); final String structureLine = aa[i].label; menuItem = new JMenuItem(); - menuItem.setText("2D RNA " + structureLine); + menuItem.setText(MessageManager.formatMessage("label.2d_rna_structure_line", new String[]{structureLine})); menuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -305,7 +306,7 @@ public class PopupMenu extends JPopupMenu // TODO: make rnastrucF a bit more nice menuItem = new JMenuItem(); - menuItem.setText("2D RNA - " + seq.getName()); + menuItem.setText(MessageManager.formatMessage("label.2d_rna_sequence_name", new String[]{seq.getName()})); menuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -323,7 +324,7 @@ public class PopupMenu extends JPopupMenu } - menuItem = new JMenuItem("Hide Sequences"); + menuItem = new JMenuItem(MessageManager.getString("action.hide_sequences")); menuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -336,7 +337,7 @@ public class PopupMenu extends JPopupMenu if (ap.av.getSelectionGroup() != null && ap.av.getSelectionGroup().getSize() > 1) { - menuItem = new JMenuItem("Represent Group with " + seq.getName()); + menuItem = new JMenuItem(MessageManager.formatMessage("label.represent_group_with", new String[]{seq.getName()})); menuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -354,7 +355,7 @@ public class PopupMenu extends JPopupMenu if (ap.av.adjustForHiddenSeqs(index) - ap.av.adjustForHiddenSeqs(index - 1) > 1) { - menuItem = new JMenuItem("Reveal Sequences"); + menuItem = new JMenuItem(MessageManager.getString("action.reveal_sequences")); menuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -374,7 +375,7 @@ public class PopupMenu extends JPopupMenu if (ap.av.hasHiddenRows()) { { - menuItem = new JMenuItem("Reveal All"); + menuItem = new JMenuItem(MessageManager.getString("action.reveal_all")); menuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -397,8 +398,8 @@ public class PopupMenu extends JPopupMenu if (sg != null && sg.getSize() > 0) { - groupName.setText("Name: " + sg.getName()); - groupName.setText("Edit name and description of current group."); + groupName.setText(MessageManager.formatMessage("label.name_param", new String[]{sg.getName()})); + groupName.setText(MessageManager.getString("label.edit_name_and_description_current_group")); if (sg.cs instanceof ZappoColourScheme) { @@ -496,15 +497,13 @@ public class PopupMenu extends JPopupMenu final JMenuItem gpdbview; if (pdbe.size() == 1) { - structureMenu.add(gpdbview = new JMenuItem("View structure for " - + sqass.getDisplayId(false))); + structureMenu.add(gpdbview = new JMenuItem(MessageManager.formatMessage("label.view_structure_for", new String[]{sqass.getDisplayId(false)}))); } else { - structureMenu.add(gpdbview = new JMenuItem("View all " - + pdbe.size() + " structures.")); + structureMenu.add(gpdbview = new JMenuItem(MessageManager.formatMessage("label.view_all_structures", new String[]{new Integer(pdbe.size()).toString()}))); } - gpdbview.setToolTipText("Open a new Jmol view with all structures associated with the current selection and superimpose them using the alignment."); + gpdbview.setToolTipText(MessageManager.getString("label.open_new_jmol_view_with_all_structures_associated_current_selection_superimpose_using_alignment")); gpdbview.addActionListener(new ActionListener() { @@ -526,11 +525,11 @@ public class PopupMenu extends JPopupMenu { createGroupMenuItem.setVisible(true); unGroupMenuItem.setVisible(false); - jMenu1.setText("Edit New Group"); + jMenu1.setText(MessageManager.getString("action.edit_new_group")); } else { createGroupMenuItem.setVisible(false); unGroupMenuItem.setVisible(true); - jMenu1.setText("Edit Group"); + jMenu1.setText(MessageManager.getString("action.edit_group")); } if (seq == null) @@ -542,7 +541,7 @@ public class PopupMenu extends JPopupMenu if (links != null && links.size() > 0) { - JMenu linkMenu = new JMenu("Link"); + JMenu linkMenu = new JMenu(MessageManager.getString("action.link")); Vector linkset = new Vector(); for (int i = 0; i < links.size(); i++) { @@ -669,10 +668,10 @@ public class PopupMenu extends JPopupMenu // menu appears asap // sequence only URLs // ID/regex match URLs - groupLinksMenu = new JMenu("Group Link"); + groupLinksMenu = new JMenu(MessageManager.getString("action.group_link")); JMenu[] linkMenus = new JMenu[] - { null, new JMenu("IDS"), new JMenu("Sequences"), - new JMenu("IDS and Sequences") }; // three types of url that might be + { null, new JMenu(MessageManager.getString("action.ids")), new JMenu(MessageManager.getString("action.sequences")), + new JMenu(MessageManager.getString("action.ids_sequences")) }; // three types of url that might be // created. SequenceI[] seqs = ap.av.getSelectionAsNewSequence(); String[][] idandseqs = GroupUrlLink.formStrings(seqs); @@ -795,7 +794,7 @@ public class PopupMenu extends JPopupMenu } if (addMenu) { - groupLinksMenu = new JMenu("Group Links"); + groupLinksMenu = new JMenu(MessageManager.getString("action.group_link")); for (int m = 0; m < linkMenus.length; m++) { if (linkMenus[m] != null @@ -821,7 +820,7 @@ public class PopupMenu extends JPopupMenu private void addshowLink(JMenu linkMenu, String label, final String url) { JMenuItem item = new JMenuItem(label); - item.setToolTipText("open URL: " + url); + item.setToolTipText(MessageManager.formatMessage("label.open_url_param", new String[]{url})); item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -856,16 +855,8 @@ public class PopupMenu extends JPopupMenu final GroupUrlLink urlgenerator, final Object[] urlstub) { JMenuItem item = new JMenuItem(label); - item.setToolTipText("open URL (" + urlgenerator.getUrl_prefix() - + "..) (" + urlgenerator.getNumberInvolved(urlstub) + " seqs)"); // TODO: - // put - // in - // info - // about - // what - // is - // being - // sent. + item.setToolTipText(MessageManager.formatMessage("label.open_url_seqs_param", new Object[]{urlgenerator.getUrl_prefix(),urlgenerator.getNumberInvolved(urlstub)})); + // TODO: put in info about what is being sent. item.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -898,9 +889,9 @@ public class PopupMenu extends JPopupMenu */ private void jbInit() throws Exception { - groupMenu.setText("Group"); - groupMenu.setText("Selection"); - groupName.setText("Name"); + groupMenu.setText(MessageManager.getString("label.group")); + groupMenu.setText(MessageManager.getString("label.selection")); + groupName.setText(MessageManager.getString("label.name")); groupName.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -908,8 +899,8 @@ public class PopupMenu extends JPopupMenu groupName_actionPerformed(); } }); - sequenceMenu.setText("Sequence"); - sequenceName.setText("Edit Name/Description"); + sequenceMenu.setText(MessageManager.getString("label.sequence")); + sequenceName.setText(MessageManager.getString("label.edit_name_description")); sequenceName.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -917,7 +908,7 @@ public class PopupMenu extends JPopupMenu sequenceName_actionPerformed(); } }); - sequenceDetails.setText("Sequence Details ..."); + sequenceDetails.setText(MessageManager.getString("label.sequence_details") + "..."); sequenceDetails.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -925,7 +916,7 @@ public class PopupMenu extends JPopupMenu sequenceDetails_actionPerformed(); } }); - sequenceSelDetails.setText("Sequence Details ..."); + sequenceSelDetails.setText(MessageManager.getString("label.sequence_details") + "..."); sequenceSelDetails .addActionListener(new java.awt.event.ActionListener() { @@ -935,7 +926,7 @@ public class PopupMenu extends JPopupMenu } }); PIDColour.setFocusPainted(false); - unGroupMenuItem.setText("Remove Group"); + unGroupMenuItem.setText(MessageManager.getString("action.remove_group")); unGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -943,7 +934,7 @@ public class PopupMenu extends JPopupMenu unGroupMenuItem_actionPerformed(); } }); - createGroupMenuItem.setText("Create Group"); + createGroupMenuItem.setText(MessageManager.getString("action.create_group")); createGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -952,7 +943,7 @@ public class PopupMenu extends JPopupMenu } }); - outline.setText("Border colour"); + outline.setText(MessageManager.getString("action.border_colour")); outline.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -960,7 +951,7 @@ public class PopupMenu extends JPopupMenu outline_actionPerformed(); } }); - nucleotideMenuItem.setText("Nucleotide"); + nucleotideMenuItem.setText(MessageManager.getString("label.nucleotide")); nucleotideMenuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -968,8 +959,8 @@ public class PopupMenu extends JPopupMenu nucleotideMenuItem_actionPerformed(); } }); - colourMenu.setText("Group Colour"); - showBoxes.setText("Boxes"); + colourMenu.setText(MessageManager.getString("label.group_colour")); + showBoxes.setText(MessageManager.getString("action.boxes")); showBoxes.setState(true); showBoxes.addActionListener(new ActionListener() { @@ -978,7 +969,7 @@ public class PopupMenu extends JPopupMenu showBoxes_actionPerformed(); } }); - showText.setText("Text"); + showText.setText(MessageManager.getString("action.text")); showText.setState(true); showText.addActionListener(new ActionListener() { @@ -987,7 +978,7 @@ public class PopupMenu extends JPopupMenu showText_actionPerformed(); } }); - showColourText.setText("Colour Text"); + showColourText.setText(MessageManager.getString("label.colour_text")); showColourText.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -995,7 +986,7 @@ public class PopupMenu extends JPopupMenu showColourText_actionPerformed(); } }); - displayNonconserved.setText("Show Nonconserved"); + displayNonconserved.setText(MessageManager.getString("label.show_non_conversed")); displayNonconserved.setState(true); displayNonconserved.addActionListener(new ActionListener() { @@ -1004,8 +995,8 @@ public class PopupMenu extends JPopupMenu showNonconserved_actionPerformed(); } }); - editMenu.setText("Edit"); - cut.setText("Cut"); + editMenu.setText(MessageManager.getString("action.edit")); + cut.setText(MessageManager.getString("action.cut")); cut.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1013,7 +1004,7 @@ public class PopupMenu extends JPopupMenu cut_actionPerformed(); } }); - upperCase.setText("To Upper Case"); + upperCase.setText(MessageManager.getString("label.to_upper_case")); upperCase.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1021,7 +1012,7 @@ public class PopupMenu extends JPopupMenu changeCase(e); } }); - copy.setText("Copy"); + copy.setText(MessageManager.getString("action.copy")); copy.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1029,7 +1020,7 @@ public class PopupMenu extends JPopupMenu copy_actionPerformed(); } }); - lowerCase.setText("To Lower Case"); + lowerCase.setText(MessageManager.getString("label.to_lower_case")); lowerCase.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1037,7 +1028,7 @@ public class PopupMenu extends JPopupMenu changeCase(e); } }); - toggle.setText("Toggle Case"); + toggle.setText(MessageManager.getString("label.toggle_case")); toggle.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1045,8 +1036,8 @@ public class PopupMenu extends JPopupMenu changeCase(e); } }); - pdbMenu.setText("Associate Structure with Sequence"); - pdbFromFile.setText("From File"); + pdbMenu.setText(MessageManager.getString("label.associate_structure_with_sequence")); + pdbFromFile.setText(MessageManager.getString("label.from_file")); pdbFromFile.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1054,7 +1045,7 @@ public class PopupMenu extends JPopupMenu pdbFromFile_actionPerformed(); } }); - enterPDB.setText("Enter PDB Id"); + enterPDB.setText(MessageManager.getString("label.enter_pdb_id")); enterPDB.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1062,7 +1053,7 @@ public class PopupMenu extends JPopupMenu enterPDB_actionPerformed(); } }); - discoverPDB.setText("Discover PDB ids"); + discoverPDB.setText(MessageManager.getString("label.discover_pdb_ids")); discoverPDB.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1070,8 +1061,8 @@ public class PopupMenu extends JPopupMenu discoverPDB_actionPerformed(); } }); - outputMenu.setText("Output to Textbox..."); - sequenceFeature.setText("Create Sequence Feature"); + outputMenu.setText(MessageManager.getString("label.out_to_textbox") + "..."); + sequenceFeature.setText(MessageManager.getString("label.create_sequence_feature")); sequenceFeature.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1079,7 +1070,7 @@ public class PopupMenu extends JPopupMenu sequenceFeature_actionPerformed(); } }); - textColour.setText("Text Colour"); + textColour.setText(MessageManager.getString("label.text_colour")); textColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1087,11 +1078,11 @@ public class PopupMenu extends JPopupMenu textColour_actionPerformed(); } }); - jMenu1.setText("Group"); - structureMenu.setText("Structure"); - viewStructureMenu.setText("View Structure"); + jMenu1.setText(MessageManager.getString("label.group")); + structureMenu.setText(MessageManager.getString("label.structure")); + viewStructureMenu.setText(MessageManager.getString("label.view_structure")); // colStructureMenu.setText("Colour By Structure"); - editSequence.setText("Edit Sequence..."); + editSequence.setText(MessageManager.getString("label.edit_sequence") + "..."); editSequence.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -1180,7 +1171,7 @@ public class PopupMenu extends JPopupMenu structureMenu.add(pdbMenu); structureMenu.add(viewStructureMenu); // structureMenu.add(colStructureMenu); - noColourmenuItem.setText("None"); + noColourmenuItem.setText(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1189,7 +1180,7 @@ public class PopupMenu extends JPopupMenu } }); - clustalColour.setText("Clustalx colours"); + clustalColour.setText(MessageManager.getString("label.clustalx_colours")); clustalColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1197,7 +1188,7 @@ public class PopupMenu extends JPopupMenu clustalColour_actionPerformed(); } }); - zappoColour.setText("Zappo"); + zappoColour.setText(MessageManager.getString("label.zappo")); zappoColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1205,7 +1196,7 @@ public class PopupMenu extends JPopupMenu zappoColour_actionPerformed(); } }); - taylorColour.setText("Taylor"); + taylorColour.setText(MessageManager.getString("label.taylor")); taylorColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1213,7 +1204,7 @@ public class PopupMenu extends JPopupMenu taylorColour_actionPerformed(); } }); - hydrophobicityColour.setText("Hydrophobicity"); + hydrophobicityColour.setText(MessageManager.getString("label.hydrophobicity")); hydrophobicityColour .addActionListener(new java.awt.event.ActionListener() { @@ -1222,7 +1213,7 @@ public class PopupMenu extends JPopupMenu hydrophobicityColour_actionPerformed(); } }); - helixColour.setText("Helix propensity"); + helixColour.setText(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1230,7 +1221,7 @@ public class PopupMenu extends JPopupMenu helixColour_actionPerformed(); } }); - strandColour.setText("Strand propensity"); + strandColour.setText(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1238,7 +1229,7 @@ public class PopupMenu extends JPopupMenu strandColour_actionPerformed(); } }); - turnColour.setText("Turn propensity"); + turnColour.setText(MessageManager.getString("label.turn_propensity")); turnColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1246,7 +1237,7 @@ public class PopupMenu extends JPopupMenu turnColour_actionPerformed(); } }); - buriedColour.setText("Buried Index"); + buriedColour.setText(MessageManager.getString("label.buried_index")); buriedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1254,7 +1245,7 @@ public class PopupMenu extends JPopupMenu buriedColour_actionPerformed(); } }); - abovePIDColour.setText("Above % Identity"); + abovePIDColour.setText(MessageManager.getString("label.above_identity_percentage")); abovePIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1262,7 +1253,7 @@ public class PopupMenu extends JPopupMenu abovePIDColour_actionPerformed(); } }); - userDefinedColour.setText("User Defined..."); + userDefinedColour.setText(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1270,7 +1261,7 @@ public class PopupMenu extends JPopupMenu userDefinedColour_actionPerformed(e); } }); - PIDColour.setText("Percentage Identity"); + PIDColour.setText(MessageManager.getString("label.percentage_identity")); PIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1278,7 +1269,7 @@ public class PopupMenu extends JPopupMenu PIDColour_actionPerformed(); } }); - BLOSUM62Colour.setText("BLOSUM62"); + BLOSUM62Colour.setText(MessageManager.getString("label.blosum62")); BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1286,7 +1277,7 @@ public class PopupMenu extends JPopupMenu BLOSUM62Colour_actionPerformed(); } }); - purinePyrimidineColour.setText("Purine/Pyrimidine"); + purinePyrimidineColour.setText(MessageManager.getString("label.purine_pyrimidine")); purinePyrimidineColour .addActionListener(new java.awt.event.ActionListener() { @@ -1301,7 +1292,7 @@ public class PopupMenu extends JPopupMenu * covariationColour_actionPerformed(); } }); */ - conservationMenuItem.setText("Conservation"); + conservationMenuItem.setText(MessageManager.getString("label.conservation")); conservationMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -1329,7 +1320,7 @@ public class PopupMenu extends JPopupMenu StringBuffer contents = new StringBuffer(); for (SequenceI seq : sequences) { - contents.append("

Annotation for " + seq.getDisplayId(true) + contents.append("

" + MessageManager.formatMessage("label.create_sequence_details_report_annotation_for", new String[]{seq.getDisplayId(true)}) + "

"); new SequenceAnnotationReport(null) .createSequenceAnnotationReport( @@ -1344,9 +1335,8 @@ public class PopupMenu extends JPopupMenu } cap.setText("" + contents.toString() + ""); - Desktop.instance.addInternalFrame(cap, "Sequence Details for " - + (sequences.length == 1 ? sequences[0].getDisplayId(true) - : "Selection"), 500, 400); + Desktop.instance.addInternalFrame(cap, MessageManager.formatMessage("label.sequece_details_for", (sequences.length == 1 ? new String[]{sequences[0].getDisplayId(true)}: new String[]{MessageManager.getString("label.selection")})) + ,500, 400); } @@ -1532,7 +1522,7 @@ public class PopupMenu extends JPopupMenu { SequenceGroup sg = getGroup(); - if (e.getActionCommand().equals("User Defined...")) + if (e.getSource().equals(userDefinedColour)) { new UserDefinedColours(ap, sg); } @@ -1609,6 +1599,7 @@ public class PopupMenu extends JPopupMenu if (conservationMenuItem.isSelected()) { + // JBPNote: Conservation name shouldn't be i18n translated Conservation c = new Conservation("Group", ResidueProperties.propHash, 3, sg.getSequences(ap.av .getHiddenRepSequences()), sg.getStartRes(), @@ -1660,8 +1651,8 @@ public class PopupMenu extends JPopupMenu SequenceGroup sg = getGroup(); EditNameDialog dialog = new EditNameDialog(sg.getName(), - sg.getDescription(), " Group Name ", - "Group Description ", "Edit Group Name/Description", + sg.getDescription(), " " + MessageManager.getString("label.group_name") + " ", + MessageManager.getString("label.group_description") + " ", MessageManager.getString("label.edit_group_name_description"), ap.alignFrame); if (!dialog.accept) @@ -1700,8 +1691,8 @@ public class PopupMenu extends JPopupMenu void sequenceName_actionPerformed() { EditNameDialog dialog = new EditNameDialog(sequence.getName(), - sequence.getDescription(), " Sequence Name ", - "Sequence Description ", "Edit Sequence Name/Description", + sequence.getDescription(), " " + MessageManager.getString("label.sequence_name") + " ", + MessageManager.getString("label.sequence_description") + " ", MessageManager.getString("label.edit_sequence_name_description"), ap.alignFrame); if (!dialog.accept) @@ -1714,8 +1705,8 @@ public class PopupMenu extends JPopupMenu if (dialog.getName().indexOf(" ") > -1) { JOptionPane.showMessageDialog(ap, - "Spaces have been converted to \"_\"", - "No spaces allowed in Sequence Name", + MessageManager.getString("label.spaces_converted_to_backslashes"), + MessageManager.getString("label.no_spaces_allowed_sequence_name"), JOptionPane.WARNING_MESSAGE); } @@ -1758,7 +1749,7 @@ public class PopupMenu extends JPopupMenu protected void outline_actionPerformed() { SequenceGroup sg = getGroup(); - Color col = JColorChooser.showDialog(this, "Select Outline Colour", + Color col = JColorChooser.showDialog(this, MessageManager.getString("label.select_outline_colour"), Color.BLUE); if (col != null) @@ -1815,9 +1806,8 @@ public class PopupMenu extends JPopupMenu JOptionPane .showInternalMessageDialog( Desktop.desktop, - "Unixers: Couldn't find default web browser." - + "\nAdd the full path to your browser in Preferences.", - "Web browser not found", JOptionPane.WARNING_MESSAGE); + MessageManager.getString("label.web_browser_not_found_unix"), + MessageManager.getString("label.web_browser_not_found"), JOptionPane.WARNING_MESSAGE); ex.printStackTrace(); } @@ -1883,17 +1873,17 @@ public class PopupMenu extends JPopupMenu if (source == toggle) { - description = "Toggle Case"; + description = MessageManager.getString("label.toggle_case"); caseChange = ChangeCaseCommand.TOGGLE_CASE; } else if (source == upperCase) { - description = "To Upper Case"; + description = MessageManager.getString("label.to_upper_case"); caseChange = ChangeCaseCommand.TO_UPPER; } else { - description = "To Lower Case"; + description = MessageManager.getString("label.to_lower_case"); caseChange = ChangeCaseCommand.TO_LOWER; } @@ -1914,7 +1904,7 @@ public class PopupMenu extends JPopupMenu CutAndPasteTransfer cap = new CutAndPasteTransfer(); cap.setForInput(null); Desktop.addInternalFrame(cap, - "Alignment output - " + e.getActionCommand(), 600, 500); + MessageManager.formatMessage("label.alignment_output_command", new String[]{e.getActionCommand()}), 600, 500); String[] omitHidden = null; @@ -1945,10 +1935,8 @@ public class PopupMenu extends JPopupMenu jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser( jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Select a PDB file for " - + sequence.getDisplayId(false)); - chooser.setToolTipText("Load a PDB file and associate it with sequence '" - + sequence.getDisplayId(false) + "'"); + chooser.setDialogTitle(MessageManager.formatMessage("label.select_pdb_file_for", new String[]{sequence.getDisplayId(false)})); + chooser.setToolTipText(MessageManager.formatMessage("label.load_pdb_file_associate_with_sequence", new String[]{new Integer(sequence.getDisplayId(false)).toString()})); int value = chooser.showOpenDialog(null); @@ -1965,7 +1953,7 @@ public class PopupMenu extends JPopupMenu public void enterPDB_actionPerformed() { String id = JOptionPane.showInternalInputDialog(Desktop.desktop, - "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE); + MessageManager.getString("label.enter_pdb_id"), MessageManager.getString("label.enter_pdb_id"), JOptionPane.QUESTION_MESSAGE); if (id != null && id.length() > 0) { @@ -2071,12 +2059,12 @@ public class PopupMenu extends JPopupMenu EditNameDialog dialog = new EditNameDialog( sequence.getSequenceAsString(sg.getStartRes(), - sg.getEndRes() + 1), null, "Edit Sequence ", null, - "Edit Sequence", ap.alignFrame); + sg.getEndRes() + 1), null, MessageManager.getString("label.edit_sequence"), null, + MessageManager.getString("label.edit_sequence"), ap.alignFrame); if (dialog.accept) { - EditCommand editCommand = new EditCommand("Edit Sequences", + EditCommand editCommand = new EditCommand(MessageManager.getString("label.edit_sequences"), EditCommand.REPLACE, dialog.getName().replace(' ', ap.av.getGapCharacter()), sg.getSequencesAsArray(ap.av.getHiddenRepSequences()), diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index bc456ad..2a31518 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -132,7 +132,7 @@ public class Preferences extends GPreferences height = 460; } - Desktop.addInternalFrame(frame, "Preferences", width, height); + Desktop.addInternalFrame(frame, MessageManager.getString("label.preferences"), width, height); frame.setMinimumSize(new Dimension(width, height)); seqLimit.setSelected(Cache.getDefault("SHOW_JVSUFFIX", true)); diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java index 09fbbb0..3ff0ca3 100755 --- a/src/jalview/gui/RedundancyPanel.java +++ b/src/jalview/gui/RedundancyPanel.java @@ -28,6 +28,7 @@ import jalview.analysis.AlignSeq; import jalview.commands.*; import jalview.datamodel.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -74,7 +75,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable } }); - applyButton.setText("Remove"); + applyButton.setText(MessageManager.getString("action.remove")); allGroupsCheck.setVisible(false); slider.setMinimum(0); slider.setMaximum(100); @@ -85,7 +86,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable frame = new JInternalFrame(); frame.setContentPane(this); - Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400, + Desktop.addInternalFrame(frame, MessageManager.getString("label.redundancy_threshold_selection"), 400, 100, false); frame.addInternalFrameListener(new InternalFrameAdapter() { @@ -115,7 +116,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable progress.setIndeterminate(true); southPanel.add(progress, java.awt.BorderLayout.SOUTH); - label.setText("Calculating...."); + label.setText(MessageManager.getString("label.calculating")); slider.setVisible(false); applyButton.setEnabled(false); diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java index 2a6bb72..2507ceb 100644 --- a/src/jalview/gui/RestServiceEditorPane.java +++ b/src/jalview/gui/RestServiceEditorPane.java @@ -20,6 +20,7 @@ package jalview.gui; import jalview.io.packed.DataProvider.JvDataType; import jalview.jbgui.GRestServiceEditorPane; +import jalview.util.MessageManager; import jalview.ws.rest.InputType; import jalview.ws.rest.RestServiceDescription; @@ -267,7 +268,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane final int rdatasel = rdata.getSelectedIndex(); if (rdatasel > -1) { - JPopupMenu popup = new JPopupMenu("Select return type"); + JPopupMenu popup = new JPopupMenu(MessageManager.getString("label.select_return_type")); for (final JvDataType type : JvDataType.values()) { popup.add(new JMenuItem(type.name())).addActionListener( @@ -428,15 +429,13 @@ public class RestServiceEditorPane extends GRestServiceEditorPane } else { - parseRes.setText("Parsing failed. Syntax errors shown below\n" - + rsd.getInvalidMessage()); + parseRes.setText(MessageManager.formatMessage("label.parsing_failed_syntax_errors_shown_below_param", new String[]{rsd.getInvalidMessage()})); parseWarnings.setVisible(true); } } catch (Throwable e) { e.printStackTrace(); - parseRes.setText("\nParsing failed. An unrecoverable exception was thrown:\n" - + e.toString()); + parseRes.setText(MessageManager.formatMessage("label.parsing_failed_unrecoverable_exception_thrown_param", new String[]{e.toString()})); parseWarnings.setVisible(true); } } diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index a1e8e25..416b787 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -95,7 +95,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, JPopupMenu pop = new JPopupMenu(); if (reveal != null) { - JMenuItem item = new JMenuItem("Reveal"); + JMenuItem item = new JMenuItem(MessageManager.getString("label.reveal")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -113,7 +113,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, if (av.getColumnSelection().getHiddenColumns().size() > 1) { - item = new JMenuItem("Reveal All"); + item = new JMenuItem(MessageManager.getString("action.reveal_all")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -133,7 +133,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, } else if (av.getColumnSelection().contains(res)) { - JMenuItem item = new JMenuItem("Hide Columns"); + JMenuItem item = new JMenuItem(MessageManager.getString("label.hide_columns")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -358,7 +358,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, { reveal = region; ToolTipManager.sharedInstance().registerComponent(this); - this.setToolTipText("Reveal Hidden Columns with Right Mouse Button"); + this.setToolTipText(MessageManager.getString("label.reveal_hidden_columns")); break; } else diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index 94c4f66..435d218 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -229,13 +229,13 @@ public class SequenceFetcher extends JPanel implements Runnable dbeg.setFont(new java.awt.Font("Verdana", Font.BOLD, 11)); jLabel1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); jLabel1.setHorizontalAlignment(SwingConstants.CENTER); - jLabel1.setText("Separate multiple accession ids with semi colon \";\""); + jLabel1.setText(MessageManager.getString("label.separate_multiple_accession_ids")); replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER); replacePunctuation .setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); - replacePunctuation.setText("Replace commas with semi-colons"); - ok.setText("OK"); + replacePunctuation.setText(MessageManager.getString("label.replace_commas_semicolons")); + ok.setText(MessageManager.getString("action.ok")); ok.addActionListener(new ActionListener() { @Override @@ -244,7 +244,7 @@ public class SequenceFetcher extends JPanel implements Runnable ok_actionPerformed(); } }); - clear.setText("Clear"); + clear.setText(MessageManager.getString("action.clear")); clear.addActionListener(new ActionListener() { @Override @@ -254,7 +254,7 @@ public class SequenceFetcher extends JPanel implements Runnable } }); - example.setText("Example"); + example.setText(MessageManager.getString("label.example")); example.addActionListener(new ActionListener() { @Override @@ -263,7 +263,7 @@ public class SequenceFetcher extends JPanel implements Runnable example_actionPerformed(); } }); - close.setText("Close"); + close.setText(MessageManager.getString("action.close")); close.addActionListener(new ActionListener() { @Override @@ -306,7 +306,7 @@ public class SequenceFetcher extends JPanel implements Runnable + database.getSelectedSources().size() + " others)" : "")); String eq = database.getExampleQueries(); - dbeg.setText("Example query: " + eq); + dbeg.setText(MessageManager.formatMessage("label.example_query_param", new String[]{eq})); boolean enablePunct = !(eq != null && eq.indexOf(",") > -1); for (DbSourceProxy dbs : database.getSelectedSources()) { @@ -804,7 +804,7 @@ public class SequenceFetcher extends JPanel implements Runnable Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - af.statusBar.setText("Successfully pasted alignment file"); + af.statusBar.setText(MessageManager.getString("label.successfully_pasted_alignment_file")); try { diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index b9596b4..3eff177 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -27,6 +27,7 @@ import javax.swing.event.*; import jalview.datamodel.*; import jalview.jbgui.*; import jalview.schemes.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -69,13 +70,13 @@ public class SliderPanel extends GSliderPanel if (forConservation) { - label.setText("Enter value to increase conservation visibility"); + label.setText(MessageManager.getString("label.enter_value_increase_conservation_visibility")); slider.setMinimum(0); slider.setMaximum(100); } else { - label.setText("Enter % identity above which to colour residues"); + label.setText(MessageManager.getString("label.enter_percentage_identity_above_which_colour_residues")); slider.setMinimum(0); slider.setMaximum(100); } diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index 5760d0f..5eadc51 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -24,6 +24,7 @@ import javax.swing.*; import javax.swing.event.*; import jalview.datamodel.*; +import jalview.util.MessageManager; public class TextColourChooser { @@ -54,12 +55,12 @@ public class TextColourChooser final JPanel col1 = new JPanel(); col1.setPreferredSize(new Dimension(40, 20)); col1.setBorder(BorderFactory.createEtchedBorder()); - col1.setToolTipText("Dark Colour"); + col1.setToolTipText(MessageManager.getString("label.dark_colour")); col1.setBackground(new Color(original1)); final JPanel col2 = new JPanel(); col2.setPreferredSize(new Dimension(40, 20)); col2.setBorder(BorderFactory.createEtchedBorder()); - col2.setToolTipText("Light Colour"); + col2.setToolTipText(MessageManager.getString("label.ligth_colour")); col2.setBackground(new Color(original2)); final JPanel bigpanel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(); diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index 900ef1d..9e2e582 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -791,9 +791,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (ob instanceof SequenceNode) { highlightNode = (SequenceNode) ob; - this.setToolTipText("Left click to select leaves" - + "
Double-click to invert leaves" - + "
Right click to change colour"); + this.setToolTipText("" + MessageManager.getString("label.highlightnode")); repaint(); } diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java index 8832bfa..7f85594 100755 --- a/src/jalview/gui/TreePanel.java +++ b/src/jalview/gui/TreePanel.java @@ -37,6 +37,7 @@ import jalview.commands.OrderCommand; import jalview.datamodel.*; import jalview.io.*; import jalview.jbgui.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -397,7 +398,7 @@ public class TreePanel extends GTreePanel jalview.bin.Cache.getProperty("LAST_DIRECTORY")); chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save tree as newick file"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(null); @@ -489,7 +490,7 @@ public class TreePanel extends GTreePanel // af.addSortByOrderMenuItem(ServiceName + " Ordering", // msaorder); - Desktop.addInternalFrame(af, "Original Data for " + this.title, + Desktop.addInternalFrame(af, MessageManager.formatMessage("label.original_data_for_params", new String[]{this.title}), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } } @@ -691,7 +692,7 @@ public class TreePanel extends GTreePanel { "Encapsulated Postscript" }, "Encapsulated Postscript"); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Create EPS file from tree"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); @@ -738,7 +739,7 @@ public class TreePanel extends GTreePanel chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Create PNG image from tree"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java index 053d38d..a2dedd5 100755 --- a/src/jalview/gui/UserDefinedColours.java +++ b/src/jalview/gui/UserDefinedColours.java @@ -144,7 +144,7 @@ public class UserDefinedColours extends GUserDefinedColours implements colorChooser.getSelectionModel().addChangeListener(this); frame = new JInternalFrame(); frame.setContentPane(this); - Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true); + Desktop.addInternalFrame(frame, MessageManager.getString("label.user_defined_colours"), 720, 370, true); if (seqGroup != null) { @@ -504,8 +504,8 @@ public class UserDefinedColours extends GUserDefinedColours implements { "jc" }, new String[] { "Jalview User Colours" }, "Jalview User Colours"); chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle("Load colour scheme"); - chooser.setToolTipText("Load"); + chooser.setDialogTitle(MessageManager.getString("label.load_colour_scheme")); + chooser.setToolTipText(MessageManager.getString("action.load")); int value = chooser.showOpenDialog(this); @@ -738,7 +738,7 @@ public class UserDefinedColours extends GUserDefinedColours implements chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Save colour scheme"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(this); diff --git a/src/jalview/gui/ViewSelectionMenu.java b/src/jalview/gui/ViewSelectionMenu.java index f1b24c6..e2bda4c 100644 --- a/src/jalview/gui/ViewSelectionMenu.java +++ b/src/jalview/gui/ViewSelectionMenu.java @@ -18,6 +18,8 @@ */ package jalview.gui; +import jalview.util.MessageManager; + import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -148,7 +150,7 @@ public class ViewSelectionMenu extends JMenu append = append || _selectedviews.size() > 1; toggleview = new JCheckBoxMenuItem("Select many views", append); toggleview - .setToolTipText("When enabled, allows many views to be selected."); + .setToolTipText(MessageManager.getString("label.toggle_enabled_views")); toggleview.addItemListener(new ItemListener() { @@ -166,7 +168,7 @@ public class ViewSelectionMenu extends JMenu }); add(toggleview); - add(selectAll = new JMenuItem("Select all views")); + add(selectAll = new JMenuItem(MessageManager.getString("label.select_all_views"))); selectAll.addActionListener(new ActionListener() { @@ -188,7 +190,7 @@ public class ViewSelectionMenu extends JMenu } } }); - add(invertSel = new JMenuItem("Invert selection")); + add(invertSel = new JMenuItem(MessageManager.getString("label.invert_selection"))); invertSel.addActionListener(new ActionListener() { diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java index f3f1ba8..9b02401 100644 --- a/src/jalview/gui/WsJobParameters.java +++ b/src/jalview/gui/WsJobParameters.java @@ -263,8 +263,8 @@ public class WsJobParameters extends JPanel implements ItemListener, } }); - updatepref = JvSwingUtils.makeButton("Update", - "Update this existing user parameter set.", + updatepref = JvSwingUtils.makeButton(MessageManager.getString("action.update"), + MessageManager.getString("label.update_user_parameter_set"), new ActionListener() { @@ -273,8 +273,8 @@ public class WsJobParameters extends JPanel implements ItemListener, update_actionPerformed(e); } }); - deletepref = JvSwingUtils.makeButton("Delete", - "Delete the currently selected user parameter set.", + deletepref = JvSwingUtils.makeButton(MessageManager.getString("action.delete"), + MessageManager.getString("label.delete_user_parameter_set"), new ActionListener() { @@ -283,8 +283,8 @@ public class WsJobParameters extends JPanel implements ItemListener, delete_actionPerformed(e); } }); - createpref = JvSwingUtils.makeButton("Create", - "Create a new parameter set with the current settings.", + createpref = JvSwingUtils.makeButton(MessageManager.getString("action.create"), + MessageManager.getString("label.create_user_parameter_set"), new ActionListener() { @@ -293,8 +293,8 @@ public class WsJobParameters extends JPanel implements ItemListener, create_actionPerformed(e); } }); - revertpref = JvSwingUtils.makeButton("Revert", - "Undo all changes to the current parameter set", + revertpref = JvSwingUtils.makeButton(MessageManager.getString("action.revert"), + MessageManager.getString("label.revert_changes_user_parameter_set"), new ActionListener() { @@ -303,16 +303,16 @@ public class WsJobParameters extends JPanel implements ItemListener, revert_actionPerformed(e); } }); - startjob = JvSwingUtils.makeButton("Start Job", - "Start Job with current settings.", new ActionListener() + startjob = JvSwingUtils.makeButton(MessageManager.getString("action.start_job"), + MessageManager.getString("label.start_job_current_settings"), new ActionListener() { public void actionPerformed(ActionEvent e) { startjob_actionPerformed(e); } }); - canceljob = JvSwingUtils.makeButton("Cancel Job", - "Close this dialog and cancel job.", new ActionListener() + canceljob = JvSwingUtils.makeButton(MessageManager.getString("action.cancel_job"), + MessageManager.getString("label.cancel_job_close_dialog"), new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -320,7 +320,7 @@ public class WsJobParameters extends JPanel implements ItemListener, } }); - setDetails.setBorder(new TitledBorder("Details")); + setDetails.setBorder(new TitledBorder(MessageManager.getString("label.details"))); setDetails.setLayout(new BorderLayout()); setDescr.setColumns(40); setDescr.setWrapStyleWord(true); @@ -328,7 +328,7 @@ public class WsJobParameters extends JPanel implements ItemListener, setDescr.setBackground(getBackground()); setDescr.setEditable(true); setDescr.getDocument().addDocumentListener(this); - setDescr.setToolTipText("Click to edit the notes for this parameter set."); + setDescr.setToolTipText(MessageManager.getString("label.edit_notes_parameter_set")); JScrollPane setDescrView = new JScrollPane(); // setDescrView.setPreferredSize(new Dimension(350, 200)); setDescrView.getViewport().setView(setDescr); @@ -378,9 +378,9 @@ public class WsJobParameters extends JPanel implements ItemListener, // paramPane.setPreferredSize(new Dimension(360, 400)); // paramPane.setPreferredSize(null); - jobOptions.setBorder(new TitledBorder("Options")); + jobOptions.setBorder(new TitledBorder(MessageManager.getString("label.options"))); jobOptions.setOpaque(true); - paramList.setBorder(new TitledBorder("Parameters")); + paramList.setBorder(new TitledBorder(MessageManager.getString("label.parameters"))); paramList.setOpaque(true); JPanel bjo = new JPanel(new BorderLayout()), bjp = new JPanel( new BorderLayout()); diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java index a3e28ef..780b30f 100644 --- a/src/jalview/gui/WsParamSetManager.java +++ b/src/jalview/gui/WsParamSetManager.java @@ -33,6 +33,7 @@ import javax.swing.JOptionPane; import jalview.bin.Cache; import jalview.io.JalviewFileChooser; +import jalview.util.MessageManager; import jalview.ws.params.ParamDatastoreI; import jalview.ws.params.ParamManager; import jalview.ws.params.WsParamSetI; @@ -187,7 +188,7 @@ public class WsParamSetManager implements ParamManager "Web Service Parameter File"); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle("Choose a filename for this parameter file"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(Desktop.instance); if (value == JalviewFileChooser.APPROVE_OPTION) { diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 8f2c177..9cc1e16 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -319,8 +319,7 @@ public class FileLoader implements Runnable alignFrame = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - alignFrame.statusBar.setText("Successfully loaded file " - + title); + alignFrame.statusBar.setText(MessageManager.formatMessage("label.successfully_loaded_file", new String[]{title})); if (!protocol.equals(AppletFormatAdapter.PASTE)) alignFrame.setFileName(file, format); diff --git a/src/jalview/io/HTMLOutput.java b/src/jalview/io/HTMLOutput.java index 585f677..d0fdd32 100755 --- a/src/jalview/io/HTMLOutput.java +++ b/src/jalview/io/HTMLOutput.java @@ -24,6 +24,7 @@ import java.awt.*; import jalview.datamodel.*; import jalview.gui.*; +import jalview.util.MessageManager; public class HTMLOutput { @@ -51,7 +52,7 @@ public class HTMLOutput chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Save as HTML"); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(null); diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index 08c4891..e9651ad 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -19,6 +19,8 @@ ////////////////////////////////////////////////////////////////// package jalview.io; +import jalview.util.MessageManager; + import java.io.*; import java.util.*; @@ -182,7 +184,7 @@ public class JalviewFileChooser extends JFileChooser setDialogType(SAVE_DIALOG); - int ret = showDialog(parent, "Save"); + int ret = showDialog(parent, MessageManager.getString("action.save")); if (getFileFilter() instanceof JalviewFileFilter) { diff --git a/src/jalview/io/WSWUBlastClient.java b/src/jalview/io/WSWUBlastClient.java index 53d85cf..732c072 100755 --- a/src/jalview/io/WSWUBlastClient.java +++ b/src/jalview/io/WSWUBlastClient.java @@ -25,6 +25,7 @@ import javax.swing.*; import jalview.analysis.*; import jalview.datamodel.*; import jalview.gui.*; +import jalview.util.MessageManager; import uk.ac.ebi.www.*; /** @@ -57,15 +58,10 @@ public class WSWUBlastClient { this.ap = ap; this.al = al; - output.setText("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));"); + output.setText(MessageManager.getString("label.wswublast_client_credits")); Desktop.addInternalFrame(output, - "BLASTing for unidentified sequences ", 800, 300); + MessageManager.getString("label.blasting_for_unidentified_sequence"), 800, 300); for (int i = 0; i < ids.size(); i++) { diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java index 36c0a4d..cd8ad6f 100755 --- a/src/jalview/jbgui/GAlignFrame.java +++ b/src/jalview/jbgui/GAlignFrame.java @@ -558,8 +558,8 @@ public class GAlignFrame extends JInternalFrame private void jbInit() throws Exception { - fileMenu.setText("File"); - saveAs.setText("Save As..."); + fileMenu.setText(MessageManager.getString("action.file")); + saveAs.setText(MessageManager.getString("action.save_as") + "..."); saveAs.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -571,7 +571,7 @@ public class GAlignFrame extends JInternalFrame saveAs_actionPerformed(e); } }); - closeMenuItem.setText("Close"); + closeMenuItem.setText(MessageManager.getString("action.close")); closeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_W, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -582,12 +582,12 @@ public class GAlignFrame extends JInternalFrame closeMenuItem_actionPerformed(false); } }); - editMenu.setText("Edit"); - viewMenu.setText("View"); - colourMenu.setText("Colour"); - calculateMenu.setText("Calculate"); - webService.setText("Web Service"); - selectAllSequenceMenuItem.setText("Select All"); + editMenu.setText(MessageManager.getString("action.edit")); + viewMenu.setText(MessageManager.getString("action.view")); + colourMenu.setText(MessageManager.getString("action.colour")); + calculateMenu.setText(MessageManager.getString("action.calculate")); + webService.setText(MessageManager.getString("action.web_service")); + selectAllSequenceMenuItem.setText(MessageManager.getString("action.select_all")); selectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_A, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -599,7 +599,7 @@ public class GAlignFrame extends JInternalFrame selectAllSequenceMenuItem_actionPerformed(e); } }); - deselectAllSequenceMenuItem.setText("Deselect All"); + deselectAllSequenceMenuItem.setText(MessageManager.getString("action.deselect_all")); deselectAllSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_ESCAPE, 0, false)); deselectAllSequenceMenuItem @@ -610,7 +610,7 @@ public class GAlignFrame extends JInternalFrame deselectAllSequenceMenuItem_actionPerformed(e); } }); - invertSequenceMenuItem.setText("Invert Sequence Selection"); + invertSequenceMenuItem.setText(MessageManager.getString("action.invert_sequence_selection")); invertSequenceMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_I, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -622,7 +622,7 @@ public class GAlignFrame extends JInternalFrame invertSequenceMenuItem_actionPerformed(e); } }); - grpsFromSelection.setText("Make Groups For Selection"); + grpsFromSelection.setText(MessageManager.getString("action.make_groups_selection")); grpsFromSelection.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -631,7 +631,7 @@ public class GAlignFrame extends JInternalFrame } }); - remove2LeftMenuItem.setText("Remove Left"); + remove2LeftMenuItem.setText(MessageManager.getString("action.remove_left")); remove2LeftMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_L, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -643,7 +643,7 @@ public class GAlignFrame extends JInternalFrame remove2LeftMenuItem_actionPerformed(e); } }); - remove2RightMenuItem.setText("Remove Right"); + remove2RightMenuItem.setText(MessageManager.getString("action.remove_right")); remove2RightMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_R, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -655,7 +655,7 @@ public class GAlignFrame extends JInternalFrame remove2RightMenuItem_actionPerformed(e); } }); - removeGappedColumnMenuItem.setText("Remove Empty Columns"); + removeGappedColumnMenuItem.setText(MessageManager.getString("action.remove_empty_columns")); removeGappedColumnMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -667,7 +667,7 @@ public class GAlignFrame extends JInternalFrame removeGappedColumnMenuItem_actionPerformed(e); } }); - removeAllGapsMenuItem.setText("Remove All Gaps"); + removeAllGapsMenuItem.setText(MessageManager.getString("action.remove_all_gaps")); removeAllGapsMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_E, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask() @@ -680,7 +680,7 @@ public class GAlignFrame extends JInternalFrame removeAllGapsMenuItem_actionPerformed(e); } }); - justifyLeftMenuItem.setText("Left Justify Alignment"); + justifyLeftMenuItem.setText(MessageManager.getString("action.left_justify_alignment")); justifyLeftMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -689,7 +689,7 @@ public class GAlignFrame extends JInternalFrame justifyLeftMenuItem_actionPerformed(e); } }); - justifyRightMenuItem.setText("Right Justify Alignment"); + justifyRightMenuItem.setText(MessageManager.getString("action.right_justify_alignment")); justifyRightMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -698,7 +698,7 @@ public class GAlignFrame extends JInternalFrame justifyRightMenuItem_actionPerformed(e); } }); - viewBoxesMenuItem.setText("Boxes"); + viewBoxesMenuItem.setText(MessageManager.getString("action.boxes")); viewBoxesMenuItem.setState(true); viewBoxesMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -707,7 +707,7 @@ public class GAlignFrame extends JInternalFrame viewBoxesMenuItem_actionPerformed(e); } }); - viewTextMenuItem.setText("Text"); + viewTextMenuItem.setText(MessageManager.getString("action.text")); viewTextMenuItem.setState(true); viewTextMenuItem.addActionListener(new java.awt.event.ActionListener() { @@ -716,7 +716,7 @@ public class GAlignFrame extends JInternalFrame viewTextMenuItem_actionPerformed(e); } }); - showNonconservedMenuItem.setText("Show nonconserved"); + showNonconservedMenuItem.setText(MessageManager.getString("label.show_non_conversed")); showNonconservedMenuItem.setState(false); showNonconservedMenuItem .addActionListener(new java.awt.event.ActionListener() @@ -726,7 +726,7 @@ public class GAlignFrame extends JInternalFrame showUnconservedMenuItem_actionPerformed(e); } }); - sortPairwiseMenuItem.setText("by Pairwise Identity"); + sortPairwiseMenuItem.setText(MessageManager.getString("action.by_pairwise_id")); sortPairwiseMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -735,7 +735,7 @@ public class GAlignFrame extends JInternalFrame sortPairwiseMenuItem_actionPerformed(e); } }); - sortIDMenuItem.setText("by ID"); + sortIDMenuItem.setText(MessageManager.getString("action.by_id")); sortIDMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -743,7 +743,7 @@ public class GAlignFrame extends JInternalFrame sortIDMenuItem_actionPerformed(e); } }); - sortLengthMenuItem.setText("By Length"); + sortLengthMenuItem.setText(MessageManager.getString("action.by_length")); sortLengthMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -752,7 +752,7 @@ public class GAlignFrame extends JInternalFrame sortLengthMenuItem_actionPerformed(e); } }); - sortGroupMenuItem.setText("by Group"); + sortGroupMenuItem.setText(MessageManager.getString("action.by_group")); sortGroupMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -760,7 +760,7 @@ public class GAlignFrame extends JInternalFrame sortGroupMenuItem_actionPerformed(e); } }); - removeRedundancyMenuItem.setText("Remove Redundancy..."); + removeRedundancyMenuItem.setText(MessageManager.getString("action.remove_redundancy")); removeRedundancyMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_D, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -772,7 +772,7 @@ public class GAlignFrame extends JInternalFrame removeRedundancyMenuItem_actionPerformed(e); } }); - pairwiseAlignmentMenuItem.setText("Pairwise Alignments..."); + pairwiseAlignmentMenuItem.setText(MessageManager.getString("action.pairwise_alignment")); pairwiseAlignmentMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -781,7 +781,7 @@ public class GAlignFrame extends JInternalFrame pairwiseAlignmentMenuItem_actionPerformed(e); } }); - PCAMenuItem.setText("Principal Component Analysis"); + PCAMenuItem.setText(MessageManager.getString("label.principal_component_analysis")); PCAMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -790,7 +790,7 @@ public class GAlignFrame extends JInternalFrame } }); averageDistanceTreeMenuItem - .setText("Average Distance Using % Identity"); + .setText(MessageManager.getString("label.average_distance_identity")); averageDistanceTreeMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -799,7 +799,7 @@ public class GAlignFrame extends JInternalFrame averageDistanceTreeMenuItem_actionPerformed(e); } }); - neighbourTreeMenuItem.setText("Neighbour Joining Using % Identity"); + neighbourTreeMenuItem.setText(MessageManager.getString("label.neighbour_joining_identity")); neighbourTreeMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -813,9 +813,9 @@ public class GAlignFrame extends JInternalFrame statusBar.setBackground(Color.white); statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); statusBar.setBorder(BorderFactory.createLineBorder(Color.black)); - statusBar.setText("Status bar"); - outputTextboxMenu.setText("Output to Textbox"); - clustalColour.setText("Clustalx"); + statusBar.setText(MessageManager.getString("label.status_bar")); + outputTextboxMenu.setText(MessageManager.getString("label.out_to_textbox")); + clustalColour.setText(MessageManager.getString("label.clustalx")); clustalColour.addActionListener(new java.awt.event.ActionListener() { @@ -824,7 +824,7 @@ public class GAlignFrame extends JInternalFrame clustalColour_actionPerformed(e); } }); - zappoColour.setText("Zappo"); + zappoColour.setText(MessageManager.getString("label.zappo")); zappoColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -832,7 +832,7 @@ public class GAlignFrame extends JInternalFrame zappoColour_actionPerformed(e); } }); - taylorColour.setText("Taylor"); + taylorColour.setText(MessageManager.getString("label.taylor")); taylorColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -840,7 +840,7 @@ public class GAlignFrame extends JInternalFrame taylorColour_actionPerformed(e); } }); - hydrophobicityColour.setText("Hydrophobicity"); + hydrophobicityColour.setText(MessageManager.getString("label.hydrophobicity")); hydrophobicityColour .addActionListener(new java.awt.event.ActionListener() { @@ -849,7 +849,7 @@ public class GAlignFrame extends JInternalFrame hydrophobicityColour_actionPerformed(e); } }); - helixColour.setText("Helix Propensity"); + helixColour.setText(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -857,7 +857,7 @@ public class GAlignFrame extends JInternalFrame helixColour_actionPerformed(e); } }); - strandColour.setText("Strand Propensity"); + strandColour.setText(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -865,7 +865,7 @@ public class GAlignFrame extends JInternalFrame strandColour_actionPerformed(e); } }); - turnColour.setText("Turn Propensity"); + turnColour.setText(MessageManager.getString("Turn Propensity")); turnColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -873,7 +873,7 @@ public class GAlignFrame extends JInternalFrame turnColour_actionPerformed(e); } }); - buriedColour.setText("Buried Index"); + buriedColour.setText(MessageManager.getString("Buried Index")); buriedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -881,7 +881,7 @@ public class GAlignFrame extends JInternalFrame buriedColour_actionPerformed(e); } }); - userDefinedColour.setText("User Defined..."); + userDefinedColour.setText(MessageManager.getString("action.user_defined")); userDefinedColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -889,7 +889,7 @@ public class GAlignFrame extends JInternalFrame userDefinedColour_actionPerformed(e); } }); - PIDColour.setText("Percentage Identity"); + PIDColour.setText(MessageManager.getString("label.percentage_identity")); PIDColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -897,7 +897,7 @@ public class GAlignFrame extends JInternalFrame PIDColour_actionPerformed(e); } }); - BLOSUM62Colour.setText("BLOSUM62 Score"); + BLOSUM62Colour.setText(MessageManager.getString("label.blosum62_score")); BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -905,7 +905,7 @@ public class GAlignFrame extends JInternalFrame BLOSUM62Colour_actionPerformed(e); } }); - nucleotideColour.setText("Nucleotide"); + nucleotideColour.setText(MessageManager.getString("label.nucleotide")); nucleotideColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -914,7 +914,7 @@ public class GAlignFrame extends JInternalFrame } }); - purinePyrimidineColour.setText("Purine/Pyrimidine"); + purinePyrimidineColour.setText(MessageManager.getString("label.purine_pyrimidine")); purinePyrimidineColour .addActionListener(new java.awt.event.ActionListener() { @@ -930,7 +930,7 @@ public class GAlignFrame extends JInternalFrame * covariationColour_actionPerformed(e); } }); */ - avDistanceTreeBlosumMenuItem.setText("Average Distance Using BLOSUM62"); + avDistanceTreeBlosumMenuItem.setText(MessageManager.getString("label.average_distance_bloslum62")); avDistanceTreeBlosumMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -939,7 +939,7 @@ public class GAlignFrame extends JInternalFrame avTreeBlosumMenuItem_actionPerformed(e); } }); - njTreeBlosumMenuItem.setText("Neighbour Joining using BLOSUM62"); + njTreeBlosumMenuItem.setText(MessageManager.getString("label.neighbour_blosum62")); njTreeBlosumMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -949,7 +949,7 @@ public class GAlignFrame extends JInternalFrame } }); annotationPanelMenuItem.setActionCommand(""); - annotationPanelMenuItem.setText("Show Annotations"); + annotationPanelMenuItem.setText(MessageManager.getString("label.show_annotations")); annotationPanelMenuItem.setState(jalview.bin.Cache.getDefault( "SHOW_ANNOTATIONS", true)); annotationPanelMenuItem @@ -960,7 +960,7 @@ public class GAlignFrame extends JInternalFrame annotationPanelMenuItem_actionPerformed(e); } }); - colourTextMenuItem.setText("Colour Text"); + colourTextMenuItem.setText(MessageManager.getString("label.colour_text")); colourTextMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -969,7 +969,7 @@ public class GAlignFrame extends JInternalFrame colourTextMenuItem_actionPerformed(e); } }); - htmlMenuItem.setText("HTML"); + htmlMenuItem.setText(MessageManager.getString("label.html")); htmlMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -977,7 +977,7 @@ public class GAlignFrame extends JInternalFrame htmlMenuItem_actionPerformed(e); } }); - overviewMenuItem.setText("Overview Window"); + overviewMenuItem.setText(MessageManager.getString("label.overview_window")); overviewMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -986,7 +986,7 @@ public class GAlignFrame extends JInternalFrame } }); undoMenuItem.setEnabled(false); - undoMenuItem.setText("Undo"); + undoMenuItem.setText(MessageManager.getString("action.undo")); undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_Z, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -998,7 +998,7 @@ public class GAlignFrame extends JInternalFrame } }); redoMenuItem.setEnabled(false); - redoMenuItem.setText("Redo"); + redoMenuItem.setText(MessageManager.getString("action.redo")); redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_Y, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1009,7 +1009,7 @@ public class GAlignFrame extends JInternalFrame redoMenuItem_actionPerformed(e); } }); - conservationMenuItem.setText("By Conservation"); + conservationMenuItem.setText(MessageManager.getString("action.by_conservation")); conservationMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -1018,7 +1018,7 @@ public class GAlignFrame extends JInternalFrame conservationMenuItem_actionPerformed(e); } }); - noColourmenuItem.setText("None"); + noColourmenuItem.setText(MessageManager.getString("label.none")); noColourmenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1026,7 +1026,7 @@ public class GAlignFrame extends JInternalFrame noColourmenuItem_actionPerformed(e); } }); - wrapMenuItem.setText("Wrap"); + wrapMenuItem.setText(MessageManager.getString("labe.wrap")); wrapMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1034,7 +1034,7 @@ public class GAlignFrame extends JInternalFrame wrapMenuItem_actionPerformed(e); } }); - printMenuItem.setText("Print ..."); + printMenuItem.setText(MessageManager.getString("action.print") + "..."); printMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_P, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1045,7 +1045,7 @@ public class GAlignFrame extends JInternalFrame printMenuItem_actionPerformed(e); } }); - renderGapsMenuItem.setText("Show Gaps"); + renderGapsMenuItem.setText(MessageManager.getString("action.show_gaps")); renderGapsMenuItem.setState(true); renderGapsMenuItem .addActionListener(new java.awt.event.ActionListener() @@ -1055,7 +1055,7 @@ public class GAlignFrame extends JInternalFrame renderGapsMenuItem_actionPerformed(e); } }); - findMenuItem.setText("Find..."); + findMenuItem.setText(MessageManager.getString("action.find")); findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_F, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1066,7 +1066,7 @@ public class GAlignFrame extends JInternalFrame findMenuItem_actionPerformed(e); } }); - abovePIDThreshold.setText("Above Identity Threshold"); + abovePIDThreshold.setText(MessageManager.getString("label.above_identity_threshold")); abovePIDThreshold.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1074,7 +1074,7 @@ public class GAlignFrame extends JInternalFrame abovePIDThreshold_actionPerformed(e); } }); - showSeqFeatures.setText("Show Sequence Features"); + showSeqFeatures.setText(MessageManager.getString("label.show_sequence_features")); showSeqFeatures.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -1088,7 +1088,7 @@ public class GAlignFrame extends JInternalFrame * void actionPerformed(ActionEvent actionEvent) { * showSeqFeaturesHeight_actionPerformed(actionEvent); } }); */ - showDbRefsMenuitem.setText("Show Database Refs"); + showDbRefsMenuitem.setText(MessageManager.getString("label.show_database_refs")); showDbRefsMenuitem.addActionListener(new ActionListener() { @@ -1098,7 +1098,7 @@ public class GAlignFrame extends JInternalFrame } }); - showNpFeatsMenuitem.setText("Show Non-Positional Features"); + showNpFeatsMenuitem.setText(MessageManager.getString("label.show_non_positional_features")); showNpFeatsMenuitem.addActionListener(new ActionListener() { @@ -1108,7 +1108,7 @@ public class GAlignFrame extends JInternalFrame } }); - showGroupConservation.setText("Group Conservation"); + showGroupConservation.setText(MessageManager.getString("label.group_conservation")); showGroupConservation.addActionListener(new ActionListener() { @@ -1119,7 +1119,7 @@ public class GAlignFrame extends JInternalFrame }); - showGroupConsensus.setText("Group Consensus"); + showGroupConsensus.setText(MessageManager.getString("label.group_consensus")); showGroupConsensus.addActionListener(new ActionListener() { @@ -1129,7 +1129,7 @@ public class GAlignFrame extends JInternalFrame } }); - showConsensusHistogram.setText("Show Consensus Histogram"); + showConsensusHistogram.setText(MessageManager.getString("label.show_consensus_histogram")); showConsensusHistogram.addActionListener(new ActionListener() { @@ -1139,7 +1139,7 @@ public class GAlignFrame extends JInternalFrame } }); - showSequenceLogo.setText("Show Consensus Logo"); + showSequenceLogo.setText(MessageManager.getString("label.show_consensus_logo")); showSequenceLogo.addActionListener(new ActionListener() { @@ -1149,7 +1149,7 @@ public class GAlignFrame extends JInternalFrame } }); - normaliseSequenceLogo.setText("Normalise Consensus Logo"); + normaliseSequenceLogo.setText(MessageManager.getString("label.norm_consensus_logo")); normaliseSequenceLogo.addActionListener(new ActionListener() { @@ -1159,7 +1159,7 @@ public class GAlignFrame extends JInternalFrame } }); - applyAutoAnnotationSettings.setText("Apply to all groups"); + applyAutoAnnotationSettings.setText(MessageManager.getString("label.apply_all_groups")); applyAutoAnnotationSettings.setState(false); applyAutoAnnotationSettings.setVisible(true); applyAutoAnnotationSettings.addActionListener(new ActionListener() @@ -1172,7 +1172,7 @@ public class GAlignFrame extends JInternalFrame }); - nucleotideColour.setText("Nucleotide"); + nucleotideColour.setText(MessageManager.getString("label.nucleotide")); nucleotideColour.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1181,7 +1181,7 @@ public class GAlignFrame extends JInternalFrame } }); - tcoffeeColour.setText("T-Coffee scores"); + tcoffeeColour.setText(MessageManager.getString("label.tcoffee_scores")); tcoffeeColour.setEnabled(false); tcoffeeColour.addActionListener(new ActionListener() { @@ -1193,7 +1193,7 @@ public class GAlignFrame extends JInternalFrame } }); - deleteGroups.setText("Undefine groups"); + deleteGroups.setText(MessageManager.getString("action.undefine_groups")); deleteGroups.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_U, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1204,7 +1204,7 @@ public class GAlignFrame extends JInternalFrame deleteGroups_actionPerformed(e); } }); - createGroup.setText("Create group"); + createGroup.setText(MessageManager.getString("action.create_groups")); createGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_G, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1215,7 +1215,7 @@ public class GAlignFrame extends JInternalFrame createGroup_actionPerformed(e); } }); - unGroup.setText("Remove Group"); + unGroup.setText(MessageManager.getString("action.remove_group")); unGroup.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_G,Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() | java.awt.event.KeyEvent.SHIFT_MASK, false)); @@ -1226,7 +1226,7 @@ public class GAlignFrame extends JInternalFrame unGroup_actionPerformed(e); } }); - copy.setText("Copy"); + copy.setText(MessageManager.getString("action.copy")); copy.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_C, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1238,7 +1238,7 @@ public class GAlignFrame extends JInternalFrame copy_actionPerformed(e); } }); - cut.setText("Cut"); + cut.setText(MessageManager.getString("action.cut")); cut.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_X, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1249,7 +1249,7 @@ public class GAlignFrame extends JInternalFrame cut_actionPerformed(e); } }); - delete.setText("Delete"); + delete.setText(MessageManager.getString("action.delete")); delete.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_BACK_SPACE, 0, false)); delete.addActionListener(new java.awt.event.ActionListener() @@ -1259,8 +1259,8 @@ public class GAlignFrame extends JInternalFrame delete_actionPerformed(e); } }); - pasteMenu.setText("Paste"); - pasteNew.setText("To New Alignment"); + pasteMenu.setText(MessageManager.getString("action.paste")); + pasteNew.setText(MessageManager.getString("label.to_new_alignment")); pasteNew.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -1272,7 +1272,7 @@ public class GAlignFrame extends JInternalFrame pasteNew_actionPerformed(e); } }); - pasteThis.setText("Add To This Alignment"); + pasteThis.setText(MessageManager.getString("label.to_this_alignment")); pasteThis.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_V, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1283,7 +1283,7 @@ public class GAlignFrame extends JInternalFrame pasteThis_actionPerformed(e); } }); - applyToAllGroups.setText("Apply Colour To All Groups"); + applyToAllGroups.setText(MessageManager.getString("label.apply_colour_to_all_groups")); applyToAllGroups.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1298,9 +1298,9 @@ public class GAlignFrame extends JInternalFrame createPNG(null); } }); - createPNG.setActionCommand("Save As PNG Image"); + createPNG.setActionCommand(MessageManager.getString("label.save_png_image")); createPNG.setText("PNG"); - font.setText("Font..."); + font.setText(MessageManager.getString("action.font")); font.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1309,7 +1309,7 @@ public class GAlignFrame extends JInternalFrame } }); - seqLimits.setText("Show Sequence Limits"); + seqLimits.setText(MessageManager.getString("label.show_sequence_limits")); seqLimits.setState(jalview.bin.Cache.getDefault("SHOW_JVSUFFIX", true)); seqLimits.addActionListener(new java.awt.event.ActionListener() { @@ -1326,8 +1326,8 @@ public class GAlignFrame extends JInternalFrame createEPS(null); } }); - LoadtreeMenuItem.setActionCommand("Load a tree for this sequence set"); - LoadtreeMenuItem.setText("Load Associated Tree"); + LoadtreeMenuItem.setActionCommand(MessageManager.getString("label.load_tree_for_sequence_set")); + LoadtreeMenuItem.setText(MessageManager.getString("label.load_associated_tree")); LoadtreeMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1337,7 +1337,7 @@ public class GAlignFrame extends JInternalFrame }); scaleAbove.setVisible(false); - scaleAbove.setText("Scale Above"); + scaleAbove.setText(MessageManager.getString("action.scale_above")); scaleAbove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1347,7 +1347,7 @@ public class GAlignFrame extends JInternalFrame }); scaleLeft.setVisible(false); scaleLeft.setSelected(true); - scaleLeft.setText("Scale Left"); + scaleLeft.setText(MessageManager.getString("action.scale_left")); scaleLeft.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1357,7 +1357,7 @@ public class GAlignFrame extends JInternalFrame }); scaleRight.setVisible(false); scaleRight.setSelected(true); - scaleRight.setText("Scale Right"); + scaleRight.setText(MessageManager.getString("action.scale_right")); scaleRight.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1367,7 +1367,7 @@ public class GAlignFrame extends JInternalFrame }); centreColumnLabelsMenuItem.setVisible(true); centreColumnLabelsMenuItem.setState(false); - centreColumnLabelsMenuItem.setText("Centre Column Labels"); + centreColumnLabelsMenuItem.setText(MessageManager.getString("label.centre_column_labels")); centreColumnLabelsMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -1378,7 +1378,7 @@ public class GAlignFrame extends JInternalFrame }); followHighlightMenuItem.setVisible(true); followHighlightMenuItem.setState(true); - followHighlightMenuItem.setText("Automatic Scrolling"); + followHighlightMenuItem.setText(MessageManager.getString("label.automatic_scrolling")); followHighlightMenuItem.addActionListener(new ActionListener() { @@ -1389,7 +1389,7 @@ public class GAlignFrame extends JInternalFrame }); - modifyPID.setText("Modify Identity Threshold..."); + modifyPID.setText(MessageManager.getString("label.modify_identity_thereshold")); modifyPID.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -1397,7 +1397,7 @@ public class GAlignFrame extends JInternalFrame modifyPID_actionPerformed(e); } }); - modifyConservation.setText("Modify Conservation Threshold..."); + modifyConservation.setText(MessageManager.getString("label.modify_conservation_thereshold")); modifyConservation .addActionListener(new java.awt.event.ActionListener() { @@ -1406,8 +1406,8 @@ public class GAlignFrame extends JInternalFrame modifyConservation_actionPerformed(e); } }); - sortByTreeMenu.setText("By Tree Order"); - sort.setText("Sort"); + sortByTreeMenu.setText(MessageManager.getString("action.by_tree_order")); + sort.setText(MessageManager.getString("action.sort")); sort.addMenuListener(new MenuListener() { public void menuSelected(MenuEvent e) @@ -1423,7 +1423,7 @@ public class GAlignFrame extends JInternalFrame { } }); - sortByAnnotScore.setText("by Score"); + sortByAnnotScore.setText(MessageManager.getString("label.sort_by_score")); sort.add(sortByAnnotScore); sortByAnnotScore.addMenuListener(new javax.swing.event.MenuListener() { @@ -1443,10 +1443,10 @@ public class GAlignFrame extends JInternalFrame }); sortByAnnotScore.setVisible(false); - calculateTree.setText("Calculate Tree"); + calculateTree.setText(MessageManager.getString("action.calculate_tree")); - jMenu2.setText("Export Image"); - padGapsMenuitem.setText("Pad Gaps"); + jMenu2.setText(MessageManager.getString("label.export_image")); + padGapsMenuitem.setText(MessageManager.getString("label.pad_gaps")); padGapsMenuitem.setState(jalview.bin.Cache .getDefault("PAD_GAPS", false)); padGapsMenuitem.addActionListener(new ActionListener() @@ -1457,7 +1457,7 @@ public class GAlignFrame extends JInternalFrame } }); vamsasStore.setVisible(false); - vamsasStore.setText("VAMSAS store"); + vamsasStore.setText(MessageManager.getString("label.vamsas_store")); vamsasStore.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1465,7 +1465,7 @@ public class GAlignFrame extends JInternalFrame vamsasStore_actionPerformed(e); } }); - showTranslation.setText("Translate cDNA"); + showTranslation.setText(MessageManager.getString("label.translate_cDNA")); showTranslation.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1473,7 +1473,7 @@ public class GAlignFrame extends JInternalFrame showTranslation_actionPerformed(e); } }); - extractScores.setText("Extract Scores..."); + extractScores.setText(MessageManager.getString("label.extract_scores") + "..."); extractScores.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1483,14 +1483,14 @@ public class GAlignFrame extends JInternalFrame }); extractScores.setVisible(true); // JBPNote: TODO: make gui for regex based // score extraction - showProducts.setText("Get Cross References"); + showProducts.setText(MessageManager.getString("label.get_cross_refs")); /* * showProducts.addActionListener(new ActionListener() { * * public void actionPerformed(ActionEvent e) { * showProducts_actionPerformed(e); } }); */ - openFeatureSettings.setText("Feature Settings..."); + openFeatureSettings.setText(MessageManager.getString("label.feature_settings")); openFeatureSettings.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1498,7 +1498,7 @@ public class GAlignFrame extends JInternalFrame featureSettings_actionPerformed(e); } }); - fetchSequence.setText("Fetch Sequence(s)..."); + fetchSequence.setText(MessageManager.getString("label.fetch_sequences")); fetchSequence.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1507,7 +1507,7 @@ public class GAlignFrame extends JInternalFrame } }); - annotationColour.setText("By Annotation..."); + annotationColour.setText(MessageManager.getString("action.by_annotation")); annotationColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1516,7 +1516,7 @@ public class GAlignFrame extends JInternalFrame } }); - rnahelicesColour.setText("By RNA helices"); + rnahelicesColour.setText(MessageManager.getString("action.by_rna_helixes")); rnahelicesColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1525,7 +1525,7 @@ public class GAlignFrame extends JInternalFrame } }); - associatedData.setText("Load Features / Annotations"); + associatedData.setText(MessageManager.getString("label.load_features_annotations")); associatedData.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1533,7 +1533,7 @@ public class GAlignFrame extends JInternalFrame associatedData_actionPerformed(e); } }); - autoCalculate.setText("Autocalculate Consensus"); + autoCalculate.setText(MessageManager.getString("label.autocalculate_consensus")); autoCalculate.setState(jalview.bin.Cache.getDefault( "AUTO_CALC_CONSENSUS", true)); autoCalculate.addActionListener(new ActionListener() @@ -1543,9 +1543,9 @@ public class GAlignFrame extends JInternalFrame autoCalculate_actionPerformed(e); } }); - sortByTree.setText("Sort Alignment With New Tree"); + sortByTree.setText(MessageManager.getString("label.sort_alignment_new_tree")); sortByTree - .setToolTipText("Enable this to automatically sort
the alignment when you open
a new tree."); + .setToolTipText("" + MessageManager.getString("label.enable_automatically_sort_alignment_when_open_new_tree")); sortByTree .setState(jalview.bin.Cache.getDefault("SORT_BY_TREE", false)); sortByTree.addActionListener(new ActionListener() @@ -1556,9 +1556,9 @@ public class GAlignFrame extends JInternalFrame } }); - listenToViewSelections.setText("Listen for selections"); + listenToViewSelections.setText(MessageManager.getString("label.listen_for_selections")); listenToViewSelections - .setToolTipText("When selected, selections in this view will mirror
selections made on the same sequences in other views."); + .setToolTipText("" + MessageManager.getString("label.selections_mirror_selections_made_same_sequences_other_views")); listenToViewSelections.setState(false); listenToViewSelections.addActionListener(new ActionListener() { @@ -1568,8 +1568,8 @@ public class GAlignFrame extends JInternalFrame } }); - addSequenceMenu.setText("Add Sequences"); - addFromFile.setText("From File"); + addSequenceMenu.setText(MessageManager.getString("label.add_sequences")); + addFromFile.setText(MessageManager.getString("label.from_file")); addFromFile.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1577,7 +1577,7 @@ public class GAlignFrame extends JInternalFrame addFromFile_actionPerformed(e); } }); - addFromText.setText("From Textbox"); + addFromText.setText(MessageManager.getString("label.from_textbox")); addFromText.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1585,7 +1585,7 @@ public class GAlignFrame extends JInternalFrame addFromText_actionPerformed(e); } }); - addFromURL.setText("From URL"); + addFromURL.setText(MessageManager.getString("label.from_url")); addFromURL.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1593,7 +1593,7 @@ public class GAlignFrame extends JInternalFrame addFromURL_actionPerformed(e); } }); - exportFeatures.setText("Export Features..."); + exportFeatures.setText(MessageManager.getString("label.export_features")); exportFeatures.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1601,7 +1601,7 @@ public class GAlignFrame extends JInternalFrame exportFeatures_actionPerformed(e); } }); - exportAnnotations.setText("Export Annotations..."); + exportAnnotations.setText(MessageManager.getString("label.export_annotations")); exportAnnotations.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1610,9 +1610,9 @@ public class GAlignFrame extends JInternalFrame } }); statusPanel.setLayout(gridLayout1); - jMenu3.setText("Show"); - showAllSeqs.setText("All Sequences"); - showAllSeqs.setToolTipText("Shift+H toggles sequence visiblity."); + jMenu3.setText(MessageManager.getString("action.show")); + showAllSeqs.setText(MessageManager.getString("label.all_sequences")); + showAllSeqs.setToolTipText(MessageManager.getString("label.toggle_sequence_visibility")); showAllSeqs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1620,8 +1620,8 @@ public class GAlignFrame extends JInternalFrame showAllSeqs_actionPerformed(e); } }); - showAllColumns.setText("All Columns"); - showAllColumns.setToolTipText("Ctrl+H toggles column visiblity."); + showAllColumns.setText(MessageManager.getString("label.all_columns")); + showAllColumns.setToolTipText(MessageManager.getString("label.toggle_columns_visibility")); showAllColumns.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1629,9 +1629,9 @@ public class GAlignFrame extends JInternalFrame showAllColumns_actionPerformed(e); } }); - hideMenu.setText("Hide"); - hideSelSequences.setText("Selected Sequences"); - hideSelSequences.setToolTipText("Shift+H toggles sequence visiblity."); + hideMenu.setText(MessageManager.getString("action.hide")); + hideSelSequences.setText(MessageManager.getString("label.selected_sequences")); + hideSelSequences.setToolTipText(MessageManager.getString("label.toggle_sequence_visibility")); hideSelSequences.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1639,8 +1639,8 @@ public class GAlignFrame extends JInternalFrame hideSelSequences_actionPerformed(e); } }); - hideSelColumns.setText("Selected Columns"); - hideSelColumns.setToolTipText("Ctrl+H toggles column visiblity."); + hideSelColumns.setText(MessageManager.getString("label.selected_columns")); + hideSelColumns.setToolTipText(MessageManager.getString("label.toggle_columns_visibility")); hideSelColumns.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1648,7 +1648,7 @@ public class GAlignFrame extends JInternalFrame hideSelColumns_actionPerformed(e); } }); - hideAllSelection.setText("Selected Region"); + hideAllSelection.setText(MessageManager.getString("label.selected_region")); hideAllSelection.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1657,7 +1657,7 @@ public class GAlignFrame extends JInternalFrame } }); // TODO: should be hidden if no selection exists. - hideAllButSelection.setText("All but Selected Region (Shift+Ctrl+H)"); + hideAllButSelection.setText(MessageManager.getString("label.all_but_selected_region")); hideAllButSelection.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1665,9 +1665,9 @@ public class GAlignFrame extends JInternalFrame hideAllButSelection_actionPerformed(e); } }); - showAllhidden.setText("All Sequences and Columns"); + showAllhidden.setText(MessageManager.getString("label.all_sequences_columns")); showAllhidden - .setToolTipText("H toggles visibility of hidden or selected regions."); + .setToolTipText(MessageManager.getString("label.toggles_visibility_hidden_selected_regions")); showAllhidden.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1676,7 +1676,7 @@ public class GAlignFrame extends JInternalFrame } }); - hiddenMarkers.setText("Show Hidden Markers"); + hiddenMarkers.setText(MessageManager.getString("action.show_hidden_markers")); hiddenMarkers.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1684,7 +1684,7 @@ public class GAlignFrame extends JInternalFrame hiddenMarkers_actionPerformed(e); } }); - invertColSel.setText("Invert Column Selection"); + invertColSel.setText(MessageManager.getString("action.invert_column_selection")); invertColSel.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_I, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask() @@ -1719,7 +1719,7 @@ public class GAlignFrame extends JInternalFrame tabbedPane_focusGained(e); } }); - save.setText("Save"); + save.setText(MessageManager.getString("action.save")); save.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1731,7 +1731,7 @@ public class GAlignFrame extends JInternalFrame } }); reload.setEnabled(false); - reload.setText("Reload"); + reload.setText(MessageManager.getString("action.reload")); reload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1739,7 +1739,7 @@ public class GAlignFrame extends JInternalFrame reload_actionPerformed(e); } }); - newView.setText("New View"); + newView.setText(MessageManager.getString("action.new_view")); newView.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_T, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -1750,9 +1750,8 @@ public class GAlignFrame extends JInternalFrame newView_actionPerformed(e); } }); - tabbedPane.setToolTipText(" Right-click to rename tab" - + "
Press X to eXpand tabs, G to reGroup."); - textColour.setText("Colour Text ..."); + tabbedPane.setToolTipText("" + MessageManager.getString("label.rename_tab_eXpand_reGroup") + ""); + textColour.setText(MessageManager.getString("label.colour_text") + "..."); textColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1760,9 +1759,9 @@ public class GAlignFrame extends JInternalFrame textColour_actionPerformed(e); } }); - formatMenu.setText("Format"); - selectMenu.setText("Select"); - idRightAlign.setText("Right Align Sequence Id"); + formatMenu.setText(MessageManager.getString("action.format")); + selectMenu.setText(MessageManager.getString("action.select")); + idRightAlign.setText(MessageManager.getString("label.right_align_sequence_id")); idRightAlign.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1771,7 +1770,7 @@ public class GAlignFrame extends JInternalFrame } }); gatherViews.setEnabled(false); - gatherViews.setText("Gather Views"); + gatherViews.setText(MessageManager.getString("action.gather_views")); gatherViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_G, 0, false)); gatherViews.addActionListener(new ActionListener() @@ -1782,7 +1781,7 @@ public class GAlignFrame extends JInternalFrame } }); expandViews.setEnabled(false); - expandViews.setText("Expand Views"); + expandViews.setText(MessageManager.getString("action.expand_views")); expandViews.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_X, 0, false)); expandViews.addActionListener(new ActionListener() @@ -1792,7 +1791,7 @@ public class GAlignFrame extends JInternalFrame expandViews_actionPerformed(e); } }); - pageSetup.setText("Page Setup ..."); + pageSetup.setText(MessageManager.getString("action.page_setup") + "..."); pageSetup.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -1800,7 +1799,7 @@ public class GAlignFrame extends JInternalFrame pageSetup_actionPerformed(e); } }); - alignmentProperties.setText("Alignment Properties..."); + alignmentProperties.setText(MessageManager.getString("label.alignment_props") + "..."); alignmentProperties.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -1808,8 +1807,8 @@ public class GAlignFrame extends JInternalFrame alignmentProperties(); } }); - tooltipSettingsMenu.setText("Sequence ID Tooltip"); - autoAnnMenu.setText("Autocalculated Annotation"); + tooltipSettingsMenu.setText(MessageManager.getString("label.sequence_id_tooltip")); + autoAnnMenu.setText(MessageManager.getString("label.autocalculated_annotation")); alignFrameMenuBar.add(fileMenu); alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(selectMenu); @@ -1922,7 +1921,7 @@ public class GAlignFrame extends JInternalFrame calculateMenu.add(sortByTree); calculateMenu.addSeparator(); calculateMenu.add(extractScores); - webServiceNoServices = new JMenuItem(""); + webServiceNoServices = new JMenuItem(MessageManager.getString("label.no_services")); webService.add(webServiceNoServices); pasteMenu.add(pasteNew); pasteMenu.add(pasteThis); diff --git a/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java b/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java index 152fb4d..38fe7a3 100644 --- a/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java +++ b/src/jalview/jbgui/GCutAndPasteHtmlTransfer.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import java.awt.*; import java.awt.event.*; @@ -88,7 +89,7 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame { scrollPane.setBorder(null); ok.setFont(JvSwingUtils.getLabelFont()); - ok.setText("New Window"); + ok.setText(MessageManager.getString("label.new_window")); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -96,7 +97,7 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame ok_actionPerformed(e); } }); - cancel.setText("Close"); + cancel.setText(MessageManager.getString("action.close")); cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -105,7 +106,7 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame } }); textarea.setBorder(null); - close.setText("Close"); + close.setText(MessageManager.getString("action.close")); close.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -116,7 +117,7 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame close.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_W, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); - selectAll.setText("Select All"); + selectAll.setText(MessageManager.getString("action.select_all")); selectAll.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_A, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -127,8 +128,8 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame selectAll_actionPerformed(e); } }); - jMenu1.setText("File"); - save.setText("Save"); + jMenu1.setText(MessageManager.getString("action.file")); + save.setText(MessageManager.getString("action.save")); save.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -153,8 +154,8 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame textarea_mousePressed(e); } }); - editMenu.setText("Edit"); - copyItem.setText("Copy"); + editMenu.setText(MessageManager.getString("action.edit")); + copyItem.setText(MessageManager.getString("action.copy")); copyItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -162,9 +163,9 @@ public class GCutAndPasteHtmlTransfer extends JInternalFrame copyItem_actionPerformed(e); } }); - displaySource.setText("Show HTML Source"); + displaySource.setText(MessageManager.getString("action.show_html_source")); displaySource - .setToolTipText("Select this if you want to copy raw html"); + .setToolTipText(MessageManager.getString("label.select_copy_raw_html")); displaySource.addActionListener(new ActionListener() { diff --git a/src/jalview/jbgui/GCutAndPasteTransfer.java b/src/jalview/jbgui/GCutAndPasteTransfer.java index c310704..ecfe2af 100755 --- a/src/jalview/jbgui/GCutAndPasteTransfer.java +++ b/src/jalview/jbgui/GCutAndPasteTransfer.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import java.awt.*; import java.awt.event.*; @@ -85,7 +86,7 @@ public class GCutAndPasteTransfer extends JInternalFrame { scrollPane.setBorder(null); ok.setFont(JvSwingUtils.getLabelFont()); - ok.setText("New Window"); + ok.setText(MessageManager.getString("label.new_window")); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -93,7 +94,7 @@ public class GCutAndPasteTransfer extends JInternalFrame ok_actionPerformed(e); } }); - cancel.setText("Close"); + cancel.setText(MessageManager.getString("action.close")); cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -103,7 +104,7 @@ public class GCutAndPasteTransfer extends JInternalFrame }); textarea.setBorder(null); - selectAll.setText("Select All"); + selectAll.setText(MessageManager.getString("action.select_all")); selectAll.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_A, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -114,8 +115,8 @@ public class GCutAndPasteTransfer extends JInternalFrame selectAll_actionPerformed(e); } }); - jMenu1.setText("File"); - save.setText("Save"); + jMenu1.setText(MessageManager.getString("action.file")); + save.setText(MessageManager.getString("action.save")); save.setAccelerator(javax.swing.KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S, Toolkit.getDefaultToolkit() .getMenuShortcutKeyMask(), false)); @@ -142,8 +143,8 @@ public class GCutAndPasteTransfer extends JInternalFrame textarea_mousePressed(e); } }); - editMenu.setText("Edit"); - pasteMenu.setText("Paste"); + editMenu.setText(MessageManager.getString("action.edit")); + pasteMenu.setText(MessageManager.getString("action.paste")); pasteMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -151,7 +152,7 @@ public class GCutAndPasteTransfer extends JInternalFrame pasteMenu_actionPerformed(e); } }); - copyItem.setText("Copy"); + copyItem.setText(MessageManager.getString("action.copy")); copyItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/jbgui/GDasSourceBrowser.java b/src/jalview/jbgui/GDasSourceBrowser.java index b38ab7e..e01d0c7 100755 --- a/src/jalview/jbgui/GDasSourceBrowser.java +++ b/src/jalview/jbgui/GDasSourceBrowser.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -40,7 +42,7 @@ public class GDasSourceBrowser extends JPanel private void jbInit() throws Exception { this.setLayout(gridBagLayout1); - refresh.setText("Refresh Available Sources"); + refresh.setText(MessageManager.getString("label.refresh_available_sources")); refresh.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -64,8 +66,8 @@ public class GDasSourceBrowser extends JPanel fullDetails.setEditable(false); registryLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); registryLabel.setHorizontalAlignment(SwingConstants.TRAILING); - registryLabel.setText("Use Registry"); - addLocal.setText("Add Local Source"); + registryLabel.setText(MessageManager.getString("label.use_registry")); + addLocal.setText(MessageManager.getString("label.add_local_source")); addLocal.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -91,7 +93,7 @@ public class GDasSourceBrowser extends JPanel table.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); reset.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); reset.setMargin(new Insets(2, 2, 2, 2)); - reset.setText("Reset"); + reset.setText(MessageManager.getString("action.reset")); reset.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -140,7 +142,7 @@ public class GDasSourceBrowser extends JPanel protected JEditorPane fullDetails = new JEditorPane("text/html", ""); - TitledBorder titledBorder1 = new TitledBorder("Available DAS Sources"); + TitledBorder titledBorder1 = new TitledBorder(MessageManager.getString("label.available_das_sources")); protected JButton refresh = new JButton(); @@ -148,7 +150,7 @@ public class GDasSourceBrowser extends JPanel protected JScrollPane scrollPane = new JScrollPane(); - TitledBorder titledBorder2 = new TitledBorder("Full Details"); + TitledBorder titledBorder2 = new TitledBorder(MessageManager.getString("label.full_details")); protected JScrollPane fullDetailsScrollpane = new JScrollPane(); @@ -176,11 +178,11 @@ public class GDasSourceBrowser extends JPanel GridBagLayout gridBagLayout1 = new GridBagLayout(); - TitledBorder titledBorder3 = new TitledBorder("Authority:"); + TitledBorder titledBorder3 = new TitledBorder(MessageManager.getString("label.authority") + ":"); - TitledBorder titledBorder4 = new TitledBorder("Type:"); + TitledBorder titledBorder4 = new TitledBorder(MessageManager.getString("label.type") + ":"); - TitledBorder titledBorder5 = new TitledBorder("Label:"); + TitledBorder titledBorder5 = new TitledBorder(MessageManager.getString("label.label") + ":"); JButton reset = new JButton(); diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java index 778fd01..4ef6fdd 100755 --- a/src/jalview/jbgui/GDesktop.java +++ b/src/jalview/jbgui/GDesktop.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; @@ -127,13 +129,13 @@ public class GDesktop extends JFrame */ private void jbInit() throws Exception { - FileMenu.setText("File"); - HelpMenu.setText("Help"); + FileMenu.setText(MessageManager.getString("action.file")); + HelpMenu.setText(MessageManager.getString("action.help")); VamsasMenu.setText("Vamsas"); - VamsasMenu.setToolTipText("Share data with other vamsas applications."); - VamsasStMenu.setText("Connect to"); - VamsasStMenu.setToolTipText("Join an existing vamsas session"); - inputLocalFileMenuItem.setText("from File"); + VamsasMenu.setToolTipText(MessageManager.getString("label.share_data_vamsas_applications")); + VamsasStMenu.setText(MessageManager.getString("label.connect_to")); + VamsasStMenu.setToolTipText(MessageManager.getString("label.join_existing_vamsas_session")); + inputLocalFileMenuItem.setText(MessageManager.getString("label.load_tree_from_file")); inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_O, Toolkit .getDefaultToolkit().getMenuShortcutKeyMask(), false)); @@ -145,7 +147,7 @@ public class GDesktop extends JFrame inputLocalFileMenuItem_actionPerformed(null); } }); - inputURLMenuItem.setText("from URL"); + inputURLMenuItem.setText(MessageManager.getString("label.from_url")); inputURLMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -153,7 +155,7 @@ public class GDesktop extends JFrame inputURLMenuItem_actionPerformed(null); } }); - inputTextboxMenuItem.setText("from Textbox"); + inputTextboxMenuItem.setText(MessageManager.getString("label.from_textbox")); inputTextboxMenuItem .addActionListener(new java.awt.event.ActionListener() { @@ -162,7 +164,7 @@ public class GDesktop extends JFrame inputTextboxMenuItem_actionPerformed(null); } }); - quit.setText("Quit"); + quit.setText(MessageManager.getString("action.quit")); quit.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -170,7 +172,7 @@ public class GDesktop extends JFrame quit(); } }); - aboutMenuItem.setText("About"); + aboutMenuItem.setText(MessageManager.getString("label.about")); aboutMenuItem.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -178,7 +180,7 @@ public class GDesktop extends JFrame aboutMenuItem_actionPerformed(e); } }); - documentationMenuItem.setText("Documentation"); + documentationMenuItem.setText(MessageManager.getString("label.documentation")); documentationMenuItem.setAccelerator(javax.swing.KeyStroke .getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0, false)); documentationMenuItem @@ -190,8 +192,8 @@ public class GDesktop extends JFrame } }); this.getContentPane().setLayout(flowLayout1); - windowMenu.setText("Window"); - preferences.setText("Preferences..."); + windowMenu.setText(MessageManager.getString("label.window")); + preferences.setText(MessageManager.getString("label.preferences") + "..."); preferences.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -199,8 +201,8 @@ public class GDesktop extends JFrame preferences_actionPerformed(e); } }); - toolsMenu.setText("Tools"); - saveState.setText("Save Project"); + toolsMenu.setText(MessageManager.getString("label.tools")); + saveState.setText(MessageManager.getString("action.save_project")); saveState.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -208,7 +210,7 @@ public class GDesktop extends JFrame saveState_actionPerformed(e); } }); - loadState.setText("Load Project"); + loadState.setText(MessageManager.getString("action.load_project")); loadState.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -216,8 +218,8 @@ public class GDesktop extends JFrame loadState_actionPerformed(e); } }); - inputMenu.setText("Input Alignment"); - vamsasStart.setText("New Vamsas Session..."); + inputMenu.setText(MessageManager.getString("label.input_alignment")); + vamsasStart.setText(MessageManager.getString("label.new_vamsas_session") + "..."); vamsasStart.setVisible(false); vamsasStart.addActionListener(new ActionListener() { @@ -226,7 +228,7 @@ public class GDesktop extends JFrame vamsasStart_actionPerformed(e); } }); - vamsasImport.setText("Load Vamsas Session..."); + vamsasImport.setText(MessageManager.getString("label.load_vamsas_session") + "..."); vamsasImport.setVisible(false); vamsasImport.addActionListener(new ActionListener() { @@ -235,7 +237,7 @@ public class GDesktop extends JFrame vamsasImport_actionPerformed(e); } }); - vamsasSave.setText("Save Vamsas Session..."); + vamsasSave.setText(MessageManager.getString("label.save_vamsas_session") + "..."); vamsasSave.setVisible(false); vamsasSave.addActionListener(new ActionListener() { @@ -244,7 +246,7 @@ public class GDesktop extends JFrame vamsasSave_actionPerformed(e); } }); - inputSequence.setText("Fetch Sequence(s)..."); + inputSequence.setText(MessageManager.getString("label.fetch_sequences") + "..."); inputSequence.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -252,7 +254,7 @@ public class GDesktop extends JFrame inputSequence_actionPerformed(e); } }); - vamsasStop.setText("Stop Vamsas Session"); + vamsasStop.setText(MessageManager.getString("label.stop_vamsas_session")); vamsasStop.setVisible(false); vamsasStop.addActionListener(new ActionListener() { @@ -261,7 +263,7 @@ public class GDesktop extends JFrame vamsasStop_actionPerformed(e); } }); - closeAll.setText("Close All"); + closeAll.setText(MessageManager.getString("action.close_all")); closeAll.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -269,7 +271,7 @@ public class GDesktop extends JFrame closeAll_actionPerformed(e); } }); - raiseRelated.setText("Raise Associated Windows"); + raiseRelated.setText(MessageManager.getString("action.raise_associated_windows")); raiseRelated.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -277,7 +279,7 @@ public class GDesktop extends JFrame raiseRelated_actionPerformed(e); } }); - minimizeAssociated.setText("Minimize Associated Windows"); + minimizeAssociated.setText(MessageManager.getString("action.minimize_associated_windows")); minimizeAssociated.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -285,7 +287,7 @@ public class GDesktop extends JFrame minimizeAssociated_actionPerformed(e); } }); - garbageCollect.setText("Collect Garbage"); + garbageCollect.setText(MessageManager.getString("label.collect_garbage")); garbageCollect.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -293,7 +295,7 @@ public class GDesktop extends JFrame garbageCollect_actionPerformed(e); } }); - showMemusage.setText("Show Memory Usage"); + showMemusage.setText(MessageManager.getString("label.show_memory_usage")); showMemusage.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -301,7 +303,7 @@ public class GDesktop extends JFrame showMemusage_actionPerformed(e); } }); - showConsole.setText("Show Java Console"); + showConsole.setText(MessageManager.getString("label.show_java_console")); showConsole.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -309,7 +311,7 @@ public class GDesktop extends JFrame showConsole_actionPerformed(e); } }); - showNews.setText("Show Jalview News"); + showNews.setText(MessageManager.getString("label.show_jalview_news")); showNews.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/jbgui/GFinder.java b/src/jalview/jbgui/GFinder.java index 70606a1..d811fee 100755 --- a/src/jalview/jbgui/GFinder.java +++ b/src/jalview/jbgui/GFinder.java @@ -25,6 +25,7 @@ import javax.swing.event.*; import jalview.datamodel.*; import jalview.io.*; +import jalview.util.MessageManager; public class GFinder extends JPanel { @@ -72,10 +73,10 @@ public class GFinder extends JPanel private void jbInit() throws Exception { jLabel1.setFont(new java.awt.Font("Verdana", 0, 12)); - jLabel1.setText("Find"); + jLabel1.setText(MessageManager.getString("action.find")); this.setLayout(borderLayout1); findAll.setFont(new java.awt.Font("Verdana", 0, 12)); - findAll.setText("Find all"); + findAll.setText(MessageManager.getString("action.find_all")); findAll.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -84,7 +85,7 @@ public class GFinder extends JPanel } }); findNext.setFont(new java.awt.Font("Verdana", 0, 12)); - findNext.setText("Find Next"); + findNext.setText(MessageManager.getString("action.find_next")); findNext.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -99,7 +100,7 @@ public class GFinder extends JPanel createNewGroup.setEnabled(false); createNewGroup.setFont(new java.awt.Font("Verdana", 0, 12)); createNewGroup.setMargin(new Insets(0, 0, 0, 0)); - createNewGroup.setText("New Feature"); + createNewGroup.setText(MessageManager.getString("label.new_feature")); createNewGroup.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -131,7 +132,7 @@ public class GFinder extends JPanel jPanel2.setPreferredSize(new Dimension(10, 1)); jPanel3.setPreferredSize(new Dimension(10, 1)); caseSensitive.setHorizontalAlignment(SwingConstants.LEFT); - caseSensitive.setText("Match Case"); + caseSensitive.setText(MessageManager.getString("label.match_case")); jPanel1.add(findNext, null); jPanel1.add(findAll, null); jPanel1.add(createNewGroup, null); diff --git a/src/jalview/jbgui/GFontChooser.java b/src/jalview/jbgui/GFontChooser.java index a33c1b0..5f1748e 100755 --- a/src/jalview/jbgui/GFontChooser.java +++ b/src/jalview/jbgui/GFontChooser.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import java.awt.*; import java.awt.event.*; @@ -94,7 +95,7 @@ public class GFontChooser extends JPanel { jLabel1.setFont(new java.awt.Font("Verdana", 0, 11)); jLabel1.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel1.setText("Font: "); + jLabel1.setText(MessageManager.getString("label.font")); jLabel1.setVerticalTextPosition(javax.swing.SwingConstants.CENTER); this.setLayout(null); fontSize.setFont(new java.awt.Font("Verdana", 0, 11)); @@ -119,11 +120,11 @@ public class GFontChooser extends JPanel }); jLabel2.setFont(new java.awt.Font("Verdana", 0, 11)); jLabel2.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel2.setText("Size: "); + jLabel2.setText(MessageManager.getString("label.size")); jLabel2.setVerticalTextPosition(javax.swing.SwingConstants.CENTER); jLabel3.setFont(new java.awt.Font("Verdana", 0, 11)); jLabel3.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel3.setText("Style: "); + jLabel3.setText(MessageManager.getString("label.style")); jLabel3.setVerticalTextPosition(javax.swing.SwingConstants.CENTER); fontName.setFont(new java.awt.Font("Verdana", 0, 11)); fontName.setMaximumSize(new Dimension(32767, 32767)); @@ -138,7 +139,7 @@ public class GFontChooser extends JPanel } }); ok.setFont(new java.awt.Font("Verdana", 0, 11)); - ok.setText("OK"); + ok.setText(MessageManager.getString("action.ok")); ok.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -147,7 +148,7 @@ public class GFontChooser extends JPanel } }); cancel.setFont(new java.awt.Font("Verdana", 0, 11)); - cancel.setText("Cancel"); + cancel.setText(MessageManager.getString("action.cancel")); cancel.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -166,7 +167,7 @@ public class GFontChooser extends JPanel jPanel3.setBounds(new Rectangle(174, 38, 134, 21)); jPanel3.setLayout(borderLayout2); defaultButton.setFont(JvSwingUtils.getLabelFont()); - defaultButton.setText("Set as Default"); + defaultButton.setText(MessageManager.getString("label.set_as_default")); defaultButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -176,7 +177,7 @@ public class GFontChooser extends JPanel }); smoothFont.setFont(JvSwingUtils.getLabelFont()); smoothFont.setOpaque(false); - smoothFont.setText("Anti-alias Fonts (Slower to render)"); + smoothFont.setText(MessageManager.getString("label.anti_alias_fonts")); smoothFont.setBounds(new Rectangle(41, 65, 223, 23)); smoothFont.addActionListener(new ActionListener() { @@ -188,8 +189,8 @@ public class GFontChooser extends JPanel monospaced.setEnabled(false); monospaced.setFont(JvSwingUtils.getLabelFont()); monospaced.setOpaque(false); - monospaced.setToolTipText("Monospaced fonts are faster to render"); - monospaced.setText("Monospaced"); + monospaced.setToolTipText(MessageManager.getString("label.monospaced_fonts_faster_to_render")); + monospaced.setText(MessageManager.getString("label.monospaced_font")); jPanel4.setOpaque(false); jPanel4.setBounds(new Rectangle(24, 92, 259, 35)); jPanel1.add(jLabel1, BorderLayout.WEST); diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java index edfbf99..3968fde 100755 --- a/src/jalview/jbgui/GPCAPanel.java +++ b/src/jalview/jbgui/GPCAPanel.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; @@ -145,7 +147,7 @@ public class GPCAPanel extends JInternalFrame } }); resetButton.setFont(new java.awt.Font("Verdana", 0, 12)); - resetButton.setText("Reset"); + resetButton.setText(MessageManager.getString("action.reset")); resetButton.addActionListener(new java.awt.event.ActionListener() { @Override @@ -154,8 +156,8 @@ public class GPCAPanel extends JInternalFrame resetButton_actionPerformed(e); } }); - fileMenu.setText("File"); - saveMenu.setText("Save as"); + fileMenu.setText(MessageManager.getString("action.file")); + saveMenu.setText(MessageManager.getString("action.save_as")); eps.setText("EPS"); eps.addActionListener(new ActionListener() { @@ -172,7 +174,7 @@ public class GPCAPanel extends JInternalFrame png_actionPerformed(e); } }); - outputValues.setText("Output Values..."); + outputValues.setText(MessageManager.getString("label.output_values")); outputValues.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -180,7 +182,7 @@ public class GPCAPanel extends JInternalFrame outputValues_actionPerformed(e); } }); - outputPoints.setText("Output points..."); + outputPoints.setText(MessageManager.getString("label.output_points")); outputPoints.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -188,7 +190,7 @@ public class GPCAPanel extends JInternalFrame outputPoints_actionPerformed(e); } }); - outputProjPoints.setText("Output transformed points..."); + outputProjPoints.setText(MessageManager.getString("label.output_transformed_points") + "..."); outputProjPoints.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -203,7 +205,7 @@ public class GPCAPanel extends JInternalFrame print_actionPerformed(e); } }); - viewMenu.setText("View"); + viewMenu.setText(MessageManager.getString("aciton.view")); viewMenu.addMenuListener(new MenuListener() { public void menuSelected(MenuEvent e) @@ -219,7 +221,7 @@ public class GPCAPanel extends JInternalFrame { } }); - showLabels.setText("Show Labels"); + showLabels.setText(MessageManager.getString("label.show_labels")); showLabels.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -227,8 +229,8 @@ public class GPCAPanel extends JInternalFrame showLabels_actionPerformed(e); } }); - print.setText("Print"); - bgcolour.setText("Background Colour..."); + print.setText(MessageManager.getString("action.print")); + bgcolour.setText(MessageManager.getString("label.background_colour") + "..."); bgcolour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -236,7 +238,7 @@ public class GPCAPanel extends JInternalFrame bgcolour_actionPerformed(e); } }); - originalSeqData.setText("Input Data..."); + originalSeqData.setText(MessageManager.getString("label.input_data")); originalSeqData.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -244,10 +246,10 @@ public class GPCAPanel extends JInternalFrame originalSeqData_actionPerformed(e); } }); - associateViewsMenu.setText("Associate Nodes With"); - calcSettings.setText("Change Parameters"); - nuclSetting.setText("Nucleotide matrix"); - protSetting.setText("Protein matrix"); + associateViewsMenu.setText(MessageManager.getString("label.associate_nodes_with")); + calcSettings.setText(MessageManager.getString("action.change_params")); + nuclSetting.setText(MessageManager.getString("label.nucleotide_matrix")); + protSetting.setText(MessageManager.getString("label.protein_matrix")); nuclSetting.addActionListener(new ActionListener() { @@ -266,7 +268,7 @@ public class GPCAPanel extends JInternalFrame protSetting_actionPerfomed(arg0); } }); - jvVersionSetting.setText("Jalview PCA Calculation"); + jvVersionSetting.setText(MessageManager.getString("label.jalview_pca_calculation")); jvVersionSetting.addActionListener(new ActionListener() { @Override diff --git a/src/jalview/jbgui/GPairwiseAlignPanel.java b/src/jalview/jbgui/GPairwiseAlignPanel.java index 1e33c11..7a7392d 100755 --- a/src/jalview/jbgui/GPairwiseAlignPanel.java +++ b/src/jalview/jbgui/GPairwiseAlignPanel.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -67,7 +69,7 @@ public class GPairwiseAlignPanel extends JPanel textarea.setText(""); textarea.setWrapStyleWord(false); viewInEditorButton.setFont(new java.awt.Font("Verdana", 0, 12)); - viewInEditorButton.setText("View in alignment editor"); + viewInEditorButton.setText(MessageManager.getString("label.view_alignment_editor")); viewInEditorButton .addActionListener(new java.awt.event.ActionListener() { diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 1230373..a8626d8 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import java.awt.*; import java.awt.event.*; @@ -130,9 +131,9 @@ public class GPreferences extends JPanel JPanel jPanel1 = new JPanel(); - TitledBorder titledBorder1 = new TitledBorder("Proxy Server"); + TitledBorder titledBorder1 = new TitledBorder(MessageManager.getString("label.proxy_server")); - TitledBorder titledBorder2 = new TitledBorder("File Output"); + TitledBorder titledBorder2 = new TitledBorder(MessageManager.getString("label.file_output")); GridBagLayout gridBagLayout2 = new GridBagLayout(); @@ -277,7 +278,7 @@ public class GPreferences extends JPanel private void jbInit() throws Exception { this.setLayout(borderLayout1); - ok.setText("OK"); + ok.setText(MessageManager.getString("action.ok")); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -285,7 +286,7 @@ public class GPreferences extends JPanel ok_actionPerformed(e); } }); - cancel.setText("Cancel"); + cancel.setText(MessageManager.getString("action.cancel")); cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -298,76 +299,76 @@ public class GPreferences extends JPanel quality.setHorizontalAlignment(SwingConstants.RIGHT); quality.setHorizontalTextPosition(SwingConstants.LEFT); quality.setSelected(true); - quality.setText("Quality"); - visualTab.setBorder(new TitledBorder("Open new alignment")); + quality.setText(MessageManager.getString("label.quality")); + visualTab.setBorder(new TitledBorder(MessageManager.getString("action.open_new_aligmnent"))); visualTab.setLayout(null); - visual2Tab.setBorder(new TitledBorder("Open new alignment")); + visual2Tab.setBorder(new TitledBorder(MessageManager.getString("action.open_new_aligmnent"))); visual2Tab.setLayout(new FlowLayout()); fullScreen.setFont(verdana11); fullScreen.setHorizontalAlignment(SwingConstants.RIGHT); fullScreen.setHorizontalTextPosition(SwingConstants.LEFT); - fullScreen.setText("Maximise Window"); + fullScreen.setText(MessageManager.getString("label.maximize_window")); conservation.setEnabled(false); conservation.setFont(verdana11); conservation.setHorizontalAlignment(SwingConstants.RIGHT); conservation.setHorizontalTextPosition(SwingConstants.LEFT); conservation.setSelected(true); - conservation.setText("Conservation"); + conservation.setText(MessageManager.getString("label.conservation")); identity.setEnabled(false); identity.setFont(verdana11); identity.setHorizontalAlignment(SwingConstants.RIGHT); identity.setHorizontalTextPosition(SwingConstants.LEFT); identity.setSelected(true); - identity.setText("Consensus"); + identity.setText(MessageManager.getString("label.consensus")); showGroupbits.setFont(verdana11); showGroupbits.setHorizontalAlignment(SwingConstants.RIGHT); showGroupbits.setHorizontalTextPosition(SwingConstants.LEFT); - showGroupbits.setText("Show group:"); + showGroupbits.setText(MessageManager.getString("action.show_group") + ":"); showConsensbits.setFont(verdana11); showConsensbits.setHorizontalAlignment(SwingConstants.RIGHT); showConsensbits.setHorizontalTextPosition(SwingConstants.LEFT); - showConsensbits.setText("Consensus:"); + showConsensbits.setText(MessageManager.getString("label.consensus") + ":"); showConsensHistogram.setEnabled(false); showConsensHistogram.setFont(verdana11); showConsensHistogram.setHorizontalAlignment(SwingConstants.RIGHT); showConsensHistogram.setHorizontalTextPosition(SwingConstants.LEFT); showConsensHistogram.setSelected(true); - showConsensHistogram.setText("Histogram"); + showConsensHistogram.setText(MessageManager.getString("label.histogram")); showConsensLogo.setEnabled(false); showConsensLogo.setFont(verdana11); showConsensLogo.setHorizontalAlignment(SwingConstants.RIGHT); showConsensLogo.setHorizontalTextPosition(SwingConstants.LEFT); showConsensLogo.setSelected(true); - showConsensLogo.setText("Logo"); + showConsensLogo.setText(MessageManager.getString("label.logo")); showGroupConsensus.setEnabled(false); showGroupConsensus.setFont(verdana11); showGroupConsensus.setHorizontalAlignment(SwingConstants.RIGHT); showGroupConsensus.setHorizontalTextPosition(SwingConstants.LEFT); showGroupConsensus.setSelected(true); - showGroupConsensus.setText("Consensus"); + showGroupConsensus.setText(MessageManager.getString("label.consensus")); showGroupConservation.setEnabled(false); showGroupConservation.setFont(verdana11); showGroupConservation.setHorizontalAlignment(SwingConstants.RIGHT); showGroupConservation.setHorizontalTextPosition(SwingConstants.LEFT); showGroupConservation.setSelected(true); - showGroupConservation.setText("Conservation"); + showGroupConservation.setText(MessageManager.getString("label.conservation")); showNpTooltip.setEnabled(true); showNpTooltip.setFont(verdana11); showNpTooltip.setHorizontalAlignment(SwingConstants.RIGHT); showNpTooltip.setHorizontalTextPosition(SwingConstants.LEFT); showNpTooltip.setSelected(true); - showNpTooltip.setText("Non-positional Features"); + showNpTooltip.setText(MessageManager.getString("label.non_positional_features")); showDbRefTooltip.setEnabled(true); showDbRefTooltip.setFont(verdana11); showDbRefTooltip.setHorizontalAlignment(SwingConstants.RIGHT); showDbRefTooltip.setHorizontalTextPosition(SwingConstants.LEFT); showDbRefTooltip.setSelected(true); - showDbRefTooltip.setText("Database References"); + showDbRefTooltip.setText(MessageManager.getString("label.database_references")); annotations.setFont(verdana11); annotations.setHorizontalAlignment(SwingConstants.RIGHT); annotations.setHorizontalTextPosition(SwingConstants.LEADING); annotations.setSelected(true); - annotations.setText("Show Annotations"); + annotations.setText(MessageManager.getString("label.show_annotations")); annotations.setBounds(new Rectangle(169, 12, 200, 23)); annotations.addActionListener(new ActionListener() { @@ -394,7 +395,7 @@ public class GPreferences extends JPanel showUnconserved.setHorizontalAlignment(SwingConstants.RIGHT); showUnconserved.setHorizontalTextPosition(SwingConstants.LEFT); showUnconserved.setSelected(true); - showUnconserved.setText("Show Unconserved"); + showUnconserved.setText(MessageManager.getString("action.show_unconserved")); showUnconserved.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -407,25 +408,25 @@ public class GPreferences extends JPanel shareSelections.setHorizontalAlignment(SwingConstants.RIGHT); shareSelections.setHorizontalTextPosition(SwingConstants.LEFT); shareSelections.setSelected(true); - shareSelections.setText("Share selection across views"); + shareSelections.setText(MessageManager.getString("label.share_selection_across_views")); followHighlight.setFont(verdana11); followHighlight.setHorizontalAlignment(SwingConstants.RIGHT); followHighlight.setHorizontalTextPosition(SwingConstants.LEFT); // showUnconserved.setBounds(new Rectangle(169, 40, 200, 23)); followHighlight.setSelected(true); - followHighlight.setText("Scroll to highlighted regions"); + followHighlight.setText(MessageManager.getString("label.scroll_highlighted_regions")); gapLabel.setFont(verdana11); gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); - gapLabel.setText("Gap Symbol "); + gapLabel.setText(MessageManager.getString("label.gap_symbol") + " "); colour.setFont(verdana11); colour.setBounds(new Rectangle(172, 225, 155, 21)); colourLabel.setFont(verdana11); colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); - colourLabel.setText("Alignment Colour "); + colourLabel.setText(MessageManager.getString("label.alignment_colour") + " "); fontLabel.setFont(verdana11); fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); - fontLabel.setText("Font "); + fontLabel.setText(MessageManager.getString("label.font")); fontSizeCB.setFont(verdana11); fontSizeCB.setBounds(new Rectangle(319, 104, 49, 23)); fontStyleCB.setFont(verdana11); @@ -436,7 +437,7 @@ public class GPreferences extends JPanel gapSymbolCB.setBounds(new Rectangle(172, 204, 69, 23)); mincolourLabel.setFont(verdana11); mincolourLabel.setHorizontalAlignment(SwingConstants.RIGHT); - mincolourLabel.setText("Minimum Colour"); + mincolourLabel.setText(MessageManager.getString("label.min_colour")); minColour.setFont(verdana11); minColour.setBorder(BorderFactory.createEtchedBorder()); minColour.setPreferredSize(new Dimension(40, 20)); @@ -449,7 +450,7 @@ public class GPreferences extends JPanel }); maxcolourLabel.setFont(verdana11); maxcolourLabel.setHorizontalAlignment(SwingConstants.RIGHT); - maxcolourLabel.setText("Maximum Colour "); + maxcolourLabel.setText(MessageManager.getString("label.max_colour")); maxColour.setFont(verdana11); maxColour.setBorder(BorderFactory.createEtchedBorder()); maxColour.setPreferredSize(new Dimension(40, 20)); @@ -461,7 +462,7 @@ public class GPreferences extends JPanel } }); - startupCheckbox.setText("Open file"); + startupCheckbox.setText(MessageManager.getString("action.open_file")); startupCheckbox.setFont(verdana11); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT); @@ -480,32 +481,32 @@ public class GPreferences extends JPanel }); connectTab.setLayout(gridBagLayout3); - serverLabel.setText("Address"); + serverLabel.setText(MessageManager.getString("label.address")); serverLabel.setHorizontalAlignment(SwingConstants.RIGHT); serverLabel.setFont(verdana11); proxyServerTB.setFont(verdana11); proxyPortTB.setFont(verdana11); portLabel.setFont(verdana11); portLabel.setHorizontalAlignment(SwingConstants.RIGHT); - portLabel.setText("Port"); + portLabel.setText(MessageManager.getString("label.port")); browserLabel.setFont(new java.awt.Font("SansSerif", 0, 11)); browserLabel.setHorizontalAlignment(SwingConstants.TRAILING); - browserLabel.setText("Default Browser (Unix)"); + browserLabel.setText(MessageManager.getString("label.default_browser_unix")); defaultBrowser.setFont(verdana11); defaultBrowser.setText(""); - usagestats.setText("Send usage statistics"); + usagestats.setText(MessageManager.getString("label.send_usage_statistics")); usagestats.setFont(verdana11); usagestats.setHorizontalAlignment(SwingConstants.RIGHT); usagestats.setHorizontalTextPosition(SwingConstants.LEADING); - questionnaire.setText("Check for questionnaires"); + questionnaire.setText(MessageManager.getString("label.check_for_questionnaires")); questionnaire.setFont(verdana11); questionnaire.setHorizontalAlignment(SwingConstants.RIGHT); questionnaire.setHorizontalTextPosition(SwingConstants.LEADING); - versioncheck.setText("Check for latest version"); + versioncheck.setText(MessageManager.getString("label.check_for_latest_version")); versioncheck.setFont(verdana11); versioncheck.setHorizontalAlignment(SwingConstants.RIGHT); versioncheck.setHorizontalTextPosition(SwingConstants.LEADING); - newLink.setText("New"); + newLink.setText(MessageManager.getString("action.new")); newLink.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -513,7 +514,7 @@ public class GPreferences extends JPanel newLink_actionPerformed(e); } }); - editLink.setText("Edit"); + editLink.setText(MessageManager.getString("action.edit")); editLink.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -521,7 +522,7 @@ public class GPreferences extends JPanel editLink_actionPerformed(e); } }); - deleteLink.setText("Delete"); + deleteLink.setText(MessageManager.getString("action.delete")); deleteLink.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -549,7 +550,7 @@ public class GPreferences extends JPanel }); linkScrollPane.setBorder(null); - linkPanel.setBorder(new TitledBorder("URL link from Sequence ID")); + linkPanel.setBorder(new TitledBorder(MessageManager.getString("label.url_linkfrom_sequence_id"))); linkPanel.setLayout(borderLayout2); editLinkButtons.setLayout(gridLayout1); gridLayout1.setRows(3); @@ -572,7 +573,7 @@ public class GPreferences extends JPanel useProxy.setFont(verdana11); useProxy.setHorizontalAlignment(SwingConstants.RIGHT); useProxy.setHorizontalTextPosition(SwingConstants.LEADING); - useProxy.setText("Use a proxy server"); + useProxy.setText(MessageManager.getString("label.use_proxy_server")); useProxy.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -586,32 +587,32 @@ public class GPreferences extends JPanel sortby.setBounds(new Rectangle(172, 249, 155, 21)); sortLabel.setFont(verdana11); sortLabel.setHorizontalAlignment(SwingConstants.RIGHT); - sortLabel.setText("Sort by "); + sortLabel.setText(MessageManager.getString("label.sort_by")); jPanel2.setBounds(new Rectangle(7, 17, 158, 278)); jPanel2.setLayout(gridLayout2); gridLayout2.setRows(12); exportTab.setLayout(null); epsLabel.setFont(verdana11); epsLabel.setHorizontalAlignment(SwingConstants.RIGHT); - epsLabel.setText("EPS Rendering Style"); + epsLabel.setText(MessageManager.getString("label.eps_rendering_style")); epsLabel.setBounds(new Rectangle(9, 31, 140, 24)); epsRendering.setFont(verdana11); epsRendering.setBounds(new Rectangle(154, 34, 187, 21)); jLabel1.setFont(verdana11); jLabel1.setHorizontalAlignment(SwingConstants.CENTER); - jLabel1.setText("Append /start-end (/15-380)"); + jLabel1.setText(MessageManager.getString("label.append_start_end")); jLabel1.setFont(verdana11); fastajv.setFont(verdana11); fastajv.setHorizontalAlignment(SwingConstants.LEFT); - clustaljv.setText("Clustal "); - blcjv.setText("BLC "); - fastajv.setText("Fasta "); - msfjv.setText("MSF "); - pfamjv.setText("PFAM "); - pileupjv.setText("Pileup "); + clustaljv.setText(MessageManager.getString("label.clustal") + " "); + blcjv.setText(MessageManager.getString("label.blc") + " "); + fastajv.setText(MessageManager.getString("label.fasta") + " "); + msfjv.setText(MessageManager.getString("label.msf")+ " "); + pfamjv.setText(MessageManager.getString("label.pfam") + " "); + pileupjv.setText(MessageManager.getString("label.pileup") + " "); msfjv.setFont(verdana11); msfjv.setHorizontalAlignment(SwingConstants.LEFT); - pirjv.setText("PIR "); + pirjv.setText(MessageManager.getString("label.pir") + " "); jPanel11.setFont(verdana11); jPanel11.setBorder(titledBorder2); jPanel11.setBounds(new Rectangle(30, 72, 196, 182)); @@ -629,27 +630,27 @@ public class GPreferences extends JPanel seqLimit.setFont(verdana11); seqLimit.setHorizontalAlignment(SwingConstants.RIGHT); seqLimit.setHorizontalTextPosition(SwingConstants.LEFT); - seqLimit.setText("Full Sequence Id"); + seqLimit.setText(MessageManager.getString("label.full_sequence_id")); gridLayout3.setRows(8); smoothFont.setFont(verdana11); smoothFont.setHorizontalAlignment(SwingConstants.RIGHT); smoothFont.setHorizontalTextPosition(SwingConstants.LEADING); - smoothFont.setText("Smooth Font"); + smoothFont.setText(MessageManager.getString("label.smooth_font")); calcTab.setLayout(null); autoCalculateConsCheck.setFont(JvSwingUtils.getLabelFont()); - autoCalculateConsCheck.setText("AutoCalculate Consensus"); + autoCalculateConsCheck.setText(MessageManager.getString("label.autocalculate_consensus")); autoCalculateConsCheck.setBounds(new Rectangle(21, 52, 209, 23)); padGaps.setFont(JvSwingUtils.getLabelFont()); - padGaps.setText("Pad Gaps When Editing"); + padGaps.setText(MessageManager.getString("label.pad_gaps_when_editing")); padGaps.setBounds(new Rectangle(22, 94, 168, 23)); sortByTree.setFont(JvSwingUtils.getLabelFont()); - sortByTree.setText("Sort With New Tree"); + sortByTree.setText(MessageManager.getString("label.sort_with_new_tree")); sortByTree - .setToolTipText("When selected, any trees calculated or loaded onto the alignment will automatically sort the alignment."); + .setToolTipText(MessageManager.getString("label.any_trees_calculated_or_loaded_alignment_automatically_sort")); sortByTree.setBounds(new Rectangle(22, 136, 168, 23)); autoIdWidth.setFont(JvSwingUtils.getLabelFont()); - autoIdWidth.setText("Automatically set ID width"); + autoIdWidth.setText(MessageManager.getString("label.automatically_set_id_width")); autoIdWidth .setToolTipText("" + JvSwingUtils @@ -666,7 +667,7 @@ public class GPreferences extends JPanel } }); userIdWidthlabel.setFont(JvSwingUtils.getLabelFont()); - userIdWidthlabel.setText("Figure ID column width"); + userIdWidthlabel.setText(MessageManager.getString("label.figure_id_column_width")); userIdWidth .setToolTipText("" + JvSwingUtils @@ -691,7 +692,7 @@ public class GPreferences extends JPanel } }); modellerOutput.setFont(JvSwingUtils.getLabelFont()); - modellerOutput.setText("Use Modeller Output"); + modellerOutput.setText(MessageManager.getString("label.use_modeller_output")); modellerOutput.setBounds(new Rectangle(228, 226, 168, 23)); dasPanel.setLayout(borderLayout4); @@ -699,21 +700,21 @@ public class GPreferences extends JPanel wrap.setFont(JvSwingUtils.getLabelFont()); wrap.setHorizontalAlignment(SwingConstants.TRAILING); wrap.setHorizontalTextPosition(SwingConstants.LEADING); - wrap.setText("Wrap Alignment"); + wrap.setText(MessageManager.getString("label.wrap_alignment")); rightAlign.setFont(JvSwingUtils.getLabelFont()); rightAlign.setForeground(Color.black); rightAlign.setHorizontalAlignment(SwingConstants.RIGHT); rightAlign.setHorizontalTextPosition(SwingConstants.LEFT); - rightAlign.setText("Right Align Ids"); + rightAlign.setText(MessageManager.getString("label.right_align_ids")); idItalics.setFont(JvSwingUtils.getLabelFont()); idItalics.setHorizontalAlignment(SwingConstants.RIGHT); idItalics.setHorizontalTextPosition(SwingConstants.LEADING); - idItalics.setText("Sequence Name Italics"); + idItalics.setText(MessageManager.getString("label.sequence_name_italics")); openoverv.setFont(JvSwingUtils.getLabelFont()); - openoverv.setActionCommand("Open Overview"); + openoverv.setActionCommand(MessageManager.getString("label.open_overview")); openoverv.setHorizontalAlignment(SwingConstants.RIGHT); openoverv.setHorizontalTextPosition(SwingConstants.LEFT); - openoverv.setText("Open Overview"); + openoverv.setText(MessageManager.getString(("label.open_overview"))); jPanel2.add(fullScreen); jPanel2.add(openoverv); jPanel2.add(seqLimit); @@ -764,7 +765,7 @@ public class GPreferences extends JPanel autoAnnotSettings3.add(showConsensLogo); JPanel tooltipSettings = new JPanel(); - tooltipSettings.setBorder(new TitledBorder("Sequence ID Tooltip")); + tooltipSettings.setBorder(new TitledBorder(MessageManager.getString("label.sequence_id_tooltip"))); tooltipSettings.setBounds(173, 130, 200, 62); tooltipSettings.setLayout(new GridLayout(2, 1)); tooltipSettings.add(showDbRefTooltip); @@ -772,16 +773,16 @@ public class GPreferences extends JPanel visualTab.add(tooltipSettings); visualTab.add(jPanel2); JvSwingUtils.addtoLayout(visual2Tab, - "Default Colourscheme for alignment", colourLabel, colour); + MessageManager.getString("label.default_colour_scheme_for_alignment"), colourLabel, colour); JPanel annotationShding = new JPanel(); annotationShding.setBorder(new TitledBorder( - "Annotation Shading Default")); + MessageManager.getString("label.annotation_shading_default"))); annotationShding.setLayout(new GridLayout(1, 2)); JvSwingUtils.addtoLayout(annotationShding, - "Default Minimum Colour for annotation shading", + MessageManager.getString("label.default_minimum_colour_annotation_shading"), mincolourLabel, minColour); JvSwingUtils.addtoLayout(annotationShding, - "Default Maximum Colour for annotation shading", + MessageManager.getString("label.default_maximum_colour_annotation_shading"), maxcolourLabel, maxColour); visual2Tab.add(annotationShding); // , FlowLayout.LEFT); @@ -843,10 +844,10 @@ public class GPreferences extends JPanel dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER); gapSymbolCB.setRenderer(dlcr); - tabbedPane.add(visualTab, "Visual"); - tabbedPane.add(visual2Tab, "Colours"); - tabbedPane.add(connectTab, "Connections"); - tabbedPane.add(exportTab, "Output"); + tabbedPane.add(visualTab, MessageManager.getString("label.visual")); + tabbedPane.add(visual2Tab, MessageManager.getString("label.colours")); + tabbedPane.add(connectTab, MessageManager.getString("label.connections")); + tabbedPane.add(exportTab, MessageManager.getString("label.output")); jPanel11.add(jLabel1); jPanel11.add(blcjv); jPanel11.add(clustaljv); @@ -859,13 +860,13 @@ public class GPreferences extends JPanel exportTab.add(userIdWidth); exportTab.add(userIdWidthlabel); exportTab.add(modellerOutput); - tabbedPane.add(calcTab, "Editing"); + tabbedPane.add(calcTab, MessageManager.getString("label.editing")); calcTab.add(autoCalculateConsCheck); calcTab.add(padGaps); calcTab.add(sortByTree); - tabbedPane.add(dasPanel, "DAS Settings"); - tabbedPane.add(wsPanel, "Web Services"); + tabbedPane.add(dasPanel, MessageManager.getString("label.das_settings")); + tabbedPane.add(wsPanel, MessageManager.getString("label.web_services")); exportTab.add(epsLabel); exportTab.add(epsRendering); diff --git a/src/jalview/jbgui/GRestInputParamEditDialog.java b/src/jalview/jbgui/GRestInputParamEditDialog.java index 15f6f81..9580d43 100644 --- a/src/jalview/jbgui/GRestInputParamEditDialog.java +++ b/src/jalview/jbgui/GRestInputParamEditDialog.java @@ -24,6 +24,7 @@ import java.awt.event.KeyListener; import jalview.gui.JvSwingUtils; import jalview.gui.OptsAndParamsPage; +import jalview.util.MessageManager; import javax.swing.*; import javax.swing.border.TitledBorder; @@ -95,16 +96,16 @@ public class GRestInputParamEditDialog optionsPanel = new JPanel(new MigLayout("", "[fill]", "[fill]")); JScrollPane optionView = new JScrollPane(); optionView.setViewportView(options); - JvSwingUtils.mgAddtoLayout(dpane, "Input Parameter name", new JLabel( - "Name"), tok, "grow,spanx 3,wrap"); + JvSwingUtils.mgAddtoLayout(dpane, MessageManager.getString("label.input_parameter_name"), new JLabel( + MessageManager.getString("label.name")), tok, "grow,spanx 3,wrap"); JPanel paramsType = new JPanel(new MigLayout("", "[grow 100,fill]", "[grow 100,fill]")); - paramsType.setBorder(new TitledBorder("Select input type")); + paramsType.setBorder(new TitledBorder(MessageManager.getString("label.select_input_type"))); JScrollPane jlistScroller = new JScrollPane(); jlistScroller.setViewportView(typeList); paramsType.add(jlistScroller, "spanx 2,spany 2"); dpane.add(paramsType); - optionsPanel.setBorder(new TitledBorder("Set options for type")); + optionsPanel.setBorder(new TitledBorder(MessageManager.getString("label.set_options_for_type"))); optionsPanel.add(optionView); dpane.add(optionsPanel, "wrap"); okcancel = new JPanel(new MigLayout("", "[center][center]", "[]")); diff --git a/src/jalview/jbgui/GRestServiceEditorPane.java b/src/jalview/jbgui/GRestServiceEditorPane.java index 14c03bf..97ad295 100644 --- a/src/jalview/jbgui/GRestServiceEditorPane.java +++ b/src/jalview/jbgui/GRestServiceEditorPane.java @@ -86,13 +86,13 @@ public class GRestServiceEditorPane extends JPanel protected void jbInit() { details = new JPanel(); - details.setName("Details"); + details.setName(MessageManager.getString("label.details")); details.setLayout(new MigLayout()); inputs = new JPanel(); - inputs.setName("Input/Output"); + inputs.setName(MessageManager.getString("label.input_output")); inputs.setLayout(new MigLayout("", "[grow 85,fill][]", "")); paste = new JPanel(); - paste.setName("Cut'n'Paste"); + paste.setName(MessageManager.getString("label.cut_paste")); paste.setLayout(new MigLayout("", "[grow 100, fill]", "[][grow 100,fill]")); @@ -108,19 +108,19 @@ public class GRestServiceEditorPane extends JPanel name = new JTextArea(1, 12); JvSwingUtils.mgAddtoLayout(cpanel, - "Short descriptive name for service", new JLabel(MessageManager.getString("label.name")), + MessageManager.getString("label.short_descriptive_name_for_service"), new JLabel(MessageManager.getString("label.name")), name, "wrap"); action = new JComboBox(); JvSwingUtils .mgAddtoLayout( cpanel, - "What kind of function the service performs (e.g. alignment, analysis, search, etc).", + MessageManager.getString("label.function_service_performs"), new JLabel(MessageManager.getString("label.service_action")), action, "wrap"); descr = new JTextArea(4, 60); descrVp = new JScrollPane(); descrVp.setViewportView(descr); - JvSwingUtils.mgAddtoLayout(cpanel, "Brief description of service", - new JLabel("Description:"), descrVp, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, MessageManager.getString("label.brief_description_service"), + new JLabel(MessageManager.getString("label.description")), descrVp, "wrap"); url = new JTextArea(2, 60); urlVp = new JScrollPane(); @@ -128,7 +128,7 @@ public class GRestServiceEditorPane extends JPanel JvSwingUtils .mgAddtoLayout( cpanel, - "URL to post data to service. Include any special parameters needed here", + MessageManager.getString("label.url_post_data_service"), new JLabel(MessageManager.getString("label.post_url")), urlVp, "wrap"); urlsuff = new JTextArea(); @@ -137,7 +137,7 @@ public class GRestServiceEditorPane extends JPanel JvSwingUtils .mgAddtoLayout( cpanel, - "Optional suffix added to URL when retrieving results from service", + MessageManager.getString("label.optional_suffix"), new JLabel(MessageManager.getString("label.url_suffix")), urlsuff, "wrap"); // input options @@ -180,8 +180,8 @@ public class GRestServiceEditorPane extends JPanel }); gapChar = new JComboBox(); JvSwingUtils.mgAddtoLayout(cpanel, - "Which gap character does this service prefer ?", new JLabel( - "Gap Character:"), gapChar, "wrap"); + MessageManager.getString("label.preferred_gap_character"), new JLabel( + MessageManager.getString("label.gap_character") + ":"), gapChar, "wrap"); cpanel.add(hSeparable); cpanel.add(vSeparable); @@ -189,7 +189,7 @@ public class GRestServiceEditorPane extends JPanel // Input and Output lists // Inputparams JPanel iprmsList = new JPanel(); - iprmsList.setBorder(new TitledBorder("Data input parameters")); + iprmsList.setBorder(new TitledBorder(MessageManager.getString("label.data_input_parameters"))); iprmsList.setLayout(new MigLayout("", "[grow 90, fill][]")); iprmVp = new JScrollPane(); iprmVp.getViewport().setView(iprms = new JList()); @@ -239,7 +239,7 @@ public class GRestServiceEditorPane extends JPanel JPanel iprmButs = new JPanel(); iprmButs.setLayout(new MigLayout()); - iprmsAdd = JvSwingUtils.makeButton("+", "Add input parameter", + iprmsAdd = JvSwingUtils.makeButton("+", MessageManager.getString("action.add_input_parameter"), new ActionListener() { @@ -251,7 +251,7 @@ public class GRestServiceEditorPane extends JPanel } }); iprmsRem = JvSwingUtils.makeButton("-", - "Remove selected input parameter", new ActionListener() + MessageManager.getString("action.remove_input_parameter"), new ActionListener() { @Override @@ -269,7 +269,7 @@ public class GRestServiceEditorPane extends JPanel // Return Parameters - rdataAdd = JvSwingUtils.makeButton("+", "Add return datatype", + rdataAdd = JvSwingUtils.makeButton("+", MessageManager.getString("action.add_return_datatype"), new ActionListener() { @@ -280,7 +280,7 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataRem = JvSwingUtils.makeButton("-", "Remove return datatype", + rdataRem = JvSwingUtils.makeButton("-", MessageManager.getString("action.remove_return_datatype"), new ActionListener() { @@ -291,8 +291,8 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataNup = JvSwingUtils.makeButton("Move Up", - "Move return type up order", new ActionListener() + rdataNup = JvSwingUtils.makeButton(MessageManager.getString("action.move_up"), + MessageManager.getString("label.move_return_type_up_order"), new ActionListener() { @Override @@ -302,8 +302,8 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataNdown = JvSwingUtils.makeButton("Move Down", - "Move return type down order", new ActionListener() + rdataNdown = JvSwingUtils.makeButton(MessageManager.getString("action.move_down"), + MessageManager.getString("label.move_return_type_down_order"), new ActionListener() { @Override @@ -315,10 +315,10 @@ public class GRestServiceEditorPane extends JPanel }); JPanel rparamList = new JPanel(); - rparamList.setBorder(new TitledBorder("Data returned by service")); + rparamList.setBorder(new TitledBorder(MessageManager.getString("label.data_returned_by_service"))); rparamList.setLayout(new MigLayout("", "[grow 90, fill][]")); rdata = new JList(); - rdata.setToolTipText("Right click to edit currently selected parameter."); + rdata.setToolTipText(MessageManager.getString("label.right_click_to_edit_currently_selected_parameter")); rdata.addMouseListener(new MouseListener() { @@ -381,7 +381,7 @@ public class GRestServiceEditorPane extends JPanel JPanel urldescPane = new JPanel(); urldescPane.setLayout(new MigLayout("", "[grow 100, fill]", "[grow 100, fill]")); - urldescPane.setBorder(new TitledBorder("RSBS Encoded Service")); + urldescPane.setBorder(new TitledBorder(MessageManager.getString("label.rsbs_encoded_service"))); urldescPane.add(urldescVp, "span"); paste.add(urldescPane, "span"); urldescPane @@ -396,7 +396,7 @@ public class GRestServiceEditorPane extends JPanel parseRes.setColumns(60); parseWarnings = new JPanel(new MigLayout("", "[grow 100, fill]", "[grow 100, fill]")); - parseWarnings.setBorder(new TitledBorder("Parsing errors")); + parseWarnings.setBorder(new TitledBorder(MessageManager.getString("label.parsing_errors"))); parseWarnings .setToolTipText("" + JvSwingUtils @@ -407,7 +407,7 @@ public class GRestServiceEditorPane extends JPanel paste.add(parseWarnings, "span"); setLayout(new BorderLayout()); add(panels, BorderLayout.CENTER); - okButton = JvSwingUtils.makeButton("OK", "", new ActionListener() + okButton = JvSwingUtils.makeButton(MessageManager.getString("action.ok"), "", new ActionListener() { @Override @@ -416,7 +416,7 @@ public class GRestServiceEditorPane extends JPanel ok_actionPerformed(); } }); - cancelButton = JvSwingUtils.makeButton("Cancel", "", + cancelButton = JvSwingUtils.makeButton(MessageManager.getString("action.cancel"), "", new ActionListener() { diff --git a/src/jalview/jbgui/GSequenceLink.java b/src/jalview/jbgui/GSequenceLink.java index 2b0cec0..cb4d90f 100755 --- a/src/jalview/jbgui/GSequenceLink.java +++ b/src/jalview/jbgui/GSequenceLink.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import jalview.util.UrlLink; import java.awt.*; @@ -62,11 +63,11 @@ public class GSequenceLink extends Panel }); jLabel1.setFont(JvSwingUtils.getLabelFont()); jLabel1.setHorizontalAlignment(SwingConstants.TRAILING); - jLabel1.setText("Link Name"); + jLabel1.setText(MessageManager.getString("label.link_name")); jLabel1.setBounds(new Rectangle(4, 10, 71, 24)); jLabel2.setFont(JvSwingUtils.getLabelFont()); jLabel2.setHorizontalAlignment(SwingConstants.TRAILING); - jLabel2.setText("URL"); + 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=//=$"); diff --git a/src/jalview/jbgui/GSliderPanel.java b/src/jalview/jbgui/GSliderPanel.java index 4d995ec..72224c3 100755 --- a/src/jalview/jbgui/GSliderPanel.java +++ b/src/jalview/jbgui/GSliderPanel.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -108,13 +110,13 @@ public class GSliderPanel extends JPanel label.setFont(new java.awt.Font("Verdana", 0, 11)); label.setOpaque(false); label.setHorizontalAlignment(SwingConstants.CENTER); - label.setText("set this label text"); + label.setText(MessageManager.getString("label.set_this_label_text")); southPanel.setLayout(borderLayout1); gridLayout1.setRows(2); jPanel2.setLayout(flowLayout1); applyButton.setFont(new java.awt.Font("Verdana", 0, 11)); applyButton.setOpaque(false); - applyButton.setText("Apply"); + applyButton.setText(MessageManager.getString("action.apply")); applyButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -125,7 +127,7 @@ public class GSliderPanel extends JPanel undoButton.setEnabled(false); undoButton.setFont(new java.awt.Font("Verdana", 0, 11)); undoButton.setOpaque(false); - undoButton.setText("Undo"); + undoButton.setText(MessageManager.getString("action.undo")); undoButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -136,7 +138,7 @@ public class GSliderPanel extends JPanel allGroupsCheck.setEnabled(false); allGroupsCheck.setFont(new java.awt.Font("Verdana", 0, 11)); allGroupsCheck.setOpaque(false); - allGroupsCheck.setText("Apply to all Groups"); + allGroupsCheck.setText(MessageManager.getString("action.apply_all_groups")); allGroupsCheck.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java index 7aed6a7..c60d732 100644 --- a/src/jalview/jbgui/GStructureViewer.java +++ b/src/jalview/jbgui/GStructureViewer.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import javax.swing.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; @@ -38,10 +40,10 @@ public class GStructureViewer extends JInternalFrame private void jbInit() throws Exception { this.setJMenuBar(menuBar); - fileMenu.setText("File"); - savemenu.setActionCommand("Save Image"); - savemenu.setText("Save As"); - pdbFile.setText("PDB File"); + fileMenu.setText(MessageManager.getString("action.file")); + savemenu.setActionCommand(MessageManager.getString("action.save_image")); + savemenu.setText(MessageManager.getString("action.save_as")); + pdbFile.setText(MessageManager.getString("label.pdb_file")); pdbFile.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -65,7 +67,7 @@ public class GStructureViewer extends JInternalFrame eps_actionPerformed(actionEvent); } }); - viewMapping.setText("View Mapping"); + viewMapping.setText(MessageManager.getString("label.view_mapping")); viewMapping.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -73,10 +75,10 @@ public class GStructureViewer extends JInternalFrame viewMapping_actionPerformed(actionEvent); } }); - viewMenu.setText("View"); - chainMenu.setText("Show Chain"); - colourMenu.setText("Colours"); - backGround.setText("Background Colour..."); + viewMenu.setText(MessageManager.getString("action.view")); + chainMenu.setText(MessageManager.getString("action.show_chain")); + colourMenu.setText(MessageManager.getString("label.colours")); + backGround.setText(MessageManager.getString("label.background_colour") + "..."); backGround.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -85,7 +87,7 @@ public class GStructureViewer extends JInternalFrame } }); seqColour.setSelected(false); - seqColour.setText("By Sequence"); + seqColour.setText(MessageManager.getString("action.by_sequence")); seqColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -93,7 +95,7 @@ public class GStructureViewer extends JInternalFrame seqColour_actionPerformed(actionEvent); } }); - chainColour.setText("By Chain"); + chainColour.setText(MessageManager.getString("action.by_chain")); chainColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -101,7 +103,7 @@ public class GStructureViewer extends JInternalFrame chainColour_actionPerformed(actionEvent); } }); - chargeColour.setText("Charge & Cysteine"); + chargeColour.setText(MessageManager.getString("label.charge_cysteine")); chargeColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -109,7 +111,7 @@ public class GStructureViewer extends JInternalFrame chargeColour_actionPerformed(actionEvent); } }); - zappoColour.setText("Zappo"); + zappoColour.setText(MessageManager.getString("label.zappo")); zappoColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -117,7 +119,7 @@ public class GStructureViewer extends JInternalFrame zappoColour_actionPerformed(actionEvent); } }); - taylorColour.setText("Taylor"); + taylorColour.setText(MessageManager.getString("label.taylor")); taylorColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -125,7 +127,7 @@ public class GStructureViewer extends JInternalFrame taylorColour_actionPerformed(actionEvent); } }); - hydroColour.setText("Hydro"); + hydroColour.setText(MessageManager.getString("label.hydrophobicity")); hydroColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -133,7 +135,7 @@ public class GStructureViewer extends JInternalFrame hydroColour_actionPerformed(actionEvent); } }); - strandColour.setText("Strand"); + strandColour.setText(MessageManager.getString("label.strand_propensity")); strandColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -141,7 +143,7 @@ public class GStructureViewer extends JInternalFrame strandColour_actionPerformed(actionEvent); } }); - helixColour.setText("Helix Propensity"); + helixColour.setText(MessageManager.getString("label.helix_propensity")); helixColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -149,7 +151,7 @@ public class GStructureViewer extends JInternalFrame helixColour_actionPerformed(actionEvent); } }); - turnColour.setText("Turn Propensity"); + turnColour.setText(MessageManager.getString("label.turn_propensity")); turnColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -157,7 +159,7 @@ public class GStructureViewer extends JInternalFrame turnColour_actionPerformed(actionEvent); } }); - buriedColour.setText("Buried Index"); + buriedColour.setText(MessageManager.getString("label.buried_index")); buriedColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -165,7 +167,7 @@ public class GStructureViewer extends JInternalFrame buriedColour_actionPerformed(actionEvent); } }); - purinePyrimidineColour.setText("Purine/Pyrimidine"); + purinePyrimidineColour.setText(MessageManager.getString("label.purine_pyrimidine")); purinePyrimidineColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -174,7 +176,7 @@ public class GStructureViewer extends JInternalFrame } }); - userColour.setText("User Defined ..."); + userColour.setText(MessageManager.getString("action.user_defined")); userColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -183,8 +185,8 @@ public class GStructureViewer extends JInternalFrame } }); jmolColour.setSelected(false); - jmolColour.setText("Colour with Jmol"); - jmolColour.setToolTipText("Let Jmol manage structure colours."); + jmolColour.setText(MessageManager.getString("label.colour_with_jmol")); + jmolColour.setToolTipText(MessageManager.getString("label.let_jmol_manage_structure_colours")); jmolColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -192,8 +194,8 @@ public class GStructureViewer extends JInternalFrame jmolColour_actionPerformed(actionEvent); } }); - helpMenu.setText("Help"); - jmolHelp.setText("Jmol Help"); + helpMenu.setText(MessageManager.getString("action.help")); + jmolHelp.setText(MessageManager.getString("label.jmol_help")); jmolHelp.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -201,7 +203,7 @@ public class GStructureViewer extends JInternalFrame jmolHelp_actionPerformed(actionEvent); } }); - alignStructs.setText("Align structures"); + alignStructs.setText(MessageManager.getString("label.align_structures")); alignStructs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent actionEvent) @@ -209,7 +211,7 @@ public class GStructureViewer extends JInternalFrame alignStructs_actionPerformed(actionEvent); } }); - jmolActionMenu.setText("Jmol"); + jmolActionMenu.setText(MessageManager.getString("label.jmol")); menuBar.add(fileMenu); menuBar.add(viewMenu); menuBar.add(colourMenu); diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java index 42ea2f5..47f94c5 100755 --- a/src/jalview/jbgui/GTreePanel.java +++ b/src/jalview/jbgui/GTreePanel.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; import javax.swing.*; @@ -81,8 +83,8 @@ public class GTreePanel extends JInternalFrame this.setBackground(Color.white); this.setFont(new java.awt.Font("Verdana", 0, 12)); scrollPane.setOpaque(false); - fileMenu.setText("File"); - saveAsNewick.setText("Newick Format"); + fileMenu.setText(MessageManager.getString("action.file")); + saveAsNewick.setText(MessageManager.getString("label.newick_format")); saveAsNewick.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -90,7 +92,7 @@ public class GTreePanel extends JInternalFrame saveAsNewick_actionPerformed(e); } }); - printMenu.setText("Print"); + printMenu.setText(MessageManager.getString("action.print")); printMenu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -98,7 +100,7 @@ public class GTreePanel extends JInternalFrame printMenu_actionPerformed(e); } }); - viewMenu.setText("View"); + viewMenu.setText(MessageManager.getString("action.view")); viewMenu.addMenuListener(new MenuListener() { public void menuSelected(MenuEvent e) @@ -114,7 +116,7 @@ public class GTreePanel extends JInternalFrame { } }); - sortAssocViews.setText("Sort Alignment By Tree"); + sortAssocViews.setText(MessageManager.getString("label.sort_alignment_by_tree")); sortAssocViews.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -122,7 +124,7 @@ public class GTreePanel extends JInternalFrame sortByTree_actionPerformed(e); } }); - font.setText("Font..."); + font.setText(MessageManager.getString("action.font")); font.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -130,7 +132,7 @@ public class GTreePanel extends JInternalFrame font_actionPerformed(e); } }); - bootstrapMenu.setText("Show Bootstrap Values"); + bootstrapMenu.setText(MessageManager.getString("label.show_bootstrap_values")); bootstrapMenu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -138,7 +140,7 @@ public class GTreePanel extends JInternalFrame bootstrapMenu_actionPerformed(e); } }); - distanceMenu.setText("Show Distances"); + distanceMenu.setText(MessageManager.getString("label.show_distances")); distanceMenu.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -147,7 +149,7 @@ public class GTreePanel extends JInternalFrame } }); fitToWindow.setSelected(true); - fitToWindow.setText("Fit To Window"); + fitToWindow.setText(MessageManager.getString("label.fit_to_window")); fitToWindow.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -171,10 +173,10 @@ public class GTreePanel extends JInternalFrame pngTree_actionPerformed(e); } }); - saveAsMenu.setText("Save as"); + saveAsMenu.setText(MessageManager.getString("action.save_as")); placeholdersMenu - .setToolTipText("Marks leaves of tree not associated with a sequence"); - placeholdersMenu.setText("Mark Unlinked Leaves"); + .setToolTipText(MessageManager.getString("label.marks_leaves_tree_not_associated_with_sequence")); + placeholdersMenu.setText(MessageManager.getString("label.mark_unlinked_leaves")); placeholdersMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -182,7 +184,7 @@ public class GTreePanel extends JInternalFrame placeholdersMenu_actionPerformed(e); } }); - textbox.setText("Output to Textbox..."); + textbox.setText(MessageManager.getString("label.out_to_textbox") + "..."); textbox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -190,7 +192,7 @@ public class GTreePanel extends JInternalFrame textbox_actionPerformed(e); } }); - originalSeqData.setText("Input Data..."); + originalSeqData.setText(MessageManager.getString("label.input_data")); originalSeqData.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -198,7 +200,7 @@ public class GTreePanel extends JInternalFrame originalSeqData_actionPerformed(e); } }); - associateLeavesMenu.setText("Associate Leaves With"); + associateLeavesMenu.setText(MessageManager.getString("label.associate_leaves_with")); this.getContentPane().add(scrollPane, BorderLayout.CENTER); jMenuBar1.add(fileMenu); jMenuBar1.add(viewMenu); diff --git a/src/jalview/jbgui/GUserDefinedColours.java b/src/jalview/jbgui/GUserDefinedColours.java index 0293aaf..e097d85 100755 --- a/src/jalview/jbgui/GUserDefinedColours.java +++ b/src/jalview/jbgui/GUserDefinedColours.java @@ -19,6 +19,7 @@ package jalview.jbgui; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import java.awt.*; import java.awt.event.*; @@ -114,7 +115,7 @@ public class GUserDefinedColours extends JPanel gridLayout.setColumns(4); gridLayout.setRows(5); okButton.setFont(new java.awt.Font("Verdana", 0, 11)); - okButton.setText("OK"); + okButton.setText(MessageManager.getString("action.ok")); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -123,7 +124,7 @@ public class GUserDefinedColours extends JPanel } }); applyButton.setFont(new java.awt.Font("Verdana", 0, 11)); - applyButton.setText("Apply"); + applyButton.setText(MessageManager.getString("action.apply")); applyButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -132,7 +133,7 @@ public class GUserDefinedColours extends JPanel } }); loadbutton.setFont(new java.awt.Font("Verdana", 0, 11)); - loadbutton.setText("Load scheme"); + loadbutton.setText(MessageManager.getString("action.load_scheme")); loadbutton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -141,7 +142,7 @@ public class GUserDefinedColours extends JPanel } }); savebutton.setFont(new java.awt.Font("Verdana", 0, 11)); - savebutton.setText("Save scheme"); + savebutton.setText(MessageManager.getString("action.save_scheme")); savebutton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -150,7 +151,7 @@ public class GUserDefinedColours extends JPanel } }); cancelButton.setFont(JvSwingUtils.getLabelFont()); - cancelButton.setText("Cancel"); + cancelButton.setText(MessageManager.getString("action.cancel")); cancelButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -163,7 +164,7 @@ public class GUserDefinedColours extends JPanel lowerPanel.setLayout(borderLayout3); colorChooser.setOpaque(false); jLabel1.setFont(JvSwingUtils.getLabelFont()); - jLabel1.setText("Name"); + jLabel1.setText(MessageManager.getString("label.name")); namePanel.setMinimumSize(new Dimension(300, 31)); namePanel.setOpaque(false); namePanel.setPreferredSize(new Dimension(240, 25)); @@ -180,9 +181,8 @@ public class GUserDefinedColours extends JPanel label.setFont(new java.awt.Font("Verdana", Font.ITALIC, 10)); label.setOpaque(false); label.setPreferredSize(new Dimension(260, 34)); - label.setText("Save your colour scheme with a unique name and it will be added " - + "to the Colour menu."); - caseSensitive.setText("Case Sensitive"); + label.setText(MessageManager.formatMessage("label.html_content", new String[]{MessageManager.getString("label.save_colour_scheme_with_unique_name_added_to_colour_menu")})); + caseSensitive.setText(MessageManager.getString("label.case_sensitive")); caseSensitive.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -190,7 +190,7 @@ public class GUserDefinedColours extends JPanel caseSensitive_actionPerformed(e); } }); - lcaseColour.setText("Lower Case Colour"); + lcaseColour.setText(MessageManager.getString("label.lower_case_colour")); lcaseColour.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/jbgui/GWebserviceInfo.java b/src/jalview/jbgui/GWebserviceInfo.java index c246b59..21d9b47 100755 --- a/src/jalview/jbgui/GWebserviceInfo.java +++ b/src/jalview/jbgui/GWebserviceInfo.java @@ -18,8 +18,11 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.*; import java.awt.event.*; + import javax.swing.*; /** @@ -94,7 +97,7 @@ public class GWebserviceInfo extends JPanel jScrollPane1.setBorder(null); jScrollPane1.setPreferredSize(new Dimension(400, 70)); cancel.setFont(new java.awt.Font("Verdana", 0, 11)); - cancel.setText("Cancel"); + cancel.setText(MessageManager.getString("action.cancel")); cancel.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent e) @@ -104,8 +107,8 @@ public class GWebserviceInfo extends JPanel }); buttonPanel.setLayout(gridBagLayout1); buttonPanel.setOpaque(false); - showResultsNewFrame.setText("New Window"); - mergeResults.setText("Merge Results"); + showResultsNewFrame.setText(MessageManager.getString("label.new_window")); + mergeResults.setText(MessageManager.getString("action.merge_results")); this.setBackground(Color.white); this.add(jPanel1, BorderLayout.NORTH); jPanel1.add(jScrollPane1, BorderLayout.CENTER); diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java index 7114e1d..889fcb7 100644 --- a/src/jalview/jbgui/GWsPreferences.java +++ b/src/jalview/jbgui/GWsPreferences.java @@ -18,6 +18,8 @@ */ package jalview.jbgui; +import jalview.util.MessageManager; + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; @@ -51,7 +53,7 @@ public class GWsPreferences extends JPanel protected JList sbrsList = new JList(); protected TitledBorder sbrsListTitleBorder = new TitledBorder( - "Simple Bioinformatics Rest Services"); + MessageManager.getString("label.simple_bioinformatics_rest_services")); protected JButton newSbrsUrl = new JButton(); @@ -63,7 +65,7 @@ public class GWsPreferences extends JPanel protected JTable wsList = new JTable(); protected TitledBorder wsListTitleBorder = new TitledBorder( - "Web Service Discovery URLS"); + MessageManager.getString("label.web_service_discovery_urls")); protected JButton newWsUrl = new JButton(); @@ -138,7 +140,7 @@ public class GWsPreferences extends JPanel { refreshWs.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - refreshWs.setText("Refresh Services"); + refreshWs.setText(MessageManager.getString("action.refresh_services")); refreshWs.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -147,7 +149,7 @@ public class GWsPreferences extends JPanel } }); resetWs.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - resetWs.setText("Reset Services"); + resetWs.setText(MessageManager.getString("action.reset_services")); resetWs.addActionListener(new ActionListener() { @@ -157,9 +159,9 @@ public class GWsPreferences extends JPanel } }); indexByHost.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - indexByHost.setText("Index by host"); + indexByHost.setText(MessageManager.getString("label.index_by_host")); indexByHost - .setToolTipText("Index web services in menu by the host site."); + .setToolTipText(MessageManager.getString("label.index_web_services_menu_by_host_site")); indexByHost.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -168,7 +170,7 @@ public class GWsPreferences extends JPanel } }); indexByType.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - indexByType.setText("Index by type"); + indexByType.setText(MessageManager.getString("label.index_by_type")); indexByType.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -178,7 +180,7 @@ public class GWsPreferences extends JPanel }); enableEnfinServices .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - enableEnfinServices.setText("Enable Enfin Services"); + enableEnfinServices.setText(MessageManager.getString("label.enable_enfin_services")); enableEnfinServices.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -188,7 +190,7 @@ public class GWsPreferences extends JPanel }); enableJws2Services .setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - enableJws2Services.setText("Enable JABAWS Services"); + enableJws2Services.setText(MessageManager.getString("label.enable_jabaws_services")); enableJws2Services.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -197,9 +199,9 @@ public class GWsPreferences extends JPanel } }); displayWsWarning.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - displayWsWarning.setText("Display warnings"); + displayWsWarning.setText(MessageManager.getString("label.display_warnings")); displayWsWarning - .setToolTipText("Check this option if you want to be informed
when a web service URL cannot be accessed by Jalview
when it starts up"); + .setToolTipText("" + MessageManager.getString("label.option_want_informed_web_service_URL_cannot_be_accessed_jalview_when_starts_up")); displayWsWarning.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -208,7 +210,7 @@ public class GWsPreferences extends JPanel } }); newWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - newWsUrl.setText("New Service URL"); + newWsUrl.setText(MessageManager.getString("label.new_service_url")); newWsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -217,7 +219,7 @@ public class GWsPreferences extends JPanel } }); editWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - editWsUrl.setText("Edit Service URL"); + editWsUrl.setText(MessageManager.getString("label.edit_service_url")); editWsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -227,7 +229,7 @@ public class GWsPreferences extends JPanel }); deleteWsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - deleteWsUrl.setText("Delete Service URL"); + deleteWsUrl.setText(MessageManager.getString("label.delete_service_url")); deleteWsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -236,8 +238,8 @@ public class GWsPreferences extends JPanel } }); moveWsUrlUp.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - moveWsUrlUp.setText("Up"); - moveWsUrlUp.setToolTipText("Move URL up"); + moveWsUrlUp.setText(MessageManager.getString("action.move_up")); + moveWsUrlUp.setToolTipText(MessageManager.getString("label.move_url_up")); moveWsUrlUp.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -246,8 +248,8 @@ public class GWsPreferences extends JPanel } }); moveWsUrlDown.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - moveWsUrlDown.setText("Down"); - moveWsUrlDown.setToolTipText("Move URL Down"); + moveWsUrlDown.setText(MessageManager.getString("action.move_down")); + moveWsUrlDown.setToolTipText(MessageManager.getString("label.move_url_down")); moveWsUrlDown.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -256,7 +258,7 @@ public class GWsPreferences extends JPanel } }); newSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - newSbrsUrl.setText("Add a SBRS definition"); + newSbrsUrl.setText(MessageManager.getString("label.add_sbrs_definition")); newSbrsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -265,7 +267,7 @@ public class GWsPreferences extends JPanel } }); editSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - editSbrsUrl.setText("Edit SBRS definition"); + editSbrsUrl.setText(MessageManager.getString("label.edit_sbrs_definition")); editSbrsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -275,7 +277,7 @@ public class GWsPreferences extends JPanel }); deleteSbrsUrl.setFont(new java.awt.Font("Verdana", Font.PLAIN, 10)); - deleteSbrsUrl.setText("Delete SBRS definition"); + deleteSbrsUrl.setText(MessageManager.getString("label.delete_sbrs_definition")); deleteSbrsUrl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) diff --git a/src/jalview/util/ImageMaker.java b/src/jalview/util/ImageMaker.java index 18d8436..4d11276 100755 --- a/src/jalview/util/ImageMaker.java +++ b/src/jalview/util/ImageMaker.java @@ -56,7 +56,7 @@ public class ImageMaker chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle(title); - chooser.setToolTipText("Save"); + chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(parent); diff --git a/src/jalview/ws/DBRefFetcher.java b/src/jalview/ws/DBRefFetcher.java index 12b4158..9742bca 100644 --- a/src/jalview/ws/DBRefFetcher.java +++ b/src/jalview/ws/DBRefFetcher.java @@ -31,6 +31,7 @@ import jalview.gui.CutAndPasteTransfer; import jalview.gui.Desktop; import jalview.gui.IProgressIndicator; import jalview.gui.OOMWarning; +import jalview.util.MessageManager; import jalview.ws.dbsources.das.api.jalviewSourceI; import jalview.ws.seqfetcher.DbSourceProxy; @@ -450,17 +451,15 @@ public class DBRefFetcher implements Runnable } // all databases have been queries. if (sbuffer.length() > 0) { - output.setText("Your sequences have been verified against known sequence databases. Some of the ids have been\n" - + "altered, most likely the start/end residue will have been updated.\n" - + "Save your alignment to maintain the updated id.\n\n" + output.setText(MessageManager.getString("label.your_sequences_have_been_verified") + sbuffer.toString()); - Desktop.addInternalFrame(output, "Sequence names updated ", 600, 300); + Desktop.addInternalFrame(output, MessageManager.getString("label.sequence_names_updated"), 600, 300); // The above is the dataset, we must now find out the index // of the viewed sequence } - af.setProgressBar("DBRef search completed", startTime); + af.setProgressBar(MessageManager.getString("label.dbref_search_completed"), startTime); // promptBeforeBlast(); running = false; diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java index 984c004..0a3db0d 100644 --- a/src/jalview/ws/jws2/Jws2Client.java +++ b/src/jalview/ws/jws2/Jws2Client.java @@ -28,6 +28,7 @@ import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.WebserviceInfo; import jalview.gui.WsJobParameters; +import jalview.util.MessageManager; import jalview.ws.jws2.dm.JabaWsParamSet; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.WsParamSetI; @@ -96,7 +97,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient : new WsJobParameters(sh, preset); if (adjustingExisting) { - jobParams.setName("Adjusting parameters for existing Calculation"); + jobParams.setName(MessageManager.getString("label.adjusting_parameters_for_calculation")); } if (!jobParams.showRunDialog()) { diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java index 4e3f81c..278501f 100644 --- a/src/jalview/ws/jws2/MsaWSClient.java +++ b/src/jalview/ws/jws2/MsaWSClient.java @@ -28,6 +28,7 @@ import jalview.datamodel.*; import jalview.gui.*; import compbio.data.msa.MsaWS; import compbio.metadata.Argument; +import jalview.util.MessageManager; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.WsParamSetI; @@ -212,15 +213,15 @@ public class MsaWSClient extends Jws2Client if (submitGaps == true) { action = "Realign "; - msawsmenu = new JMenu("Realign with " + svcname); + msawsmenu = new JMenu(MessageManager.formatMessage("label.realign_with_params", new String[]{svcname})); msawsmenu - .setToolTipText("Align sequences to an existing alignment"); + .setToolTipText(MessageManager.getString("label.align_sequences_to_existing_alignment")); rmsawsmenu.add(msawsmenu); } final boolean withGaps = submitGaps; - JMenuItem method = new JMenuItem(calcName + "with Defaults"); - method.setToolTipText(action + "with default settings"); + JMenuItem method = new JMenuItem(MessageManager.formatMessage("label.calcname_with_default_settings", new String[]{calcName})); + method.setToolTipText(MessageManager.formatMessage("label.action_with_default_settings", new String[]{action})); method.addActionListener(new ActionListener() { @@ -238,8 +239,8 @@ public class MsaWSClient extends Jws2Client { // only add these menu options if the service has user-modifiable // arguments - method = new JMenuItem("Edit settings and run ..."); - method.setToolTipText("View and change the parameters before alignment."); + method = new JMenuItem(MessageManager.getString("label.edit_settings_and_run")); + method.setToolTipText(MessageManager.getString("label.view_and_change_parameters_before_alignment")); method.addActionListener(new ActionListener() { @@ -256,7 +257,7 @@ public class MsaWSClient 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_params", new String[]{calcName})); for (final WsParamSetI preset : presets) { diff --git a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java index 144d88c..a590470 100644 --- a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java +++ b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java @@ -23,6 +23,7 @@ import jalview.bin.Cache; import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.JvSwingUtils; +import jalview.util.MessageManager; import jalview.ws.jws2.dm.AAConSettings; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.WsParamSetI; @@ -172,7 +173,7 @@ public class SequenceAnnotationWSClient extends Jws2Client String calcName = service.serviceType.substring(0, service.serviceType.length() - 2); - JMenuItem annotservice = new JMenuItem(calcName + " Defaults"); + JMenuItem annotservice = new JMenuItem(MessageManager.formatMessage("label.calcname_with_default_settings", new String[]{calcName})); annotservice.addActionListener(new ActionListener() { @@ -187,9 +188,9 @@ public class SequenceAnnotationWSClient extends Jws2Client { // only add these menu options if the service has user-modifiable // arguments - annotservice = new JMenuItem("Edit settings and run ..."); + annotservice = new JMenuItem(MessageManager.getString("label.edit_settings_and_run")); annotservice - .setToolTipText("View and change parameters before running calculation"); + .setToolTipText(MessageManager.getString("label.view_and_change_parameters_before_running_calculation")); annotservice.addActionListener(new ActionListener() { @@ -229,7 +230,7 @@ public class SequenceAnnotationWSClient extends Jws2Client } else { - annotservice = new JMenuItem("View documentation"); + annotservice = new JMenuItem(MessageManager.getString("label.view_documentation")); if (service.docUrl != null) { annotservice.addActionListener(new ActionListener()