From 731dee4002fa9ef0ef7cb5cfdc827155f9424a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 14 Jul 2017 15:24:55 +0200 Subject: [PATCH 1/6] Spelling: Shortening and binding --- apps/user_ldap/ajax/testConfiguration.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index 0416e49767b06..d48a6be938204 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -67,19 +67,19 @@ $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn')); } catch (\Exception $e) { if($e->getCode() === 1) { - OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.'))); + OCP\JSON::error(array('message' => $l->t('Invalid configuration: Anonymous binding is not allowed.'))); exit; } } OCP\JSON::success(array('message' - => $l->t('The configuration is valid and the connection could be established!'))); + => $l->t('Valid configuration, connection established!'))); } else { OCP\JSON::error(array('message' - => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'))); + => $l->t('Valid configuration, but binding failed. Please check the server settings and credentials.'))); } } else { OCP\JSON::error(array('message' - => $l->t('The configuration is invalid. Please have a look at the logs for further details.'))); + => $l->t('Invalid configuration. Please have a look at the logs for further details.'))); } } catch (\Exception $e) { OCP\JSON::error(array('message' => $e->getMessage())); From 5dc81ab5a02b6b11d2740d5858d2d1c0f5099b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 14 Jul 2017 15:32:47 +0200 Subject: [PATCH 2/6] command-line, Consider narrowing --- apps/user_ldap/js/wizard/wizardTabLoginFilter.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js index d08a744f9ee7d..6933b1734e512 100644 --- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js +++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js @@ -142,16 +142,16 @@ OCA = OCA || {}; var usersFound = parseInt(result.changes.ldap_test_loginname, 10); if(usersFound < 1) { var filter = $('

').text(result.changes.ldap_test_effective_filter).html(); - message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation):
' + filter); + message = t('user_ldap', 'User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command-line validation):
' + filter); console.warn(filter); isHtml = true; } else if(usersFound === 1) { message = t('user_ldap', 'User found and settings verified.'); } else if(usersFound > 1) { - message = t('user_ldap', 'Settings verified, but more than one user found. Only the first will be able to login. Consider a more narrow filter.'); + message = t('user_ldap', 'Consider narrowing your search, as it encompassed many users, only the first one of whom will be able to log in.'); } } else { - message = t('user_ldap', 'An unspecified error occurred. Please check the settings and the log.'); + message = t('user_ldap', 'An unspecified error occurred. Please check log and settings.'); if(!_.isUndefined(result.message) && result.message) { message = result.message; } From eb5256177bca5bc0196e9108bda787dcbf00398b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 14 Jul 2017 15:46:05 +0200 Subject: [PATCH 3/6] : Bigversal and LDAP --- apps/user_ldap/lib/Wizard.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index 2c388b1803e63..3e7b95a3622b4 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -106,7 +106,7 @@ public function countEntries($filter, $type) { } else if ($type === 'objects') { $result = $this->access->countObjects($limit); } else { - throw new \Exception('internal error: invalid object type', 500); + throw new \Exception('Internal error: Invalid object type', 500); } return $result; @@ -243,7 +243,7 @@ public function detectUserDisplayNameAttribute() { } }; - throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.')); + throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.')); } /** From f8a77fa151361259f72b8c30d7eb6c7b76bd4c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 14 Jul 2017 17:02:48 +0200 Subject: [PATCH 4/6] log out, : Bigversal --- apps/files_external/js/statusmanager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index 782b0b082888e..efa0cc989f411 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -102,7 +102,7 @@ OCA.External.StatusManager = { var message; if (mountData.location === 3) { // In this case the error is because mount point use Login credentials and don't exist in the session - message = t('files_external', 'Couldn\'t access. Please logout and login to activate this mount point'); + message = t('files_external', 'Couldn\'t access. Please log out and in again to activate this mount point'); } else { message = t('files_external', 'Couldn\'t get the information from the remote server: {code} {type}', { code: jqxhr.status, @@ -265,7 +265,7 @@ OCA.External.StatusManager = { // check if we have a list first if (list === undefined && !self.emptyWarningShown) { self.emptyWarningShown = true; - OC.Notification.showTemporary(t('files_external', 'Couldn\'t get the list of Windows network drive mount points: empty response from the server')); + OC.Notification.showTemporary(t('files_external', 'Couldn\'t fetch list of Windows network drive mount points: Empty response from server')); return; } if (list && list.length > 0) { From ffcd20cb968bf7d9a3f5fdb59bf2bee6f2edc9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 14 Jul 2017 17:28:57 +0200 Subject: [PATCH 5/6] sent, an invitation, - successful --- .../lib/Controller/MountPublicLinkController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php index 55329338a9261..775796213e9a5 100644 --- a/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php +++ b/apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php @@ -199,7 +199,7 @@ public function askForFederatedShare($token, $remote, $password = '', $owner = ' $result = json_decode($body, true); if (is_array($result) && isset($result['remoteUrl'])) { - return new JSONResponse(['message' => $this->l->t('Federated Share request was successful, you will receive a invitation. Check your notifications.')]); + return new JSONResponse(['message' => $this->l->t('Federated Share request sent, you will receive an invitation. Check your notifications.')]); } // if we doesn't get the expected response we assume that we try to add @@ -291,7 +291,7 @@ private function legacyMountPublicLink($token, $remote, $password, $name, $owner $storage->getScanner()->scanAll(); return new JSONResponse( [ - 'message' => $this->l->t('Federated Share successfully added'), + 'message' => $this->l->t('Federated share added'), 'legacyMount' => '1' ] ); From 9469c9da697a58644332292c32a659fb0c3a03e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 18 Jul 2017 00:05:01 +0200 Subject: [PATCH 6/6] : Bigversal --- settings/js/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 1538e71a491af..e73cea92d6e60 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -367,7 +367,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $.post(OC.webroot + '/index.php/disableapp', {appid: appId}, function() { OC.Settings.Apps.showErrorMessage( appId, - t('settings', 'Error: this app cannot be enabled because it makes the server unstable') + t('settings', 'Error: This app can not be enabled because it makes the server unstable') ); appItem.data('errormsg', t('settings', 'Error while enabling app')); element.val(t('settings','Enable')); @@ -375,7 +375,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }).fail(function() { OC.Settings.Apps.showErrorMessage( appId, - t('settings', 'Error: could not disable broken app') + t('settings', 'Error: Could not disable broken app') ); appItem.data('errormsg', t('settings', 'Error while disabling broken app')); element.val(t('settings','Enable'));