Skip to content

localized #1

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
timur9707 wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

localized #1

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ $RECYCLE.BIN/

# Mac crap
.DS_Store
/.metadata/
6 changes: 6 additions & 0 deletions ...a.transfer.ui/src/org/jkiss/dbeaver/tools/transfer/ui/internal/DTUIMessages_ru.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@

data_transfer_wizard_final_column_source = \u0418\u0441\u0442\u043E\u0447\u043D\u0438\u043A

data_transfer_wizard_final_column_target = \u0426\u0435\u043B\u044C

data_transfer_wizard_final_description = \u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438

data_transfer_wizard_final_group_tables = \u0422\u0430\u0431\u043B\u0438\u0446\u044B

data_transfer_wizard_final_name = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C

data_transfer_wizard_final_title = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C

data_transfer_wizard_name = \u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445
49 changes: 32 additions & 17 deletions .../org/jkiss/dbeaver/tools/transfer/ui/pages/database/DatabaseConsumerPageLoadSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.ui.dialogs.ActiveWizardPage;

import java.text.MessageFormat;
import java.util.stream.Collectors;

public class DatabaseConsumerPageLoadSettings extends ActiveWizardPage<DataTransferWizard> {
Expand All @@ -36,9 +37,9 @@ public class DatabaseConsumerPageLoadSettings extends ActiveWizardPage<DataTrans
private Button truncateTargetTable;

public DatabaseConsumerPageLoadSettings() {
super("Data load");
setTitle("Data load settings");
setDescription("Configuration of table data load");
super(DTMessages.data_transfer_wizard_output_group_data_load);
setTitle(DTMessages.data_transfer_wizard_data_load_title);
setDescription(DTMessages.data_transfer_wizard_data_load_description);
}

@Override
Expand All @@ -55,12 +56,12 @@ public void createControl(Composite parent) {
final DatabaseConsumerSettings settings = getSettings();

{
Group loadSettings = UIUtils.createControlGroup(composite, "Data load", 1, GridData.FILL_HORIZONTAL, 0);
Group loadSettings = UIUtils.createControlGroup(composite, DTMessages.data_transfer_wizard_output_group_data_load, 1, GridData.FILL_HORIZONTAL, 0);

transferAutoGeneratedColumns = UIUtils.createCheckbox(
loadSettings,
"Transfer auto-generated columns",
"Transfer values of auto-generated/identity columns.\nIf turned off then such columns will be ignored during transfer.",
DTMessages.data_transfer_wizard_output_transfer_auto_generated_columns,
DTMessages.data_transfer_wizard_output_dialog_transfer_values_of_auto_generated_columns,
settings.isTransferAutoGeneratedColumns(), 1);
transferAutoGeneratedColumns.addSelectionListener(new SelectionAdapter() {
@Override
Expand All @@ -69,7 +70,7 @@ public void widgetSelected(SelectionEvent e) {
}
});

truncateTargetTable = UIUtils.createCheckbox(loadSettings, "Truncate target table(s) before load", settings.isTruncateBeforeLoad());
truncateTargetTable = UIUtils.createCheckbox(loadSettings, DTMessages.data_transfer_wizard_output_checkbox_truncate_table_before_load, settings.isTruncateBeforeLoad());
truncateTargetTable.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Expand All @@ -83,7 +84,7 @@ public void widgetSelected(SelectionEvent e) {
}

{
Group performanceSettings = UIUtils.createControlGroup(composite, "Performance", 4, GridData.FILL_HORIZONTAL, 0);
Group performanceSettings = UIUtils.createControlGroup(composite, DTMessages.data_transfer_wizard_output_group_perfomance, 4, GridData.FILL_HORIZONTAL, 0);

final Button newConnectionCheckbox = UIUtils.createCheckbox(
performanceSettings,
Expand All @@ -98,15 +99,23 @@ public void widgetSelected(SelectionEvent e) {
}
});

final Button useTransactionsCheck = UIUtils.createCheckbox(performanceSettings, "Use transactions", null, settings.isUseTransactions(), 4);
final Button useTransactionsCheck = UIUtils.createCheckbox(
performanceSettings,
DTMessages.data_transfer_wizard_output_checkbox_use_transactions,
null,
settings.isUseTransactions(), 4);
useTransactionsCheck.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
settings.setUseTransactions(useTransactionsCheck.getSelection());
}
});

final Spinner commitAfterEdit = UIUtils.createLabelSpinner(performanceSettings, "Commit after insert of ", settings.getCommitAfterRows(), 1, Integer.MAX_VALUE);
final Spinner commitAfterEdit = UIUtils.createLabelSpinner(performanceSettings,
DTMessages.data_transfer_wizard_output_label_commit_after_insert_of,
settings.getCommitAfterRows(),
1,
Integer.MAX_VALUE);
commitAfterEdit.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Expand All @@ -117,15 +126,23 @@ public void widgetSelected(SelectionEvent e) {
}

{
Group generalSettings = UIUtils.createControlGroup(composite, "General", 4, GridData.FILL_HORIZONTAL, 0);
final Button showTableCheckbox = UIUtils.createCheckbox(generalSettings, "Open table editor on finish", null, settings.isOpenTableOnFinish(), 4);
Group generalSettings = UIUtils.createControlGroup(composite, DTMessages.data_transfer_wizard_output_group_general, 4, GridData.FILL_HORIZONTAL, 0);
final Button showTableCheckbox = UIUtils.createCheckbox(generalSettings,
DTMessages.data_transfer_wizard_output_checkbox_open_editor_on_finish,
null,
settings.isOpenTableOnFinish(),
4);
showTableCheckbox.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
settings.setOpenTableOnFinish(showTableCheckbox.getSelection());
}
});
final Button showFinalMessageCheckbox = UIUtils.createCheckbox(generalSettings, "Show finish message", null, getWizard().getSettings().isShowFinalMessage(), 4);
final Button showFinalMessageCheckbox = UIUtils.createCheckbox(generalSettings,
DTMessages.data_transfer_wizard_output_checkbox_show_finish_message,
null,
getWizard().getSettings().isShowFinalMessage(),
4);
showFinalMessageCheckbox.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
Expand Down Expand Up @@ -159,10 +176,8 @@ private boolean confirmDataTruncate() {
Shell shell = getContainer().getShell();
if (shell.isVisible() || getSettings().isTruncateBeforeLoad()) {
String tableNames = getWizard().getSettings().getDataPipes().stream().map(pipe -> pipe.getConsumer() == null ? "" : pipe.getConsumer().getObjectName()).collect(Collectors.joining(","));
if (!UIUtils.confirmAction(shell, "Data truncate attention", "'Truncate target table' option is enabled.\n" +
"This will remove ALL data from target table(s) (" + tableNames + ").\n" +
"it will not be possible to revert this.\n" +
"Are you absolutely sure you want to proceed?"))
if (!UIUtils.confirmAction(shell, DTMessages.data_transfer_wizard_data_truncate_dialog_name,
MessageFormat.format(DTMessages.data_transfer_wizard_data_truncate_dialog_content, tableNames)))
{
return false;
}
Expand Down
14 changes: 14 additions & 0 deletions ...jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/internal/DTMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,26 @@ public class DTMessages extends NLS {
public static String data_transfer_wizard_output_checkbox_select_row_count;
public static String data_transfer_wizard_output_checkbox_selected_columns_only;
public static String data_transfer_wizard_output_checkbox_selected_rows_only;
public static String data_transfer_wizard_output_checkbox_use_transactions;
public static String data_transfer_wizard_output_checkbox_open_editor_on_finish;
public static String data_transfer_wizard_output_checkbox_show_finish_message;
public static String data_transfer_wizard_output_checkbox_truncate_table_before_load;
public static String data_transfer_wizard_output_transfer_auto_generated_columns;
public static String data_transfer_wizard_output_combo_extract_type_item_by_segments;
public static String data_transfer_wizard_output_combo_extract_type_item_single_query;
public static String data_transfer_wizard_output_description;
public static String data_transfer_wizard_output_dialog_directory_message;
public static String data_transfer_wizard_output_dialog_directory_text;
public static String data_transfer_wizard_data_truncate_dialog_name;
public static String data_transfer_wizard_data_truncate_dialog_content;
public static String data_transfer_wizard_output_dialog_transfer_values_of_auto_generated_columns;
public static String data_transfer_wizard_output_dialog_;
public static String data_transfer_wizard_output_group_general;
public static String data_transfer_wizard_output_group_progress;
public static String data_transfer_wizard_output_group_perfomance;
public static String data_transfer_wizard_output_group_data_load;
public static String data_transfer_wizard_output_label_copy_to_clipboard;
public static String data_transfer_wizard_output_label_commit_after_insert_of;
public static String data_transfer_wizard_output_label_use_single_file;
public static String data_transfer_wizard_output_label_use_single_file_tip;
public static String data_transfer_wizard_output_label_directory;
Expand All @@ -61,6 +73,8 @@ public class DTMessages extends NLS {
public static String data_transfer_wizard_output_label_segment_size;
public static String data_transfer_wizard_output_name;
public static String data_transfer_wizard_output_title;
public static String data_transfer_wizard_data_load_title;
public static String data_transfer_wizard_data_load_description;
public static String data_transfer_wizard_settings_binaries_item_inline;
public static String data_transfer_wizard_settings_binaries_item_save_to_file;
public static String data_transfer_wizard_settings_binaries_item_set_to_null;
Expand Down
Loading