Localize some strings.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@822 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index b57930fdd2a37860c59789e838675d7af90df86a..6601fec42baf4f64e6674b9fec4ba5a1e9fc4cad 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -14,6 +14,8 @@
     <string name="view_events">View Events</string>\r
     <string name="simulationPlotDialogTitle">Select Series And Events</string>\r
     <string name="plot">Plot</string>\r
+    <string name="saving">Saving file...</string>\r
+    <string name="loading">Loading file...</string>\r
 \r
     <string-array name="PreferenceMotorBrowserGroupingEntries">\r
         <item>Case</item>\r

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
index 01b9549f6765e216ce357ab90004e62de9e46c98..18fbb8193296006224ae4647114a3cd903211873 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
@@ -2,6 +2,7 @@ package net.sf.openrocket.android.rocket;
 \r
 import java.io.File;\r
 \r
+import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.android.util.ProgressDialogFragment;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
@@ -21,8 +22,6 @@ public class OpenRocketLoaderFragment extends Fragment {
        \r
        private final static String FILE_ARG_KEY = "file";\r
        \r
-       private final static String LOADING_MESSAGE = "Loading file...";\r
-\r
        public interface OnOpenRocketFileLoaded {\r
                public void onOpenRocketFileLoaded( OpenRocketLoaderResult result );\r
        }\r
@@ -74,7 +73,8 @@ public class OpenRocketLoaderFragment extends Fragment {
                @Override\r
                protected void onPreExecute() {\r
                        super.onPreExecute();\r
-                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", LOADING_MESSAGE);\r
+                       String loading = getActivity().getResources().getString(R.string.loading);\r
+                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", loading);\r
                        newFragment.show(getFragmentManager(), PROGRESS_DIALOG_TAG);\r
                }\r
 \r

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java
index 353b15c62c502517ec47184f2f0da5c458b44c9c..5a0b9b31fa66a3fc0f55087233697b7a2d7e0c0a 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java
@@ -1,5 +1,6 @@
 package net.sf.openrocket.android.rocket;\r
 \r
+import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.CurrentRocketHolder;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.android.util.ProgressDialogFragment;\r
@@ -14,8 +15,6 @@ import android.view.ViewGroup;
 \r
 public class OpenRocketSaverFragment extends Fragment {\r
        \r
-       private final static String SAVING_MESSAGE = "Savinging file...";\r
-\r
        public static OpenRocketSaverFragment newInstance() {\r
                OpenRocketSaverFragment frag = new OpenRocketSaverFragment();\r
                Bundle b = new Bundle();\r
@@ -64,7 +63,8 @@ public class OpenRocketSaverFragment extends Fragment {
                @Override\r
                protected void onPreExecute() {\r
                        super.onPreExecute();\r
-                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", SAVING_MESSAGE);\r
+                       String savingMessage = getActivity().getResources().getString(R.string.saving);\r
+                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", savingMessage);\r
                        newFragment.show(getFragmentManager(), PROGRESS_DIALOG_TAG);\r
                }\r
 \r