diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-06 02:02:58 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-11-06 02:02:58 +0000 |
commit | f20582442f6a7c49a217b8e9a75e161e750e4ea6 (patch) | |
tree | 2deb05d300e963c8d6bd986e8bd0ab409991e1f6 | |
parent | 13f7dffb09f47b909a50e622d0089289d8cbd9cd (diff) | |
download | rockbox-f20582442f6a7c49a217b8e9a75e161e750e4ea6.tar.gz rockbox-f20582442f6a7c49a217b8e9a75e161e750e4ea6.zip |
Android: replace hardcoded strings with Android strings, allowing translations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28518 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | android/res/values/strings.xml | 4 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxActivity.java | 2 | ||||
-rw-r--r-- | android/src/org/rockbox/RockboxService.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 729935c196..8034eab086 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml | |||
@@ -8,4 +8,6 @@ | |||
8 | <string name="KbdInputTitle">Rockbox Keyboard Input</string> | 8 | <string name="KbdInputTitle">Rockbox Keyboard Input</string> |
9 | <string name="Yes">Yes</string> | 9 | <string name="Yes">Yes</string> |
10 | <string name="No">No</string> | 10 | <string name="No">No</string> |
11 | </resources> | 11 | <string name="error_extraction">Error occured during extraction!</string> |
12 | <string name="rockbox_extracting">Rockbox is loading. Please wait...</string> | ||
13 | </resources> \ No newline at end of file | ||
diff --git a/android/src/org/rockbox/RockboxActivity.java b/android/src/org/rockbox/RockboxActivity.java index b9a8c54204..06ceb9c35f 100644 --- a/android/src/org/rockbox/RockboxActivity.java +++ b/android/src/org/rockbox/RockboxActivity.java | |||
@@ -55,7 +55,7 @@ public class RockboxActivity extends Activity | |||
55 | private void createProgressDialog() | 55 | private void createProgressDialog() |
56 | { | 56 | { |
57 | loadingdialog = new ProgressDialog(RockboxActivity.this); | 57 | loadingdialog = new ProgressDialog(RockboxActivity.this); |
58 | loadingdialog.setMessage("Rockbox is loading. Please wait..."); | 58 | loadingdialog.setMessage(getString(R.string.rockbox_extracting)); |
59 | loadingdialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); | 59 | loadingdialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); |
60 | loadingdialog.setIndeterminate(true); | 60 | loadingdialog.setIndeterminate(true); |
61 | loadingdialog.setCancelable(false); | 61 | loadingdialog.setCancelable(false); |
diff --git a/android/src/org/rockbox/RockboxService.java b/android/src/org/rockbox/RockboxService.java index 4aa7bc1916..0737bf88ce 100644 --- a/android/src/org/rockbox/RockboxService.java +++ b/android/src/org/rockbox/RockboxService.java | |||
@@ -207,7 +207,7 @@ public class RockboxService extends Service | |||
207 | e.printStackTrace(); | 207 | e.printStackTrace(); |
208 | if (resultReceiver != null) { | 208 | if (resultReceiver != null) { |
209 | Bundle bundle = new Bundle(); | 209 | Bundle bundle = new Bundle(); |
210 | bundle.putString("error", "Error occured during extraction!"); | 210 | bundle.putString("error", getString(R.string.error_extraction)); |
211 | resultReceiver.send(RESULT_ERROR_OCCURED, bundle); | 211 | resultReceiver.send(RESULT_ERROR_OCCURED, bundle); |
212 | } | 212 | } |
213 | } | 213 | } |