Skip to content

Commit d85272e

Browse files
committed
Merge pull request #28 from PlagueHO/dev
Correct to DomainAlreadyJoinedhMessage variable name
2 parents ce6d20c + 34b2ddd commit d85272e

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function Test-TargetResource
136136
# Domain is already joined.
137137
Write-Verbose -Message ( @(
138138
"$($MyInvocation.MyCommand): "
139-
$($LocalizedData.DomainAlreadyJoinedhMessage) `
139+
$($LocalizedData.DomainAlreadyJoinedMessage) `
140140
-f $CurrentDomainName `
141141
) -join '' )
142142
}

DSCResources/MSFT_xOfflineDomainJoin/en-us/MSFT_xOfflineDomainJoin.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ConvertFrom-StringData @'
44
AttemptingDomainJoinMessage=Attempting domain join using ODJ Request file '{0}'.
55
DomainJoinedMessage=Domain joined using ODJ Request file '{0}'. Reboot will be required.
66
CheckingOfflineDomainJoinMessage=Checking the Offline Domain Join State.
7-
DomainAlreadyJoinedhMessage=The computer is already joined to a domain '{0}'. Change not required.
7+
DomainAlreadyJoinedMessage=The computer is already joined to a domain '{0}'. Change not required.
88
DomainNotJoinedMessage=The computer is not joined to a domain. Change required.
99
RequestFileNotFoundError=The ODJ Request file '{0}' does not exist.
1010
DjoinError=Error {0} occured requesting the Offline Domain Join.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ xOfflineDomainJoin resource is a [Single Instance](https://msdn.microsoft.com/en
5757
### Unreleased
5858
* Added the following resources:
5959
* MSFT_xOfflineDomainJoin resource to join computers to an AD Domain using an Offline Domain Join request file.
60+
* MSFT_xOfflineDomainJoin: Corrected localizedData.DomainAlreadyJoinedhMessage name.
6061
* xComputer: Changed credential generation code in tests to avoid triggering PSSA rule PSAvoidUsingConvertToSecureStringWithPlainText.
6162
Renamed unit test file to match the name of Resource file.
6263

0 commit comments

Comments
 (0)