Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

l10n: Spelling unification #26706

Merged
merged 1 commit into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SMB.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Backend/SMB_OC.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')))
Expand Down
4 changes: 2 additions & 2 deletions apps/user_ldap/js/wizard/wizardTabLoginFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/js/wizard/wizardTabUserFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions apps/user_ldap/lib/Settings/Section.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

/**
Expand Down
6 changes: 3 additions & 3 deletions apps/user_ldap/templates/part.wizard-loginfilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/templates/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions apps/user_ldap/tests/Settings/SectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down