mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

5061 clean up loading of settings

Browse Source
This commit is contained in:
William Schaefer 2019-05-30 13:04:32 -04:00
parent d2bf1777f2
commit fd399e4cfb
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorSettings.java
View File

@ -70,12 +70,14 @@ public final class BingTranslatorSettings {
} }
if (ModuleSettings.settingExists(BING_TRANSLATE_NAME, AUTHENTICATION_KEY)) { if (ModuleSettings.settingExists(BING_TRANSLATE_NAME, AUTHENTICATION_KEY)) {
authenticationKey = ModuleSettings.getConfigSetting(BING_TRANSLATE_NAME, AUTHENTICATION_KEY); authenticationKey = ModuleSettings.getConfigSetting(BING_TRANSLATE_NAME, AUTHENTICATION_KEY);
} else { }
if (authenticationKey == null || StringUtils.isBlank(authenticationKey)) {
authenticationKey = DEFAULT_AUTHENTICATION; authenticationKey = DEFAULT_AUTHENTICATION;
} }
if (ModuleSettings.settingExists(BING_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY)) { if (ModuleSettings.settingExists(BING_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY)) {
targetLanguageCode = ModuleSettings.getConfigSetting(BING_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY); targetLanguageCode = ModuleSettings.getConfigSetting(BING_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY);
} else { }
if (targetLanguageCode == null || StringUtils.isBlank(targetLanguageCode)) {
targetLanguageCode = DEFAULT_TARGET_LANGUAGE; targetLanguageCode = DEFAULT_TARGET_LANGUAGE;
} }
} }

3
Core/src/org/sleuthkit/autopsy/texttranslation/translators/Bundle.properties-MERGED
View File

@ -1,7 +1,7 @@
BingTranslator.name.text=Bing Translator BingTranslator.name.text=Bing Translator
GoogleTranslator.name.text=Google Translate GoogleTranslator.name.text=Google Translate
GoogleTranslatorSettingsPanel.browseButton.text=Browse GoogleTranslatorSettingsPanel.browseButton.text=Browse
GoogleTranslatorSettingsPanel.credentialsLabel.text=Credentials: GoogleTranslatorSettingsPanel.credentialsLabel.text=Authentication key:
GoogleTranslatorSettingsPanel.errorMessage.fileNotFound=Credentials file not found, please set the location to be a valid JSON credentials file. GoogleTranslatorSettingsPanel.errorMessage.fileNotFound=Credentials file not found, please set the location to be a valid JSON credentials file.
GoogleTranslatorSettingsPanel.errorMessage.noFileSelected=A JSON file must be selected to provide your credentials for Google Translate. GoogleTranslatorSettingsPanel.errorMessage.noFileSelected=A JSON file must be selected to provide your credentials for Google Translate.
GoogleTranslatorSettingsPanel.errorMessage.unableToMakeCredentials=Unable to construct credentials object from credentials file, please set the location to be a valid JSON credentials file. GoogleTranslatorSettingsPanel.errorMessage.unableToMakeCredentials=Unable to construct credentials object from credentials file, please set the location to be a valid JSON credentials file.
@ -19,3 +19,4 @@ BingTranslatorSettingsPanel.untranslatedLabel.text=Untranslated:
BingTranslatorSettingsPanel.translationSizeLabel.text=Translation Size: BingTranslatorSettingsPanel.translationSizeLabel.text=Translation Size:
BingTranslatorSettingsPanel.targetLanguageLabel.text=Target Language: BingTranslatorSettingsPanel.targetLanguageLabel.text=Target Language:
BingTranslatorSettingsPanel.unitsLabel.text=characters BingTranslatorSettingsPanel.unitsLabel.text=characters
BingTranslatorSettingsPanel.authenticationKeyField.toolTipText=Enter the hash for the

6
Core/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslatorSettings.java
View File

@ -92,12 +92,14 @@ public final class GoogleTranslatorSettings {
} }
if (ModuleSettings.settingExists(GOOGLE_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY)) { if (ModuleSettings.settingExists(GOOGLE_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY)) {
targetLanguageCode = ModuleSettings.getConfigSetting(GOOGLE_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY); targetLanguageCode = ModuleSettings.getConfigSetting(GOOGLE_TRANSLATE_NAME, TARGET_LANGUAGE_CODE_KEY);
} else { }
if (targetLanguageCode == null || StringUtils.isBlank(targetLanguageCode)) {
targetLanguageCode = DEFAULT_TARGET_LANGUAGE; targetLanguageCode = DEFAULT_TARGET_LANGUAGE;
} }
if (ModuleSettings.settingExists(GOOGLE_TRANSLATE_NAME, CREDENTIAL_PATH_KEY)) { if (ModuleSettings.settingExists(GOOGLE_TRANSLATE_NAME, CREDENTIAL_PATH_KEY)) {
credentialPath = ModuleSettings.getConfigSetting(GOOGLE_TRANSLATE_NAME, CREDENTIAL_PATH_KEY); credentialPath = ModuleSettings.getConfigSetting(GOOGLE_TRANSLATE_NAME, CREDENTIAL_PATH_KEY);
} else { }
if (credentialPath == null) {
credentialPath = DEFAULT_CREDENTIAL_PATH; credentialPath = DEFAULT_CREDENTIAL_PATH;
} }
} }