Merge pull request #26706 from nextcloud/Valdnet-patch-7

l10n: Spelling unification
nextcloud · May 31, 2021 · 7e8ddcd · 7e8ddcd
2 parents 773e28d + 77ca79f
commit 7e8ddcd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php
@@ -45,7 +45,7 @@ public function __construct(IL10N $l, Password $legacyAuth) {
 			->setIdentifier('smb')
 			->addIdentifierAlias('\OC\Files\Storage\SMB')// legacy compat
 			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
-			->setText($l->t('SMB / CIFS'))
+			->setText($l->t('SMB/CIFS'))
 			->addParameters([
 				new DefinitionParameter('host', $l->t('Host')),
 				new DefinitionParameter('share', $l->t('Share')),

diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php
@@ -43,7 +43,7 @@ public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBa
 		$this
 			->setIdentifier('\OC\Files\Storage\SMB_OC')
 			->setStorageClass('\OCA\Files_External\Lib\Storage\SMB')
-			->setText($l->t('SMB / CIFS using OC login'))
+			->setText($l->t('SMB/CIFS using OC login'))
 			->addParameters([
 				new DefinitionParameter('host', $l->t('Host')),
 				(new DefinitionParameter('username_as_share', $l->t('Username as share')))

diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -159,9 +159,9 @@ OCA = OCA || {};
 				if(message === 'Bad search filter') {
 					message = t('user_ldap', 'The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise.');
 				} else if(message === 'connection error') {
-					message = t('user_ldap', 'A connection error to LDAP / AD occurred, please check host, port and credentials.');
+					message = t('user_ldap', 'A connection error to LDAP/AD occurred, please check host, port and credentials.');
 				} else if(message === 'missing placeholder') {
-					message = t('user_ldap', 'The "%uid" placeholder is missing. It will be replaced with the login name when querying LDAP / AD.');
+					message = t('user_ldap', 'The "%uid" placeholder is missing. It will be replaced with the login name when querying LDAP/AD.');
 				}
 			}
 			OC.Notification.showTemporary(message, {isHTML: isHtml});

diff --git a/apps/user_ldap/js/wizard/wizardTabUserFilter.js b/apps/user_ldap/js/wizard/wizardTabUserFilter.js
@@ -131,7 +131,7 @@ OCA = OCA || {};
 			if(   key === 'ldap_userfilter_groups'
 			   && message === 'memberOf is not supported by the server'
 			) {
-				message = t('user_ldap', 'The group box was disabled, because the LDAP / AD server does not support memberOf.');
+				message = t('user_ldap', 'The group box was disabled, because the LDAP/AD server does not support memberOf.');
 			}
 			return message;
 		}

diff --git a/apps/user_ldap/lib/Settings/Section.php b/apps/user_ldap/lib/Settings/Section.php
@@ -55,13 +55,13 @@ public function getID() {
 	}
 
 	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+	 * returns the translated name as it should be displayed, e.g. 'LDAP/AD
 	 * integration'. Use the L10N service to translate it.
 	 *
 	 * @return string
 	 */
 	public function getName() {
-		return $this->l->t('LDAP / AD integration');
+		return $this->l->t('LDAP/AD integration');
 	}
 
 	/**

diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -5,16 +5,16 @@
 		</p>
 		<p>
 			<label for="ldap_loginfilter_username">
-				<?php p($l->t('LDAP / AD Username:'));?>
+				<?php p($l->t('LDAP/AD Username:'));?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_username"
-				   title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>"
+				   title="<?php p($l->t('Allows login against the LDAP/AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>"
 				   name="ldap_loginfilter_username" value="1" />
 		</p>
 		<p>
 			<label for="ldap_loginfilter_email">
-				<?php p($l->t('LDAP / AD Email Address:'));?>
+				<?php p($l->t('LDAP/AD Email Address:'));?>
 			</label>
 
 			<input type="checkbox" id="ldap_loginfilter_email"

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
@@ -55,7 +55,7 @@
 ?>
 
 <form id="ldap" class="section" action="#" method="post">
-	<h2><?php p($l->t('LDAP / AD integration')); ?></h2>
+	<h2><?php p($l->t('LDAP/AD integration')); ?></h2>
 
 	<div id="ldapSettings">
 	<ul>

diff --git a/apps/user_ldap/tests/Settings/SectionTest.php b/apps/user_ldap/tests/Settings/SectionTest.php
@@ -58,10 +58,10 @@ public function testGetName() {
 		$this->l
 			->expects($this->once())
 			->method('t')
-			->with('LDAP / AD integration')
-			->willReturn('LDAP / AD integration');
+			->with('LDAP/AD integration')
+			->willReturn('LDAP/AD integration');
 
-		$this->assertSame('LDAP / AD integration', $this->section->getName());
+		$this->assertSame('LDAP/AD integration', $this->section->getName());
 	}
 
 	public function testGetPriority() {