From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 23 Oct 2013 10:48:55 +0000 (+0200)
Subject: Replace 'ownCloud' with reference to app_name
X-Git-Tag: oc-android-1.5.5~158
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f88f81e906629f244999bfe85fbfeec90985421e

Replace 'ownCloud' with reference to app_name
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f60b9ae..85080147 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -224,7 +224,7 @@
 	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
 	<string name="auth_follow_auth_server">Follow instructions above to get authenticated</string>
 	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
-	<string name="auth_unsupported_multiaccount">This version of ownCloud doesn\'t support multiaccount</string>
+	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
     
     <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
     <string name="crashlog_send_report">Send report</string>
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java
index c9da67bc..ff72d73c 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticator.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java
@@ -142,13 +142,14 @@ public class AccountAuthenticator extends AbstractAccountAuthenticator {
 
             // Return an error
             bundle.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION);
-            bundle.putString(AccountManager.KEY_ERROR_MESSAGE, mContext.getString(R.string.auth_unsupported_multiaccount));
+            final String message = String.format(mContext.getString(R.string.auth_unsupported_multiaccount), mContext.getString(R.string.app_name)); 
+            bundle.putString(AccountManager.KEY_ERROR_MESSAGE, message);
            
             mHandler.post(new Runnable() {
 
                 @Override
                 public void run() {
-                    Toast.makeText(mContext, R.string.auth_unsupported_multiaccount, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mContext, message, Toast.LENGTH_SHORT).show();
                 }
             });