Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 7380372d 由 zshaohui
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 3772407f f5008d39
内嵌 并排
正在显示 9 个修改的文件 包含 44 行增加 和 46 行删除
src/main/java/com/neotel/smfcore/core/language/rest/LanguageSetController.java
...@@ -52,9 +52,7 @@ public class LanguageSetController { ...@@ -52,9 +52,7 @@ public class LanguageSetController {
//没有缩写的加上 //没有缩写的加上
for (int i = 0; i < lanList.size(); i++) { for (int i = 0; i < lanList.size(); i++) {
String disName = MessageUtils.getText("smfcore.language.displayLanName." + lanList.get(i).getLanCode(), locale, ""); String disName = MessageUtils.getText("smfcore.language.displayLanName." + lanList.get(i).getLanCode(), locale, "");
if (ObjectUtil.isEmpty(lanList.get(i).getDisplayLanName())) { lanList.get(i).setDisplayLanName(disName);
lanList.get(i).setDisplayLanName(disName);
}
} }
return lanList; return lanList;
} }
......
src/main/java/com/neotel/smfcore/core/language/util/MessageUtils.java
...@@ -232,7 +232,7 @@ public class MessageUtils { ...@@ -232,7 +232,7 @@ public class MessageUtils {
lanList.add(new LanguageInfo(MessageUtils.ZH_CN,"简体中文","CN","")); lanList.add(new LanguageInfo(MessageUtils.ZH_CN,"简体中文","CN",""));
lanList.add(new LanguageInfo(MessageUtils.ZH_TW,"繁体中文","TC","")); lanList.add(new LanguageInfo(MessageUtils.ZH_TW,"繁体中文","TC",""));
lanList.add(new LanguageInfo(MessageUtils.EN_US,"English","EN","")); lanList.add(new LanguageInfo(MessageUtils.EN_US,"English","EN",""));
lanList.add(new LanguageInfo(MessageUtils.JA_JP,"日本语","JP","")); lanList.add(new LanguageInfo(MessageUtils.JA_JP,"日本語","JP",""));
lanList.add(new LanguageInfo(MessageUtils.FR_FR,"Français","FR","")); lanList.add(new LanguageInfo(MessageUtils.FR_FR,"Français","FR",""));
lanList.add(new LanguageInfo(MessageUtils.DE_DE,"Deutsch","DE","")); lanList.add(new LanguageInfo(MessageUtils.DE_DE,"Deutsch","DE",""));
} }
......
src/main/resources/messages.properties
...@@ -415,9 +415,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4 ...@@ -415,9 +415,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine smfcore.equipment.view.apigroup=Pick and Place Machine
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_de_DE.properties
...@@ -405,9 +405,9 @@ smfcore.equipApiMsg.updateTime=Zeit ...@@ -405,9 +405,9 @@ smfcore.equipApiMsg.updateTime=Zeit
smfcore.equipApiMsg.state=Typ smfcore.equipApiMsg.state=Typ
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Maschine smfcore.equipment.view.apigroup=Pick and Place Maschine
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_en_US.properties
...@@ -406,9 +406,9 @@ smfcore.equipApiMsg.updateTime=Time ...@@ -406,9 +406,9 @@ smfcore.equipApiMsg.updateTime=Time
smfcore.equipApiMsg.state=Type smfcore.equipApiMsg.state=Type
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine smfcore.equipment.view.apigroup=Pick and Place Machine
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_fr_FR.properties
...@@ -405,9 +405,9 @@ smfcore.equipApiMsg.updateTime=Heure ...@@ -405,9 +405,9 @@ smfcore.equipApiMsg.updateTime=Heure
smfcore.equipApiMsg.state=Type smfcore.equipApiMsg.state=Type
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Machines de placement smfcore.equipment.view.apigroup=Machines de placement
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_ja_JP.properties
...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u6642\u9593 ...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u6642\u9593
smfcore.equipApiMsg.state=\u30B9\u30C6\u30FC\u30BF\u30B9 smfcore.equipApiMsg.state=\u30B9\u30C6\u30FC\u30BF\u30B9
smfcore.equipment.view.nsgroup=\u30CD\u30AA\u30B9\u30AD\u30E3\u30F3 smfcore.equipment.view.nsgroup=\u30CD\u30AA\u30B9\u30AD\u30E3\u30F3
smfcore.equipment.view.apigroup=\u30D4\u30C3\u30AF\u30A2\u30F3\u30C9\u30D7\u30EC\u30FC\u30B9\u30DE\u30B7\u30F3 smfcore.equipment.view.apigroup=\u30D4\u30C3\u30AF\u30A2\u30F3\u30C9\u30D7\u30EC\u30FC\u30B9\u30DE\u30B7\u30F3
smfcore.language.displayLanName.zh-CN=CN smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=TC smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=US smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=JP smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=FR smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=DE smfcore.language.displayLanName.de-DE=Deutsch
src/main/resources/messages_zh_CN.properties
...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4 ...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine smfcore.equipment.view.apigroup=Pick and Place Machine
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
src/main/resources/messages_zh_TW.properties
...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4 ...@@ -402,9 +402,9 @@ smfcore.equipApiMsg.updateTime=\u65F6\u95F4
smfcore.equipApiMsg.state=\u7C7B\u578B smfcore.equipApiMsg.state=\u7C7B\u578B
smfcore.equipment.view.nsgroup=Neo Scan smfcore.equipment.view.nsgroup=Neo Scan
smfcore.equipment.view.apigroup=Pick and Place Machine smfcore.equipment.view.apigroup=Pick and Place Machine
smfcore.language.displayLanName.zh-CN=CN
smfcore.language.displayLanName.zh-TW=TC
smfcore.language.displayLanName.en-US=US
smfcore.language.displayLanName.ja-JP=JP
smfcore.language.displayLanName.fr-FR=FR
smfcore.language.displayLanName.de-DE=DE
\ No newline at end of file \ No newline at end of file
smfcore.language.displayLanName.zh-CN=\u4E2D\u6587
smfcore.language.displayLanName.zh-TW=\u7E41\u4F53
smfcore.language.displayLanName.en-US=EN
smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
smfcore.language.displayLanName.de-DE=Deutsch
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!