From ffb0e14d7b1a900199af6bff93fbee6b8a4340b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 29 Oct 2013 23:29:16 +0100 Subject: [PATCH] replacing ownCloud by theme-able name or avoid it's usage --- apps/files_encryption/files/error.php | 3 ++- apps/user_ldap/ajax/testConfiguration.php | 2 +- apps/user_ldap/lib/access.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php index 61574edf509..317cea05a12 100644 --- a/apps/files_encryption/files/error.php +++ b/apps/files_encryption/files/error.php @@ -12,7 +12,8 @@ if (!isset($_)) { //also provide standalone error page $errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.'); break; case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR: - $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.'); + $theme = new OC_Defaults(); + $errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.', array($theme->getName())); break; case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND: $errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.'); diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 0b8e4ccfe20..b31fd983995 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -41,5 +41,5 @@ if($connection->setConfiguration($_POST)) { } } else { OCP\JSON::error(array('message' - => $l->t('The configuration is invalid. Please look in the ownCloud log for further details.'))); + => $l->t('The configuration is invalid. Please have a look at the logs for further details.'))); } diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index f133260383c..a07bd3fa11f 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -356,7 +356,7 @@ class Access extends LDAPUtility { } //if everything else did not help.. - \OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO); + \OCP\Util::writeLog('user_ldap', 'Could not create unique name for '.$dn.'.', \OCP\Util::INFO); return false; }