timi/timi-lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use StringInterpolator

Browse Source
This commit is contained in:
Timi
2025-11-06 14:08:00 +08:00
parent cf2f20052a
commit 4f10cf3c20
6 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/imyeyu/lang/mapper/AbstractLanguageMapper.java
View File

@ -2,8 +2,7 @@ package com.imyeyu.lang.mapper;
import com.imyeyu.java.bean.Language;
import com.imyeyu.java.bean.LanguageMapping;
import java.text.MessageFormat;
import com.imyeyu.utils.StringInterpolator;
/**
* @author 夜雨
@ -11,7 +10,7 @@ import java.text.MessageFormat;
*/
public abstract class AbstractLanguageMapper implements LanguageMapping {
protected static final MessageFormat FORMAT = new MessageFormat("");
protected static final StringInterpolator INTERPOLATOR = StringInterpolator.createDollarInterpolator();
protected final Language language;

15
src/main/java/com/imyeyu/lang/mapper/LanguageMap.java
View File

@ -4,7 +4,6 @@ import com.imyeyu.java.TimiJava;
import com.imyeyu.java.bean.Language;
import com.imyeyu.utils.Text;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@ -107,18 +106,12 @@ public class LanguageMap extends AbstractLanguageMapper {
/**
* 插入参数获取文本
*
* @param key 键
* @param args 参数
* @param key 键
* @param argsMap 参数
* @return 结果
*/
@Override
public String textArgs(String key, Object... args) {
String result = text(key);
if (map.containsKey(result)) {
// 没有映射值
return result + Arrays.toString(args);
}
FORMAT.applyPattern(result);
return FORMAT.format(args);
public String textArgs(String key, Map<String, Object> argsMap) {
return INTERPOLATOR.inject(text(key), argsMap);
}
}

8
src/main/java/com/imyeyu/lang/multi/Multilingual.java
View File

@ -204,15 +204,15 @@ public class Multilingual implements LanguageMapping {
/**
* 从当前激活语言获取插入参数文本
*
* @param key 键
* @param params 参数
* @param key 键
* @param argsMap 参数
* @return 结果
*/
@Override
public String textArgs(String key, Object... params) {
public String textArgs(String key, Map<String, Object> argsMap) {
if (multilingualMap.get(getActivated()) == null) {
return key;
}
return multilingualMap.get(getActivated()).textArgs(key, params);
return multilingualMap.get(getActivated()).textArgs(key, argsMap);
}
}