From f2b9a3b49c9c86cce6fd07e486c486d2102d3ebe Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 30 Jun 2012 19:24:48 +0000 Subject: [PATCH] Localize some strings. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@822 180e2498-e6e9-4542-8430-84ac67f01cd8 --- android/res/values/strings.xml | 2 ++ .../openrocket/android/rocket/OpenRocketLoaderFragment.java | 6 +++--- .../openrocket/android/rocket/OpenRocketSaverFragment.java | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index b57930fd..6601fec4 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -14,6 +14,8 @@ View Events Select Series And Events Plot + Saving file... + Loading file... Case diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java index 01b9549f..18fbb819 100644 --- 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; import java.io.File; +import net.sf.openrocket.R; import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.android.util.ProgressDialogFragment; import net.sf.openrocket.document.OpenRocketDocument; @@ -21,8 +22,6 @@ public class OpenRocketLoaderFragment extends Fragment { private final static String FILE_ARG_KEY = "file"; - private final static String LOADING_MESSAGE = "Loading file..."; - public interface OnOpenRocketFileLoaded { public void onOpenRocketFileLoaded( OpenRocketLoaderResult result ); } @@ -74,7 +73,8 @@ public class OpenRocketLoaderFragment extends Fragment { @Override protected void onPreExecute() { super.onPreExecute(); - DialogFragment newFragment = ProgressDialogFragment.newInstance("", LOADING_MESSAGE); + String loading = getActivity().getResources().getString(R.string.loading); + DialogFragment newFragment = ProgressDialogFragment.newInstance("", loading); newFragment.show(getFragmentManager(), PROGRESS_DIALOG_TAG); } diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketSaverFragment.java index 353b15c6..5a0b9b31 100644 --- 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; +import net.sf.openrocket.R; import net.sf.openrocket.android.CurrentRocketHolder; import net.sf.openrocket.android.util.AndroidLogWrapper; import net.sf.openrocket.android.util.ProgressDialogFragment; @@ -14,8 +15,6 @@ import android.view.ViewGroup; public class OpenRocketSaverFragment extends Fragment { - private final static String SAVING_MESSAGE = "Savinging file..."; - public static OpenRocketSaverFragment newInstance() { OpenRocketSaverFragment frag = new OpenRocketSaverFragment(); Bundle b = new Bundle(); @@ -64,7 +63,8 @@ public class OpenRocketSaverFragment extends Fragment { @Override protected void onPreExecute() { super.onPreExecute(); - DialogFragment newFragment = ProgressDialogFragment.newInstance("", SAVING_MESSAGE); + String savingMessage = getActivity().getResources().getString(R.string.saving); + DialogFragment newFragment = ProgressDialogFragment.newInstance("", savingMessage); newFragment.show(getFragmentManager(), PROGRESS_DIALOG_TAG); } -- 2.47.2