diff --git a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java index 343ba5b5..55c2d75c 100644 --- a/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java +++ b/src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java @@ -622,6 +622,12 @@ public void verifyText(VerifyEvent event) { data.widthHint = 30 * textSize.x; textProdEndpoint.setLayoutData(data); String endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_PROD); + // try with legacy endpoint property + if (endpoint == null + || endpoint.isBlank() + || endpoint.startsWith(AppConfig.DEFAULT_ENDPOINT_URL_PROD)) { + endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_LEGACY); + } if ("".equals(endpoint)) { //$NON-NLS-1$ endpoint = AppConfig.DEFAULT_ENDPOINT_URL_PROD; } @@ -633,6 +639,12 @@ public void verifyText(VerifyEvent event) { data.widthHint = 30 * textSize.x; textSBEndpoint.setLayoutData(data); endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_SANDBOX); + // try with legacy endpoint property + if (endpoint == null + || endpoint.isBlank() + || endpoint.startsWith(AppConfig.DEFAULT_ENDPOINT_URL_SANDBOX)) { + endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_LEGACY); + } if ("".equals(endpoint)) { //$NON-NLS-1$ endpoint = AppConfig.DEFAULT_ENDPOINT_URL_SANDBOX; } @@ -1176,8 +1188,8 @@ private Text createTimezoneTextInput(Composite parent, String configKey, String t.setText(String.valueOf(val)); buttonLocalSystemTimezone = new Button(timezoneComp, SWT.PUSH | SWT.FLAT); - buttonLocalSystemTimezone.setText(Labels.getString("AdvancedSettingsDialog.setClientSystemTimezone")); //$NON-NLS-1$ - buttonLocalSystemTimezone.setToolTipText(Labels.getString("AdvancedSettingsDialog.TooltipSetClientSystemTimezone")); + buttonLocalSystemTimezone.setText(Labels.getString("AdvancedSettingsDialog.uiLabel.setClientSystemTimezone")); //$NON-NLS-1$ + buttonLocalSystemTimezone.setToolTipText(Labels.getString("AdvancedSettingsDialog.uiTooltip.TooltipSetClientSystemTimezone")); buttonLocalSystemTimezone.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { t.setText(TimeZone.getDefault().getID()); diff --git a/src/main/resources/labels.properties b/src/main/resources/labels.properties index 8ba4a671..9a57423d 100644 --- a/src/main/resources/labels.properties +++ b/src/main/resources/labels.properties @@ -89,8 +89,8 @@ AdvancedSettingsDialog.uiTooltip.sfdc.insertNulls=interpret blank values in mapp AdvancedSettingsDialog.uiLabel.sfdc.assignmentRule=Assignment rule id for Cases/Leads import: AdvancedSettingsDialog.uiLabel.externalIdField=External ID field: AdvancedSettingsDialog.uiLabel.process.useEuropeanDates=Use European date format:\n(dd/mm/yyyy) -AdvancedSettingsDialog.uiLabel.sfdc.endpoint.production=Authentication host domain URL for Production:\n(aka Server host URL. Clear for default) -AdvancedSettingsDialog.uiLabel.sfdc.endpoint.sandbox=Authentication host domain URL for Sandbox:\n(aka Server host URL. Clear for default) +AdvancedSettingsDialog.uiLabel.sfdc.endpoint.Production=Authentication host domain URL for Production:\n(aka Server host URL. Clear for default) +AdvancedSettingsDialog.uiLabel.sfdc.endpoint.Sandbox=Authentication host domain URL for Sandbox:\n(aka Server host URL. Clear for default) AdvancedSettingsDialog.uiLabel.serverURLInfo=Enter an authentication host domain URL that uses HTTPS protocol.\nFor example, "https://login.salesforce.com" is valid.\n\"{0}\" is invalid. AdvancedSettingsDialog.uiLabel.sessionTimeout=Session Timeout:\n(in seconds) AdvancedSettingsDialog.uiLabel.sfdc.noCompression=Disable data compression during upload to the server: @@ -429,7 +429,7 @@ AppConfig.property.description.loader.ui.showUpgrade=Show upgrade dialog if a ne AppConfig.property.description.sfdc.extractionSOQL=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm AppConfig.property.description.loader.csvOther=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm AppConfig.property.description.sfdc.ui.wizard.closeOnFinish=If set to true, it closes UI Wizard dialog when the operation is completed. Set it to false if you want to perform the same operation multiple times. -AppConfig.property.description.sfdc.endpoint.sandbox=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm +AppConfig.property.description.sfdc.endpoint.Sandbox=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm AppConfig.property.description.sfdc.proxyPort=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm AppConfig.property.description.sfdc.useBulkApi=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm AppConfig.property.description.process.mappingFile=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm @@ -462,9 +462,9 @@ AppConfig.property.description.process.enableExtractStatusOutput=Details documen AppConfig.property.description.salesforce.saveAllSettings=Save all Settings, including default ones, in config.properties file, if set to true. Save only the settings that have values different from their defaults if set to false. AppConfig.property.description.loader.query.limitOutputToQueryFields= AppConfig.property.description.sfdc.system.proxyHost=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm -AppConfig.property.description.sfdc.endpoint.production=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm -AppConfig.property.description.sfdc.endpoint=Legacy property, superseded environment-specific properties sfdc.endpoint.production and \ - and sfdc.endpoint.sandbox. See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm +AppConfig.property.description.sfdc.endpoint.Production=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm +AppConfig.property.description.sfdc.endpoint=Legacy property, superseded environment-specific properties sfdc.endpoint.Production and \ + and sfdc.endpoint.Sandbox. See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm AppConfig.property.description.sfdc.oauth.loginfrombrowser= AppConfig.property.description.sfdc.connectionTimeoutSecs=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm AppConfig.property.description.sfdc.insertNulls=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm