Add:port/android:Start to use string resources in the app.

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4991 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index 65cd037..df5e12f 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -216,7 +216,7 @@ public class Navit extends Activity
                if (firstStart)\r
                {\r
                        AlertDialog.Builder infobox = new AlertDialog.Builder(this);\r
-                       infobox.setTitle(NavitTextTranslations.INFO_BOX_TITLE); // TRANS\r
+                       infobox.setTitle(getString(R.string.initial_info_box_title)); // TRANS\r
                        infobox.setCancelable(false);\r
                        final TextView message = new TextView(this);\r
                        message.setFadingEdgeLength(20);\r
@@ -225,14 +225,14 @@ public class Navit extends Activity
                        RelativeLayout.LayoutParams rlp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.FILL_PARENT, RelativeLayout.LayoutParams.FILL_PARENT);\r
        \r
                        message.setLayoutParams(rlp);\r
-                       final SpannableString s = new SpannableString(NavitTextTranslations.INFO_BOX_TEXT); // TRANS\r
+                       final SpannableString s = new SpannableString(getString(R.string.initial_info_box_message)); // TRANS\r
                        Linkify.addLinks(s, Linkify.WEB_URLS);\r
                        message.setText(s);\r
                        message.setMovementMethod(LinkMovementMethod.getInstance());\r
                        infobox.setView(message);\r
        \r
                        // TRANS\r
-                       infobox.setPositiveButton(Navit.get_text("Ok"), new DialogInterface.OnClickListener() {\r
+                       infobox.setPositiveButton(getString(R.string.initial_info_box_OK), new DialogInterface.OnClickListener() {\r
                                public void onClick(DialogInterface arg0, int arg1) {\r
                                        Log.e("Navit", "Ok, user saw the infobox");\r
                                }\r
@@ -240,7 +240,7 @@ public class Navit extends Activity
        \r
                        \r
                        // TRANS\r
-                       infobox.setNeutralButton(NavitTextTranslations.NAVIT_JAVA_MENU_MOREINFO, new DialogInterface.OnClickListener() {\r
+                       infobox.setNeutralButton(getString(R.string.initial_info_box_more_info), new DialogInterface.OnClickListener() {\r
                                public void onClick(DialogInterface arg0, int arg1) {\r
                                        Log.e("Navit", "user wants more info, show the website");\r
                                        String url = "http://wiki.navit-project.org/index.php/Navit_on_Android";\r
@@ -520,17 +520,17 @@ public class Navit extends Activity
                menu.clear();\r
 \r
                // group-id,item-id,sort order number\r
-               menu.add(1, 1, 100, get_text("zoom in")); //TRANS\r
-               menu.add(1, 2, 200, get_text("zoom out")); //TRANS\r
+               menu.add(1, 1, 100, getString(R.string.optionsmenu_zoom_in)); //TRANS\r
+               menu.add(1, 2, 200, getString(R.string.optionsmenu_zoom_out)); //TRANS\r
 \r
-               menu.add(1, 3, 300, NavitTextTranslations.NAVIT_JAVA_MENU_download_first_map); //TRANS\r
-               menu.add(1, 5, 400, NavitTextTranslations.NAVIT_JAVA_MENU_TOGGLE_POI); //TRANS\r
+               menu.add(1, 3, 300, getString(R.string.optionsmenu_download_first_map)); //TRANS\r
+               menu.add(1, 5, 400, getString(R.string.optionsmenu_toggle_poi)); //TRANS\r
 \r
-               menu.add(1, 6, 500, get_text("address search")); //TRANS\r
+               menu.add(1, 6, 500, getString(R.string.optionsmenu_address_search)); //TRANS\r
 \r
-               menu.add(1, 4, 600, NavitTextTranslations.NAVIT_JAVA_MENU_download_second_map); //TRANS\r
+               menu.add(1, 4, 600, getString(R.string.optionsmenu_download_second_map)); //TRANS\r
                menu.add(1, 88, 800, "--");\r
-               menu.add(1, 99, 900, get_text("exit navit")); //TRANS\r
+               menu.add(1, 99, 900, getString(R.string.optionsmenu_exit_navit)); //TRANS\r
                return true;\r
        }\r
 \r
@@ -567,7 +567,7 @@ public class Navit extends Activity
                if (NavitDialogs.Navit_last_address_search_string.equals(""))\r
                {\r
                        // empty search string entered\r
-                       Toast.makeText(getApplicationContext(), Navit.get_text("No address found"), Toast.LENGTH_LONG).show(); //TRANS\r
+                       Toast.makeText(getApplicationContext(), getString(R.string.address_search_not_found), Toast.LENGTH_LONG).show(); //TRANS\r
                }\r
                else\r
                {\r
@@ -623,7 +623,7 @@ public class Navit extends Activity
                        case 6 :\r
                                // ok startup address search activity\r
                                Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);\r
-                               search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS\r
+                               search_intent.putExtra("title", getString(R.string.address_search_title)); //TRANS\r
                                search_intent.putExtra("address_string", NavitDialogs.Navit_last_address_search_string);\r
                                search_intent.putExtra("partial_match", NavitDialogs.Navit_last_address_partial_match);\r
                                this.startActivityForResult(search_intent, NavitAddressSearch_id);\r
@@ -641,7 +641,7 @@ public class Navit extends Activity
        }\r
 \r
        void setDestination(float latitude, float longitude, String address) {\r
-               Toast.makeText( getApplicationContext(),Navit.get_text("setting destination to") + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS\r
+               Toast.makeText( getApplicationContext(),getString(R.string.address_search_set_destination) + "\n" + address, Toast.LENGTH_LONG).show(); //TRANS\r
 \r
                Message msg = Message.obtain(N_NavitGraphics.callback_handler, NavitGraphics.msg_type.CLB_SET_DESTINATION.ordinal());\r
                Bundle b = new Bundle();\r
@@ -692,7 +692,7 @@ public class Navit extends Activity
        \r
                                        if (addr.equals("")) {\r
                                                // empty search string entered\r
-                                               Toast.makeText(getApplicationContext(),Navit.get_text("No search string entered"), Toast.LENGTH_LONG).show(); //TRANS\r
+                                               Toast.makeText(getApplicationContext(),getString(R.string.address_search_no_text_entered), Toast.LENGTH_LONG).show(); //TRANS\r
                                        } else {\r
                                                // show dialog, and start search for the results\r
                                                // make it indirect, to give our activity a chance to startup\r
@@ -775,7 +775,7 @@ public class Navit extends Activity
        private void executeSearch(String search)\r
        {\r
                Intent search_intent = new Intent(this, NavitAddressSearchActivity.class);\r
-               search_intent.putExtra("title", Navit.get_text("Enter: City and Street")); //TRANS\r
+               search_intent.putExtra("title", getString(R.string.address_search_title)); //TRANS\r
                search_intent.putExtra("address_string", search);\r
                search_intent.putExtra("partial_match", NavitDialogs.Navit_last_address_partial_match);\r
                this.startActivityForResult(search_intent, NavitAddressSearch_id);\r