Skip to content

Commit 2e42cd5

Browse files
committed
Fix can’t remember the selected languages
1 parent 953f956 commit 2e42cd5

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/main/java/com/airsaid/localization/ui/SelectLanguagesDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void doCreateCenterPanel() {
8787
}
8888

8989
private void addLanguageList(List<Lang> supportedLanguages) {
90-
List<String> selectedLanguageCodes = LanguageUtil.getSelectedLanguageCodes(project);
90+
List<String> selectedLanguageIds = LanguageUtil.getSelectedLanguageIds(project);
9191
languagesPanel.setLayout(new GridLayout(supportedLanguages.size() / 4, 4));
9292
for (Lang language : supportedLanguages) {
9393
String code = language.getCode();
@@ -105,7 +105,7 @@ private void addLanguageList(List<Lang> supportedLanguages) {
105105
// Update the OK button UI
106106
getOKAction().setEnabled(selectedLanguages.size() > 0);
107107
});
108-
if (selectedLanguageCodes != null && selectedLanguageCodes.contains(code)) {
108+
if (selectedLanguageIds != null && selectedLanguageIds.contains(String.valueOf(language.getId()))) {
109109
checkBoxLanguage.setSelected(true);
110110
}
111111
}

src/main/java/com/airsaid/localization/utils/LanguageUtil.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ public static void saveSelectedLanguage(@NotNull Project project, @NotNull List<
5252
Objects.requireNonNull(languages);
5353

5454
PropertiesComponent.getInstance(project)
55-
.setValue(Constants.KEY_SELECTED_LANGUAGES, getLanguageCodeString(languages));
55+
.setValue(Constants.KEY_SELECTED_LANGUAGES, getLanguageIdString(languages));
5656
}
5757

5858
/**
5959
* Get saved language code data in the current project.
6060
*
6161
* @param project current project.
62-
* @return null if not saved, otherwise return the saved language code data.
62+
* @return null if not saved, otherwise return the saved language id data.
6363
*/
6464
@Nullable
65-
public static List<String> getSelectedLanguageCodes(@NotNull Project project) {
65+
public static List<String> getSelectedLanguageIds(@NotNull Project project) {
6666
Objects.requireNonNull(project);
6767

6868
String codeString = PropertiesComponent.getInstance(project)
@@ -76,12 +76,11 @@ public static List<String> getSelectedLanguageCodes(@NotNull Project project) {
7676
}
7777

7878
@NotNull
79-
private static String getLanguageCodeString(@NotNull List<Lang> language) {
79+
private static String getLanguageIdString(@NotNull List<Lang> language) {
8080
StringBuilder codes = new StringBuilder(language.size());
8181
for (int i = 0, len = language.size(); i < len; i++) {
8282
Lang lang = language.get(i);
83-
String code = lang.getCode();
84-
codes.append(code);
83+
codes.append(lang.getId());
8584
if (i < len - 1) {
8685
codes.append(SEPARATOR_SELECTED_LANGUAGES_CODE);
8786
}

0 commit comments

Comments
 (0)