#1839 Added support for Chinese to React pages and fixed bug with imp…

…orting localization messages that use UTF-8 characters
openboxes · Nov 1, 2020 · 9c12999 · 9c12999
1 parent 97fb170
commit 9c12999
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/grails-app/controllers/org/pih/warehouse/core/LocalizationController.groovy b/grails-app/controllers/org/pih/warehouse/core/LocalizationController.groovy
@@ -11,6 +11,8 @@ package org.pih.warehouse.core
 
 import org.springframework.web.multipart.MultipartFile
 
+import java.nio.charset.Charset
+
 class LocalizationController {
 
  static allowedMethods = [save: "POST", update: "POST", delete: "POST", upload: "POST"]
@@ -142,7 +144,7 @@ class LocalizationController {
  redirect(action: "list", id: params.id)
  }
  } else {
- flash.message = "${warehouse.message(code: 'default.not.found.message', args: [warehouse.message(code: 'localization.label', default: 'Localization'), params.id])}" 
+ flash.message = "${warehouse.message(code: 'default.not.found.message', args: [warehouse.message(code: 'localization.label', default: 'Localization'), params.id])}"
  redirect(action: "list")
  }
  }
@@ -173,7 +175,7 @@ class LocalizationController {
 
  if (command.validate() && !command.hasErrors()) {
  Properties properties = new Properties()
- properties.load(command.messageProperties.inputStream)
+ properties.load(new InputStreamReader(command.messageProperties.inputStream, Charset.forName("UTF-8")));
  properties.stringPropertyNames().each { String property ->
  String text = properties.getProperty(property)
  log.info "Property " + property + " = " + text
@@ -182,7 +184,7 @@ class LocalizationController {
  localization = new Localization(code: property, locale: command.locale.language, text: text)
  }
  localization.text = text
- localization.save(flush: true)
+ localization.save()
 
  }
  flash.message = "${warehouse.message(code: 'default.uploaded.message', args: [warehouse.message(code: 'localizations.label')])}"