translate UI strings by their id'sAndroid_translations

3 files changed, 85 insertions, 68 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitBackupTask.java b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
index ca52ee46e..d7b41cee3 100644
--- a/navit/android/src/org/navitproject/navit/NavitBackupTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitBackupTask.java
@@ -1,7 +1,5 @@
-
 package org.navitproject.navit;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
@@ -9,7 +7,6 @@ import android.os.Environment;
 import android.text.format.Time;
 import android.widget.Toast;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -31,7 +28,7 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         /* Create a Wait Progress Dialog to inform the User that we are working */
         mDialog = new ProgressDialog(mActivity);
         mDialog.setIndeterminate(true);
-        mDialog.setMessage(mActivity.getString(R.string.backing_up));
+        mDialog.setMessage(mActivity.getTstring(R.string.backing_up));
         mDialog.show();
     }
 
@@ -41,60 +38,70 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
         now.setToNow();
 
         /* This is the Directory where all Subdirectories are stored by date */
-        File mainBackupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
+        File mainBackupDir = new File(
+                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/");
 
         /* Create the Main Backup Directory if it doesn't exist */
         if (!mainBackupDir.isDirectory()) {
-            if (!mainBackupDir.mkdirs())
-                return mActivity.getString(R.string.failed_to_create_backup_directory);
+            if (!mainBackupDir.mkdirs()) {
+                return mActivity.getTstring(R.string.failed_to_create_backup_directory);
+            }
         }
 
         /* Create a Timestamp in the format YYYY-MM-DD-Index */
-        String timestamp = now.year + "-" + String.format("%02d", now.month+1) + "-" + String.format("%02d", now.monthDay);
+        String timestamp = now.year + "-" + String.format("%02d", now.month + 1) + "-" + String
+                .format("%02d", now.monthDay);
         /* Get the next free index */
         int index = 1;
         for (String s : mainBackupDir.list()) {
             if (s.contains(timestamp)) {
                 int newIndex = Integer.parseInt(s.substring(11));
-                if (newIndex >= index)
+                if (newIndex >= index) {
                     index = newIndex + 1;
+                }
             }
         }
         timestamp += "-" + index;
 
         /* This is the Directory in which the Files are copied into */
-        File backupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
+        File backupDir = new File(
+                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + timestamp);
 
         /* Create the Backup Directory if it doesn't exist */
         if (!backupDir.isDirectory()) {
-            if (!backupDir.mkdirs())
-                return mActivity.getString(R.string.failed_to_create_backup_directory);
+            if (!backupDir.mkdirs()) {
+                return mActivity.getTstring(R.string.failed_to_create_backup_directory);
+            }
         }
 
         ObjectOutputStream preferencesOOs = null;
         try {
             /* Backup Files in home */
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt", backupDir.getPath() + "/bookmark.txt");
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt", backupDir.getPath() + "/destination.txt");
-            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt", backupDir.getPath() + "/gui_internal.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/bookmark.txt",
+                    backupDir.getPath() + "/bookmark.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt",
+                    backupDir.getPath() + "/destination.txt");
+            mActivity.copyFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt",
+                    backupDir.getPath() + "/gui_internal.txt");
 
             /* Backup Shared Preferences */
-            preferencesOOs = new ObjectOutputStream(new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
-            preferencesOOs.writeObject(mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).getAll());
-        }
-        catch (IOException e) {
+            preferencesOOs = new ObjectOutputStream(
+                    new FileOutputStream(backupDir.getPath() + "/preferences.bak"));
+            preferencesOOs.writeObject(
+                    mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE)
+                            .getAll());
+        } catch (IOException e) {
             e.printStackTrace();
-            return mActivity.getString(R.string.backup_failed);
-        }
-        finally {
+            return mActivity.getTstring(R.string.backup_failed);
+        } finally {
             /* Close Stream to prevent Resource Leaks */
             try {
-                if (preferencesOOs != null)
+                if (preferencesOOs != null) {
                     preferencesOOs.close();
-            }
-            catch (IOException e) {
+                }
+            } catch (IOException e) {
                 e.printStackTrace();
-                return mActivity.getString(R.string.backup_failed);
+                return mActivity.getTstring(R.string.backup_failed);
             }
         }
 
@@ -114,13 +121,15 @@ public class NavitBackupTask extends AsyncTask<Void, Void, String> {
             return;
         }
 
-        Toast.makeText(mActivity, mActivity.getString(R.string.backup_successful), Toast.LENGTH_LONG).show();
+        Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_successful),
+                Toast.LENGTH_LONG).show();
     }
 
     @Override
     protected void onCancelled() {
         super.onCancelled();
-        Toast.makeText(mActivity, mActivity.getString(R.string.backup_failed), Toast.LENGTH_LONG).show();
+        Toast.makeText(mActivity, mActivity.getTstring(R.string.backup_failed), Toast.LENGTH_LONG)
+                .show();
         mDialog.dismiss();
     }
 }
diff --git a/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/android/src/org/navitproject/navit/NavitDialogs.java
index 9a2a3d04c..426acb76f 100644
--- a/navit/android/src/org/navitproject/navit/NavitDialogs.java
+++ b/navit/android/src/org/navitproject/navit/NavitDialogs.java
@@ -149,7 +149,7 @@ public class NavitDialogs extends Handler {
 
             case DIALOG_BACKUP_RESTORE:
                 /* Create a Dialog that Displays Options wether to Backup or Restore */
-                builder.setTitle(mActivity.getString(R.string.choose_an_action)).
+                builder.setTitle(mActivity.getTstring(R.string.choose_an_action)).
                         setCancelable(true).
                         setItems(R.array.dialog_backup_restore_items,
                                 new DialogInterface.OnClickListener() {
@@ -160,7 +160,7 @@ public class NavitDialogs extends Handler {
                                         if (!Environment.getExternalStorageState()
                                                 .equals(Environment.MEDIA_MOUNTED)) {
                                             Toast.makeText(mActivity, mActivity
-                                                            .getString(R.string.please_insert_an_sd_card),
+                                                            .getTstring(R.string.please_insert_an_sd_card),
                                                     Toast.LENGTH_LONG).show();
                                         }
 
@@ -190,12 +190,12 @@ public class NavitDialogs extends Handler {
 
                 if (backups == null || backups.length == 0) {
                     /* No Backups were found */
-                    builder.setTitle(mActivity.getText(R.string.no_backup_found));
-                    builder.setNegativeButton(mActivity.getText(android.R.string.cancel), null);
+                    builder.setTitle(mActivity.getTstring(R.string.no_backup_found));
+                    builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
                     return builder.create();
                 }
 
-                builder.setTitle(mActivity.getString(R.string.select_backup));
+                builder.setTitle(mActivity.getTstring(R.string.select_backup));
                 final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity,
                         android.R.layout.simple_spinner_item, backups);
                 builder.setAdapter(adapter, new OnClickListener() {
@@ -205,7 +205,7 @@ public class NavitDialogs extends Handler {
                         new NavitRestoreTask(mActivity, adapter.getItem(which)).execute();
                     }
                 });
-                builder.setNegativeButton(mActivity.getString(android.R.string.cancel), null);
+                builder.setNegativeButton(mActivity.getTstring(android.R.string.cancel), null);
 
                 return builder.create();
         }
diff --git a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
index aaffcb002..2cd76a931 100644
--- a/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
+++ b/navit/android/src/org/navitproject/navit/NavitRestoreTask.java
@@ -1,7 +1,5 @@
-
 package org.navitproject.navit;
 
-import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -9,10 +7,8 @@ import android.content.SharedPreferences.Editor;
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.widget.Toast;
-
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Map;
@@ -38,7 +34,7 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
         /* Create a Wait Progress Dialog to inform the User that we are working */
         mDialog = new ProgressDialog(mActivity);
         mDialog.setIndeterminate(true);
-        mDialog.setMessage(mActivity.getString(R.string.restoring));
+        mDialog.setMessage(mActivity.getTstring(R.string.restoring));
         mDialog.show();
     }
 
@@ -47,11 +43,14 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
     protected String doInBackground(Void... v) {
 
         /* This is the Directory where all Subdirectories are stored by date */
-        File backupDir = new File(Environment.getExternalStorageDirectory().getPath() + "/navit/backup/" + mTimestamp);
-        
+        File backupDir = new File(
+                Environment.getExternalStorageDirectory().getPath() + "/navit/backup/"
+                        + mTimestamp);
+
         /* Check if there is a Backup Directory */
-        if (!backupDir.isDirectory())
-            return mActivity.getString(R.string.backup_not_found);
+        if (!backupDir.isDirectory()) {
+            return mActivity.getTstring(R.string.backup_not_found);
+        }
 
         ObjectInputStream preferenceOIS = null;
         try {
@@ -60,17 +59,22 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
             mActivity.removeFileIfExists(Navit.NAVIT_DATA_DIR + "/home/destination.txt");
             mActivity.removeFileIfExists(Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
 
-            
+
             /* Restore Files in home */
-            mActivity.copyFileIfExists(backupDir.getPath() + "/bookmark.txt", Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
-            mActivity.copyFileIfExists(backupDir.getPath() + "/destination.txt", Navit.NAVIT_DATA_DIR + "/home/destination.txt");
-            mActivity.copyFileIfExists(backupDir.getPath() + "/gui_internal.txt", Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
+            mActivity.copyFileIfExists(backupDir.getPath() + "/bookmark.txt",
+                    Navit.NAVIT_DATA_DIR + "/home/bookmark.txt");
+            mActivity.copyFileIfExists(backupDir.getPath() + "/destination.txt",
+                    Navit.NAVIT_DATA_DIR + "/home/destination.txt");
+            mActivity.copyFileIfExists(backupDir.getPath() + "/gui_internal.txt",
+                    Navit.NAVIT_DATA_DIR + "/home/gui_internal.txt");
 
             /* Restore Shared Preferences */
-            preferenceOIS = new ObjectInputStream(new FileInputStream(backupDir.getPath() + "/preferences.bak"));
+            preferenceOIS = new ObjectInputStream(
+                    new FileInputStream(backupDir.getPath() + "/preferences.bak"));
             Map<String, ?> entries = (Map<String, ?>) preferenceOIS.readObject();
 
-            Editor prefEditor = mActivity.getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).edit();
+            Editor prefEditor = mActivity
+                    .getSharedPreferences(Navit.NAVIT_PREFS, Context.MODE_PRIVATE).edit();
 
             /* Remove all old Preferences */
             prefEditor.clear();
@@ -80,33 +84,33 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
                 Object value = entry.getValue();
                 String key = entry.getKey();
 
-                if (value instanceof Boolean)
+                if (value instanceof Boolean) {
                     prefEditor.putBoolean(key, ((Boolean) value).booleanValue());
-                else if (value instanceof Float)
+                } else if (value instanceof Float) {
                     prefEditor.putFloat(key, ((Float) value).floatValue());
-                else if (value instanceof Integer)
+                } else if (value instanceof Integer) {
                     prefEditor.putInt(key, ((Integer) value).intValue());
-                else if (value instanceof Long)
+                } else if (value instanceof Long) {
                     prefEditor.putLong(key, ((Long) value).longValue());
-                else if (value instanceof String)
+                } else if (value instanceof String) {
                     prefEditor.putString(key, (String) value);
+                }
             }
 
-            if (!prefEditor.commit())
-                return mActivity.getString(R.string.failed_to_restore);
+            if (!prefEditor.commit()) {
+                return mActivity.getTstring(R.string.failed_to_restore);
+            }
 
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
-            return mActivity.getString(R.string.failed_to_restore);
-        }
-        finally {
+            return mActivity.getTstring(R.string.failed_to_restore);
+        } finally {
             try {
                 /* Close Stream to prevent Resource leak */
-                if (preferenceOIS != null)
+                if (preferenceOIS != null) {
                     preferenceOIS.close();
-            }
-            catch (IOException e) {
+                }
+            } catch (IOException e) {
 
             }
         }
@@ -128,8 +132,11 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
         }
 
         /* Navit needs to be restarted. Currently the User has to restart it by himself */
-        Toast.makeText(mActivity, mActivity.getString(R.string.restore_successful_please_restart_navit), Toast.LENGTH_LONG).show();
-        NotificationManager nm = (NotificationManager) mActivity.getSystemService(Context.NOTIFICATION_SERVICE);
+        Toast.makeText(mActivity,
+                mActivity.getTstring(R.string.restore_successful_please_restart_navit),
+                Toast.LENGTH_LONG).show();
+        NotificationManager nm = (NotificationManager) mActivity
+                .getSystemService(Context.NOTIFICATION_SERVICE);
         nm.cancel(R.string.app_name);
         NavitVehicle.removeListener();
         mActivity.finish();
@@ -138,7 +145,8 @@ public class NavitRestoreTask extends AsyncTask<Void, Void, String> {
     @Override
     protected void onCancelled() {
         super.onCancelled();
-        Toast.makeText(mActivity, mActivity.getString(R.string.restore_failed), Toast.LENGTH_LONG).show();
+        Toast.makeText(mActivity, mActivity.getTstring(R.string.restore_failed), Toast.LENGTH_LONG)
+                .show();
         mDialog.dismiss();
-    }    
+    }
 }