Skip to content

Commit e68fd3c

Browse files
authored
Merge pull request #6186 from effective-webwork/massimport-translate-metadata-keys
Translate metadata keys in mass import record table header
2 parents 56aa1c5 + 76d6dbb commit e68fd3c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Kitodo/src/main/java/org/kitodo/production/forms/massimport/MassImportForm.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void handleFileUpload(FileUploadEvent event) {
110110
resetValues();
111111
if (!csvLines.isEmpty()) {
112112
importedCsvHeaderLine = csvLines.get(0);
113-
metadataKeys = new LinkedList<>(Arrays.asList(csvLines.get(0).split(csvSeparator, -1)));
113+
updateMetadataKeys();
114114
if (csvLines.size() > 1) {
115115
importedCsvLines = csvLines.subList(1, csvLines.size());
116116
records = massImportService.parseLines(importedCsvLines, csvSeparator);
@@ -133,14 +133,19 @@ private void resetValues() {
133133
* Event listender function called when user switches CSV separator character used to split text lines into cells.
134134
*/
135135
public void changeSeparator() {
136-
metadataKeys = new LinkedList<>(Arrays.asList(importedCsvHeaderLine.split(csvSeparator, -1)));
136+
updateMetadataKeys();
137137
try {
138138
records = massImportService.parseLines(importedCsvLines, csvSeparator);
139139
} catch (IOException | CsvException e) {
140140
Helper.setErrorMessage(e);
141141
}
142142
}
143143

144+
private void updateMetadataKeys() {
145+
metadataKeys = Arrays.stream(importedCsvHeaderLine.split(csvSeparator, -1)).map(String::trim)
146+
.collect(Collectors.toList());
147+
}
148+
144149
/**
145150
* Add new CSV lines.
146151
*/
@@ -215,7 +220,7 @@ private void importRecords(Map<String, Map<String, List<String>>> processMetadat
215220
*/
216221
public String getColumnHeader(Integer columnIndex) {
217222
if (columnIndex < metadataKeys.size()) {
218-
return metadataKeys.get(columnIndex);
223+
return Helper.getTranslation(metadataKeys.get(columnIndex));
219224
}
220225
return "";
221226
}

0 commit comments

Comments
 (0)