[tor-commits] [orbot/master] move "World" string to resource

[n8fr8 at torproject.org]

commit 52acf68ed4b3e73c6bf88c7f2e30d2423222982b
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Jan 7 01:06:43 2016 -0500

    move "World" string to resource
---
 res/values/strings.xml                            |    2 ++
 src/org/torproject/android/OrbotMainActivity.java |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index dc0e880..7f1d349 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -334,4 +334,6 @@
   <string name="standard_browser">Standard Browser</string>
   
   <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string>
+
+	<string name="vpn_default_world">World</string>
 </resources>
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index e93cdd7..7b7ca07 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -312,7 +312,7 @@ public class OrbotMainActivity extends Activity
 		int selIdx = -1;
 		
 		ArrayList<String> cList = new ArrayList<String>();
-		cList.add(0, "WORLD");
+		cList.add(0, getString(R.string.vpn_default_world));
 	
 		for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++)
 		{