From fdbc946ca9ba846accb86fddcfd0ddadd5503aec Mon Sep 17 00:00:00 2001 From: Sola Date: Sun, 13 Dec 2015 02:32:20 +0800 Subject: [PATCH] fix lang --- .../love/sola/netsupport/wechat/handler/SubmitHandler.java | 2 +- src/main/resources/lang.yml | 6 +++--- .../java/love/sola/netsupport/wechat/TestMessageFormat.java | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java b/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java index 8d5798d..b9a3cca 100644 --- a/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java +++ b/src/main/java/love/sola/netsupport/wechat/handler/SubmitHandler.java @@ -38,7 +38,7 @@ public class SubmitHandler implements WxMpMessageHandler { WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item(); item.setTitle(lang("Submit_Title")); item.setDescription(lang("Submit_Desc")); - item.setUrl(format("User_Submit_Link", wxMessage.getFromUserName(), u.getName(), u.getIsp(), u.getRoom(), u.getBlock(), u.getPhone())); + item.setUrl(format("User_Submit_Link", wxMessage.getFromUserName(), u.getName(), u.getIsp().id, u.getRoom(), u.getBlock(), u.getPhone())); out.addArticle(item); Authorize.fetchedTime.put(wxMessage.getFromUserName(), System.currentTimeMillis()); Authorize.fetchedCommand.put(wxMessage.getFromUserName(), Command.SUBMIT); diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index a2165ca..be5d442 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -39,11 +39,11 @@ Cancel_Failed: '取消失败。' Not_Operator: '嘟嘟嘟……' #URL -User_Register_Link: "您尚未进行微信绑定, 请点击这里进行微信绑定操作。" +User_Register_Link: '您尚未进行微信绑定, 请点击这里进行微信绑定操作。' User_Query_Link: 'http://topaz.sinaapp.com/nm/v1/query.html?wechatid={0}' -User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/rrepair.html?wechatid={0}&name={1}&isp={2}&room={3}&block={4}&phone={5}' +User_Submit_Link: 'http://topaz.sinaapp.com/nm/v1/rrepair.html?wechatid={0}&name={1}&isp={2}&room={3}&block={4}&phone={5,number,#}' Result_Page: 'http://topaz.sinaapp.com/nm/v1/result.html' -Operator_Login_Link: 'CLICK HERE' +Operator_Login_Link: 'CLICK HERE' #Localized #Status diff --git a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java b/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java index 4544182..49636f3 100644 --- a/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java +++ b/src/test/java/love/sola/netsupport/wechat/TestMessageFormat.java @@ -5,6 +5,7 @@ import love.sola.netsupport.config.Lang; import love.sola.netsupport.enums.ISP; import org.junit.Test; +import java.text.MessageFormat; import java.util.Date; /** @@ -34,4 +35,9 @@ public class TestMessageFormat { assert gson.toJson(ISP.TELECOM).equals("1"); } + @Test + public void testLong() { + assert "15838838438".equals(MessageFormat.format("{0,number,#}", 15838838438L)); + } + }