From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 15 Apr 2013 11:45:20 +0000 (+0200)
Subject: About in settings, more i18n-friendly
X-Git-Tag: oc-android-1.4.3~36^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7052e3b5b81ec4d0f3ef7f332f13e45ff4335451?hp=--cc

About in settings, more i18n-friendly
---

7052e3b5b81ec4d0f3ef7f332f13e45ff4335451
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 415041ba..ccbea5f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,8 +14,8 @@
     <string name="main_settings">Settings</string>
     <string name="main_tit_accsetup">Setup Account</string>
     <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
-    <string name="about_android">Android App </string>
-    <string name="about_version">version: </string>
+    <string name="about_android">%1$s Android App</string>
+    <string name="about_version">version %1$s</string>
     <string name="actionbar_sync">Refresh</string>
     <string name="actionbar_upload">Upload</string>
     <string name="actionbar_upload_from_apps">Content from other apps</string>
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index b206708a..90c7264b 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -102,11 +102,11 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
            /* About App */
        pAboutApp = (Preference) findPreference("about_app");
        if (pAboutApp != null) { 
-               pAboutApp.setTitle(getString(R.string.app_name)+" "+getString(R.string.about_android));
+               pAboutApp.setTitle(String.format(getString(R.string.about_android), getString(R.string.app_name)));
                PackageInfo pkg;
                try {
                    pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
-                   pAboutApp.setSummary(getString(R.string.about_version)+" "+pkg.versionName);
+                   pAboutApp.setSummary(String.format(getString(R.string.about_version), pkg.versionName));
                } catch (NameNotFoundException e) {
                    Log_OC.e(TAG, "Error while showing about dialog", e);
                }