From ca1ada59d376553b07a987d36cd8526be20451df Mon Sep 17 00:00:00 2001 From: "olivier.miossec" Date: Fri, 4 Oct 2019 15:46:07 +0200 Subject: [PATCH 1/2] MSFT_xWebAppPoolDefaults localization --- .../MSFT_xWebAppPoolDefaults.psm1 | 13 ++----------- .../en-US/MSFT_xWebAppPoolDefaults.strings.psd1 | 7 +++++++ 2 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 DSCResources/MSFT_xWebAppPoolDefaults/en-US/MSFT_xWebAppPoolDefaults.strings.psd1 diff --git a/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 b/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 index a1232fb34..262694dc2 100644 --- a/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 +++ b/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 @@ -4,17 +4,8 @@ $script:localizationModulePath = Join-Path -Path $script:modulesFolderPath -Chil Import-Module -Name (Join-Path -Path $script:localizationModulePath -ChildPath 'xWebAdministration.Common.psm1') -# Localized messages -data LocalizedData -{ - # culture="en-US" - ConvertFrom-StringData -StringData @' - NoWebAdministrationModule = Please ensure that WebAdministration module is installed. - SettingValue = Changing default value '{0}' to '{1}' - ValueOk = Default value '{0}' is already '{1}' - VerboseGetTargetResource = Get-TargetResource has been run. -'@ -} +# Import Localization Strings +$script:localizedData = Get-LocalizedData -ResourceName 'MSFT_xWebAppPoolDefaults' function Get-TargetResource { diff --git a/DSCResources/MSFT_xWebAppPoolDefaults/en-US/MSFT_xWebAppPoolDefaults.strings.psd1 b/DSCResources/MSFT_xWebAppPoolDefaults/en-US/MSFT_xWebAppPoolDefaults.strings.psd1 new file mode 100644 index 000000000..984a70db7 --- /dev/null +++ b/DSCResources/MSFT_xWebAppPoolDefaults/en-US/MSFT_xWebAppPoolDefaults.strings.psd1 @@ -0,0 +1,7 @@ +# culture="en-US" +ConvertFrom-StringData -StringData @' + NoWebAdministrationModule = Please ensure that WebAdministration module is installed. + SettingValue = Changing default value '{0}' to '{1}' + ValueOk = Default value '{0}' is already '{1}' + VerboseGetTargetResource = Get-TargetResource has been run. +'@ From d2baa639d6256ebcae23853b8ff678d66fe01be6 Mon Sep 17 00:00:00 2001 From: "olivier.miossec" Date: Sat, 5 Oct 2019 18:52:10 +0200 Subject: [PATCH 2/2] change $localizedData to $script:localizedData --- CHANGELOG.md | 2 ++ .../MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1154d7b77..e060abe49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Changes to xWebAppPoolDefaults + - Move localization strings to strings.psd1 file ([Issue #470](https://github.com/PowerShell/xWebAdministration/issues/470)) - Changes to xWebAdministration - Resolved custom Script Analyzer rules that was added to the test framework. - Moved change log from README.md to a separate CHANGELOG.md ([issue #446](https://github.com/PowerShell/xWebAdministration/issues/446)). diff --git a/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 b/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 index 262694dc2..85c884f26 100644 --- a/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 +++ b/DSCResources/MSFT_xWebAppPoolDefaults/MSFT_xWebAppPoolDefaults.psm1 @@ -26,7 +26,7 @@ function Get-TargetResource Assert-Module - Write-Verbose -Message $LocalizedData.VerboseGetTargetResource + Write-Verbose -Message $script:localizedData.VerboseGetTargetResource return @{ ManagedRuntimeVersion = (Get-Value -Path '' -Name 'managedRuntimeVersion') @@ -151,7 +151,7 @@ function Confirm-Value else { $relPath = $Path + '/' + $Name - Write-Verbose($LocalizedData.ValueOk -f $relPath,$NewValue); + Write-Verbose($script:localizedData.ValueOk -f $relPath,$NewValue); return $true } } @@ -196,7 +196,7 @@ function Set-Value -Value "$NewValue" $relPath = $Path + '/' + $Name - Write-Verbose($LocalizedData.SettingValue -f $relPath,$NewValue); + Write-Verbose($script:localizedData.SettingValue -f $relPath,$NewValue); } }