Skip to content

Commit

Permalink
xActiveDirectory: Opt-in to "Common Tests - Validate Localization" (#307
Browse files Browse the repository at this point in the history
)

- Changes to xActiveDirectory
  - Common Tests - Validate Localization (issue #281)
  - Standardise Localization files
  • Loading branch information
X-Guardian authored and johlju committed Jun 4, 2019
1 parent 6222669 commit 8bf6a16
Show file tree
Hide file tree
Showing 27 changed files with 388 additions and 428 deletions.
4 changes: 3 additions & 1 deletion .MetaTestOptIn.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@
"Common Tests - Validate Markdown Files",
"Common Tests - Custom Script Analyzer Rules",
"Common Tests - Required Script Analyzer Rules",
"Common Tests - Flagged Script Analyzer Rules"
"Common Tests - Flagged Script Analyzer Rules",
"Common Tests - Validate Markdown Files",
"Common Tests - Validate Localization"
]
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Common Tests - Validate Script Files ([Issue #283](https://github.com/PowerShell/xActiveDirectory/issues/283))
- Common Tests - Relative Path Length ([Issue #284](https://github.com/PowerShell/xActiveDirectory/issues/284))
- Common Tests - Validate Markdown Links ([Issue #280](https://github.com/PowerShell/xActiveDirectory/issues/280))
- Common Tests - Validate Localization ([Issue #281](https://github.com/PowerShell/xActiveDirectory/issues/281))
- Changes to xADComputer
- Refactored the resource and the unit tests.
- BREAKING CHANGE: The `Enabled` property is **DEPRECATED** and is no
Expand Down
106 changes: 34 additions & 72 deletions DSCResources/MSFT_xADCommon/MSFT_xADCommon.psm1

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions DSCResources/MSFT_xADCommon/en-US/MSFT_xADCommon.strings.psd1
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# culture="en-US"
ConvertFrom-StringData @'
WasExpectingDomainController = The operating system product type code returned 2, which indicates that this is domain controller, but was unable to retrieve the domain controller object. (ADCOMMON0001)
FailedEvaluatingDomainController = Could not evaluate if the node is a domain controller. (ADCOMMON0002)
EvaluatePropertyState = Evaluating the state of the property '{0}'. (ADCOMMON0003)
PropertyInDesiredState = The parameter '{0}' is in desired state. (ADCOMMON0004)
PropertyNotInDesiredState = The parameter '{0}' is not in desired state. (ADCOMMON0005)
ArrayDoesNotMatch = One or more values in an array does not match the desired state. Details of the changes are below. (ADCOMMON0006)
ArrayValueThatDoesNotMatch = {0} - {1} (ADCOMMON0007)
PropertyValueOfTypeDoesNotMatch = {0} value does not match. Current value is '{1}', but expected the value '{2}'. (ADCOMMON0008)
UnableToCompareType = Unable to compare the type {0} as it is not handled by the Test-DscPropertyState cmdlet. (ADCOMMON0009)
RoleNotFoundError = Please ensure that the PowerShell module for role '{0}' is installed. (ADCOMMON0010)
MembersAndIncludeExcludeError = The '{0}' and '{1}' and/or '{2}' parameters conflict. The '{0}' parameter should not be used in any combination with the '{1}' and '{2}' parameters. (ADCOMMON0011)
MembersIsNullError = The Members parameter value is null. The '{0}' parameter must be provided if neither '{1}' nor '{2}' is provided. (ADCOMMON0012)
# MembersIsEmptyError = The Members parameter is empty. At least one group member must be provided. (ADCOMMON0013)
IncludeAndExcludeConflictError = The member '{0}' is included in both '{1}' and '{2}' parameter values. The same member must not be included in both '{1}' and '{2}' parameter values. (ADCOMMON0014)
IncludeAndExcludeAreEmptyError = The '{0}' and '{1}' parameters are either both null or empty. At least one member must be specified in one of these parameters. (ADCOMMON0015)
# ModeConversionError = Converted mode {0} is not a {1}. (ADCOMMON0016)
RecycleBinRestoreFailed = Restoring {0} ({1}) from the recycle bin failed. Error message: {2}. (ADCOMMON0017)
EmptyDomainError = No domain name retrieved for group member {0} in group {1}. (ADCOMMON0018)
CheckingMembers = Checking for '{0}' members. (ADCOMMON0019)
MembershipCountMismatch = Membership count is not correct. Expected '{0}' members, actual '{1}' members. (ADCOMMON0020)
MemberNotInDesiredState = Member '{0}' is not in the desired state. (ADCOMMON0021)
RemovingDuplicateMember = Removing duplicate member '{0}' definition. (ADCOMMON0022)
MembershipInDesiredState = Membership is in the desired state. (ADCOMMON0023)
# MembershipNotDesiredState = Membership is NOT in the desired state. (ADCOMMON0024)
CheckingDomain = Checking for domain '{0}'. (ADCOMMON0025)
CheckingSite = Checking for site '{0}'. (ADCOMMON0026)
FindInRecycleBin = Finding objects in the recycle bin matching the filter {0}. (ADCOMMON0027)
FoundRestoreTargetInRecycleBin = Found object {0} ({1}) in the recycle bin as {2}. Attempting to restore the object. (ADCOMMON0028)
RecycleBinRestoreSuccessful = Successfully restored object {0} ({1}) from the recycle bin. (ADCOMMON0029)
AddingGroupMember = Adding member '{0}' from domain '{1}' to AD group '{2}'. (ADCOMMON0030)
PropertyMapArrayIsWrongType = An object in the property map array is not of the type [System.Collections.Hashtable]. (ADCOMMON0031)
CreatingNewADPSDrive = Creating new AD: PSDrive. (ADCOMMON0032)
CreatingNewADPSDriveError = Error creating AD: PS Drive. (ADCOMMON0033)
'@
46 changes: 23 additions & 23 deletions DSCResources/MSFT_xADComputer/en-US/MSFT_xADComputer.strings.psd1
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
# culture="en-US"
ConvertFrom-StringData @'
EnabledDeprecatedMessage = DEPRECATED parameter Enabled is being used in this configuration. The parameter Enabled no longer sets or enforces the Enabled property. Please see more information at https://github.com/PowerShell/xActiveDirectory/blob/master/README.md#xadcomputer. (ADC0001)
RetrievingComputerAccount = Retrieving the information about the computer account '{0}' from Active Directory. (ADC0002)
ComputerAccountIsPresent = The computer account '{0}' is present in Active Directory. (ADC0003)
ComputerAccountIsAbsent = The computer account '{0}' is absent from Active Directory. (ADC0004)
FailedToRetrieveComputerAccount = Failed to retrieve the computer account '{0}' from Active Directory. (ADC0005)
TestConfiguration = Determining the current state of the computer account '{0}'. (ADC0006)
ComputerAccountShouldBeAbsent = The computer account '{0}' is present in Active Directory, but expected it to be absent. (ADC0007)
ComputerAccountShouldBePresent = The computer account '{0}' is absent in Active Directory, but expected it to be present. (ADC0008)
ServicePrincipalNamesInDesiredState = The service principal names was in desired state. (ADC0009)
EnabledDeprecatedMessage = DEPRECATED parameter Enabled is being used in this configuration. The parameter Enabled no longer sets or enforces the Enabled property. Please see more information at https://github.com/PowerShell/xActiveDirectory/blob/master/README.md#xadcomputer. (ADC0001)
RetrievingComputerAccount = Retrieving the information about the computer account '{0}' from Active Directory. (ADC0002)
ComputerAccountIsPresent = The computer account '{0}' is present in Active Directory. (ADC0003)
ComputerAccountIsAbsent = The computer account '{0}' is absent from Active Directory. (ADC0004)
FailedToRetrieveComputerAccount = Failed to retrieve the computer account '{0}' from Active Directory. (ADC0005)
TestConfiguration = Determining the current state of the computer account '{0}'. (ADC0006)
ComputerAccountShouldBeAbsent = The computer account '{0}' is present in Active Directory, but expected it to be absent. (ADC0007)
ComputerAccountShouldBePresent = The computer account '{0}' is absent in Active Directory, but expected it to be present. (ADC0008)
ServicePrincipalNamesInDesiredState = The service principal names was in desired state. (ADC0009)
ServicePrincipalNamesNotInDesiredState = The service principal names was '{0}', but expected them to be '{1}'. (ADC0010)
ComputerAccountInDesiredState = The computer account '{0}' is in the desired state. (ADC0011)
ComputerAccountNotInDesiredState = The computer account '{0}' is not in the desired state. (ADC0012)
RestoringComputerAccount = Attempting to restore the computer object {0} from recycle bin. (ADC0013)
ComputerAccountInDesiredState = The computer account '{0}' is in the desired state. (ADC0011)
ComputerAccountNotInDesiredState = The computer account '{0}' is not in the desired state. (ADC0012)
RestoringComputerAccount = Attempting to restore the computer object {0} from recycle bin. (ADC0013)
FailedToCreateOfflineDomainJoinRequest = Failed to create the Offline Domain Join (ODJ) request file for the computer account '{0}' with the error code '{1}'. (ADC0014)
CreateOfflineDomainJoinRequest = Attempting to create the Offline Domain Join (ODJ) request file '{0}' for the computer account '{1}' in the domain '{2}'. (ADC0015)
CreatedOfflineDomainJoinRequestFile = The Offline Domain Join (ODJ) request file '{0}' was created successfully. (ADC0016)
CreateComputerAccount = The computer account '{0}' is created in Active Directory, at the default path. (ADC0017)
CreateComputerAccountInPath = The computer account '{0}' is created in Active Directory, at the path '{1}'. (ADC0018)
DisabledComputerAccount = The computer account '{0}' is created disabled. (ADC0019)
EnabledComputerAccount = The computer account '{0}' is created enabled. (ADC0020)
MovingComputerAccount = Moving the computer account '{0}' from the path '{1}' to the path '{2}'. (ADC0021)
UpdatingComputerAccountProperty = Updating the computer account property '{0}' with the value(s) '{1}'. (ADC0022)
RemovingComputerAccountProperty = Removing the value(s) '{1}' from the computer account property '{0}'. (ADC0023)
UpdatedComputerAccount = The computer account '{0}' was updated in Active Directory. (ADC0024)
RemovingComputerAccount = Removing the computer account '{0}' from Active Directory. (ADC0025)
CreateOfflineDomainJoinRequest = Attempting to create the Offline Domain Join (ODJ) request file '{0}' for the computer account '{1}' in the domain '{2}'. (ADC0015)
CreatedOfflineDomainJoinRequestFile = The Offline Domain Join (ODJ) request file '{0}' was created successfully. (ADC0016)
CreateComputerAccount = The computer account '{0}' is created in Active Directory, at the default path. (ADC0017)
CreateComputerAccountInPath = The computer account '{0}' is created in Active Directory, at the path '{1}'. (ADC0018)
DisabledComputerAccount = The computer account '{0}' is created disabled. (ADC0019)
EnabledComputerAccount = The computer account '{0}' is created enabled. (ADC0020)
MovingComputerAccount = Moving the computer account '{0}' from the path '{1}' to the path '{2}'. (ADC0021)
UpdatingComputerAccountProperty = Updating the computer account property '{0}' with the value(s) '{1}'. (ADC0022)
RemovingComputerAccountProperty = Removing the value(s) '{1}' from the computer account property '{0}'. (ADC0023)
UpdatedComputerAccount = The computer account '{0}' was updated in Active Directory. (ADC0024)
RemovingComputerAccount = Removing the computer account '{0}' from Active Directory. (ADC0025)
'@

0 comments on commit 8bf6a16

Please sign in to comment.