From f88f81e906629f244999bfe85fbfeec90985421e Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 23 Oct 2013 12:48:55 +0200 Subject: [PATCH] Replace 'ownCloud' with reference to app_name --- res/values/strings.xml | 2 +- src/com/owncloud/android/authentication/AccountAuthenticator.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 @@ Connecting to authentication server… Follow instructions above to get authenticated The server does not support this authentication method - This version of ownCloud doesn\'t support multiaccount + %1$s does not support multiple accounts Application terminated unexpectedly. Would you like to submit a crash report? Send report 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(); } }); -- 2.11.0