public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 20:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

locale message fix

Browse Source
This commit is contained in:
shimingxy
2020-04-25 15:35:36 +08:00
parent 66fd8d2b6f
commit 792663a669
6 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
maxkey-core/src/main/java/org/maxkey/web/WebContext.java
View File

@@ -356,11 +356,37 @@ public final class WebContext {
* @return
*/
public static String getI18nValue(String code) {
return code;
String message = code;
try {
message = getApplicationContext().getMessage(
code.toString(),
null,
getLocale());
} catch (Exception e) {
//
e.printStackTrace();
}
return message;
}
/**
* getI18nValue.
* @param code String
* @param filedValues Object
* @return
*/
public static String getI18nValue(String code, Object[] filedValues) {
return code;
String message = code;
try {
message = getApplicationContext().getMessage(
code.toString(),
filedValues,
getLocale());
} catch (Exception e) {
//
e.printStackTrace();
}
return message;
}
//TODO:

48
maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java
View File

@@ -14,35 +14,41 @@ import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateDirectiveModel;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
/**
* 获取应用上下文标签
* <@locale/>
* 获取应用上下文标签 <@locale/>
*
* @author Crystal.Sea
*
*/
@FreemarkerTag("locale")
public class LocaleTagDirective implements TemplateDirectiveModel {
private static final Logger _logger = LoggerFactory.getLogger(LocaleTagDirective.class);
@Autowired
private static final Logger _logger = LoggerFactory.getLogger(LocaleTagDirective.class);
@Autowired
private HttpServletRequest request;
@Override
public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
throws TemplateException, IOException {
WebApplicationContext webApplicationContext =RequestContextUtils.findWebApplicationContext(request);
if(params.get("code")==null) {
env.getOut().append(RequestContextUtils.getLocale(request).getLanguage());
}else {
_logger.trace("message code "+params.get("code"));
try {
env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request)));
}catch(Exception e) {
_logger.error("message code "+params.get("code"),e);
}
}
}
@Override
public void execute(Environment env,
Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
throws TemplateException, IOException {
WebApplicationContext webApplicationContext =
RequestContextUtils.findWebApplicationContext(request);
if (params.get("code") == null) {
env.getOut().append(RequestContextUtils.getLocale(request).getLanguage());
} else {
_logger.trace("message code " + params.get("code"));
try {
env.getOut().append(
webApplicationContext.getMessage(
params.get("code").toString(),
null,
RequestContextUtils.getLocale(request)));
} catch (Exception e) {
_logger.error("message code " + params.get("code"), e);
}
}
}
}

7
maxkey-web-manage/src/main/resources/messages/message.properties
View File

@@ -443,6 +443,13 @@ log.operate.messageType=\u6D88\u606F\u7C7B\u578B
log.operate.operateType=\u64CD\u4F5C\u7C7B\u578B
log.operate.username=\u64CD\u4F5C\u4EBA
message.action.insert.success=\u65B0\u589E\u64CD\u4F5C\u6210\u529F
message.action.insert.error=\u65B0\u589E\u64CD\u4F5C\u5931\u8D25
message.action.update.success=\u66F4\u65B0\u64CD\u4F5C\u6210\u529F
message.action.update.error=\u66F4\u65B0\u64CD\u4F5C\u5931\u8D25
message.action.delete.success=\u5220\u9664\u64CD\u4F5C\u6210\u529F
message.action.delete.error=\u5220\u9664\u64CD\u4F5C\u5931\u8D25
navs.system=\u7CFB\u7EDF
navs.home=\u9996\u9875
navs.orgs=\u673A\u6784\u7BA1\u7406

7
maxkey-web-manage/src/main/resources/messages/message_en.properties
View File

@@ -443,6 +443,13 @@ log.operate.messageType=messageType
log.operate.operateType=operateType
log.operate.username=username
message.action.insert.success=Insert Success
message.action.insert.error=Insert Error
message.action.update.success=Update Success
message.action.update.error=Update Error
message.action.delete.success=Delete Success
message.action.delete.error=Delete Error
navs.system=System
navs.home=Home
navs.orgs=Orgs

7
maxkey-web-maxkey/src/main/resources/messages/message.properties
View File

@@ -228,6 +228,13 @@ log.operate.messageType=\u6D88\u606F\u7C7B\u578B
log.operate.operateType=\u64CD\u4F5C\u7C7B\u578B
log.operate.username=\u64CD\u4F5C\u4EBA
message.action.insert.success=\u65B0\u589E\u64CD\u4F5C\u6210\u529F
message.action.insert.error=\u65B0\u589E\u64CD\u4F5C\u5931\u8D25
message.action.update.success=\u66F4\u65B0\u64CD\u4F5C\u6210\u529F
message.action.update.error=\u66F4\u65B0\u64CD\u4F5C\u5931\u8D25
message.action.delete.success=\u5220\u9664\u64CD\u4F5C\u6210\u529F
message.action.delete.error=\u5220\u9664\u64CD\u4F5C\u5931\u8D25
#navs
navs.mypps=\u6211\u7684\u5E94\u7528
navs.setting=\u8BBE\u7F6E

7
maxkey-web-maxkey/src/main/resources/messages/message_en.properties
View File

@@ -227,6 +227,13 @@ log.operate.messageType=messageType
log.operate.operateType=operateType
log.operate.username=username
message.action.insert.success=Insert Success
message.action.insert.error=Insert Error
message.action.update.success=Update Success
message.action.update.error=Update Error
message.action.delete.success=Delete Success
message.action.delete.error=Delete Error
#navs
navs.mypps=My Apps