artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix/support the default locale for all the new style endpoints

Browse Source
This commit is contained in:
hongwei 2022-09-07 11:45:27 +02:00
parent 3f8ca89615
commit f3f513cf72
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
obp-api/src/main/scala/code/api/OBPRestHelper.scala
View File

@ -83,8 +83,15 @@ case class APIFailureNewStyle(failMsg: String,
val errorBody = extractErrorMessageBody(failMsg)
val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"locale")
val locale = I18NUtil.computeLocale(localeUrlParameter)
val localeFromUrl = I18NUtil.computeLocale(localeUrlParameter)
val locale: Locale =
if(localeFromUrl.toString.equals("")) //if the url local parameter is invalid, then we use the default Locale.
I18NUtil.getLocale()
else
localeFromUrl
val liftCoreResourceBundle = tryo(ResourceBundle.getBundle(LiftRules.liftCoreResourceName, locale)).toList
val _resBundle = new ThreadGlobal[List[ResourceBundle]]
@ -134,8 +141,8 @@ case class APIFailureNewStyle(failMsg: String,
def ?(str: String, locale: Locale): String = resourceValueCache.get(
str ->
locale,
if(?!(str, resourceBundleList)==str) //If can not find the value from props, then return the default error body.
locale,
if(locale.toString.startsWith("en") || ?!(str, resourceBundleList)==str) //If can not find the value from props or the local is `en`, then return
errorBody
else
s": ${?!(str, resourceBundleList)}"